From d9dda9fed5319d66814b11bc4265a6ae48814203 Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sat, 11 Apr 2020 21:41:39 +0200
Subject: [PATCH 1/2] Improve performance

- Cache latex free field values for display in the main table
- Only access preferences once for how to display names (instead of for every entry again)
- Update search async only after 400ms without typing
---
 .idea/runConfigurations/JabRef_Main.xml       |  3 +
 src/main/java/org/jabref/gui/BasePanel.java   |  4 +-
 .../gui/maintable/BibEntryTableViewModel.java |  2 +-
 .../org/jabref/gui/maintable/FieldColumn.java | 55 +++----------------
 .../gui/maintable/MainTableNameFormatter.java | 31 ++++++-----
 .../jabref/gui/search/GlobalSearchBar.java    |  9 ++-
 .../gui/util/ValueTableCellFactory.java       |  6 +-
 .../java/org/jabref/model/entry/BibEntry.java | 18 ++++--
 8 files changed, 47 insertions(+), 81 deletions(-)

diff --git a/.idea/runConfigurations/JabRef_Main.xml b/.idea/runConfigurations/JabRef_Main.xml
index 70f04ee246c..4a1ef684c65 100644
--- a/.idea/runConfigurations/JabRef_Main.xml
+++ b/.idea/runConfigurations/JabRef_Main.xml
@@ -4,6 +4,9 @@
     <module name="JabRef.main" />
     <option name="VM_PARAMETERS" value="--patch-module test=fastparse_2.12-1.0.0.jar --patch-module test2=fastparse-utils_2.12-1.0.0.jar --patch-module test3=sourcecode_2.12-0.1.4.jar --patch-module org.jabref=build/resources/main --add-exports javafx.controls/com.sun.javafx.scene.control=org.jabref --add-exports org.controlsfx.controls/impl.org.controlsfx.skin=org.jabref --add-opens javafx.controls/javafx.scene.control=org.jabref --add-opens org.controlsfx.controls/org.controlsfx.control.textfield=org.jabref --add-exports javafx.graphics/com.sun.javafx.scene=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.scene.traversal=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control=org.controlsfx.controls --add-exports javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.event=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.collections=org.controlsfx.controls --add-exports javafx.base/com.sun.javafx.runtime=org.controlsfx.controls --add-exports javafx.web/com.sun.webkit=org.controlsfx.controls --add-exports javafx.graphics/com.sun.javafx.css=org.controlsfx.controls --add-opens javafx.controls/javafx.scene.control.skin=org.controlsfx.controls --add-opens javafx.graphics/javafx.scene=org.controlsfx.controls --add-exports com.oracle.truffle.regex/com.oracle.truffle.regex=org.graalvm.truffle" />
     <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
+    <RunnerSettings RunnerId="Profile ">
+      <option name="myExternalizedOptions" value="additional-options2=onexit\=snapshot,_no_java_version_check&#13;&#10;startup=12" />
+    </RunnerSettings>
     <method v="2">
       <option name="Gradle.BeforeRunTask" enabled="true" tasks="processResources" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
       <option name="Make" enabled="true" />
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
index 266065520b4..341686c1aae 100644
--- a/src/main/java/org/jabref/gui/BasePanel.java
+++ b/src/main/java/org/jabref/gui/BasePanel.java
@@ -303,9 +303,7 @@ private void createMainTable() {
         mainTable.addSelectionListener(event -> mainTable.getSelectedEntries()
                                                          .stream()
                                                          .findFirst()
-                                                         .ifPresent(entry -> {
-                                                             entryEditor.setEntry(entry);
-                                                         }));
+                                                         .ifPresent(entryEditor::setEntry));
 
         // TODO: Register these actions globally
         /*
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index 47e783c2d61..9397f26de16 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -39,7 +39,7 @@ public BibEntry getEntry() {
     }
 
     public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase database) {
-        return entry.getResolvedFieldOrAlias(field, database);
+        return entry.getResolvedFieldOrAliasLatexFree(field, database);
     }
 
     public ObjectBinding<String> getField(Field field) {
diff --git a/src/main/java/org/jabref/gui/maintable/FieldColumn.java b/src/main/java/org/jabref/gui/maintable/FieldColumn.java
index b288e5f2511..cc221fcf722 100644
--- a/src/main/java/org/jabref/gui/maintable/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/FieldColumn.java
@@ -6,13 +6,10 @@
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.value.ObservableValue;
 
-import org.jabref.logic.layout.LayoutFormatter;
-import org.jabref.logic.layout.format.LatexToUnicodeFormatter;
+import org.jabref.Globals;
 import org.jabref.model.database.BibDatabase;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldProperty;
-import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
 
 /**
@@ -24,12 +21,13 @@ public class FieldColumn extends MainTableColumn<String> {
 
     private final Optional<BibDatabase> database;
 
-    private final LayoutFormatter toUnicode = new LatexToUnicodeFormatter();
+    private final MainTableNameFormatter nameFormatter;
 
     public FieldColumn(MainTableColumnModel model, OrFields bibtexFields, BibDatabase database) {
         super(model);
         this.bibtexFields = bibtexFields;
         this.database = Optional.of(database);
+        this.nameFormatter = new MainTableNameFormatter(Globals.prefs);
 
         setText(getDisplayName());
         setCellValueFactory(param -> getColumnValue(param.getValue()));
@@ -43,7 +41,7 @@ public FieldColumn(MainTableColumnModel model, OrFields bibtexFields, BibDatabas
     @Override
     public String getDisplayName() { return bibtexFields.getDisplayName(); }
 
-    public ObservableValue<String> getColumnValue(BibEntryTableViewModel entry) {
+    private ObservableValue<String> getColumnValue(BibEntryTableViewModel entry) {
         if (bibtexFields.isEmpty()) {
             return null;
         }
@@ -67,48 +65,9 @@ private String computeText(BibEntryTableViewModel entry) {
         String result = content.orElse(null);
 
         if (isNameColumn) {
-            result = toUnicode.format(MainTableNameFormatter.formatName(result));
+            return nameFormatter.formatName(result);
+        } else {
+            return result;
         }
-
-        if ((result != null) && !bibtexFields.contains(InternalField.KEY_FIELD)) {
-            result = toUnicode.format(result).trim();
-        }
-        return result;
     }
-
-    /**
-     * Check if the value returned by getColumnValue() is the same as a simple check of the entry's field(s) would give
-     * The reasons for being different are (combinations may also happen): - The entry has a crossref where the field
-     * content is obtained from - The field has a string in it (which getColumnValue() resolves) - There are some alias
-     * fields. For example, if the entry has a date field but no year field, {@link
-     * BibEntry#getResolvedFieldOrAlias(Field, BibDatabase)} will return the year value from the date field when
-     * queried for year
-     *
-     * @param entry the BibEntry
-     * @return true if the value returned by getColumnValue() is resolved as outlined above
-     */
-    public boolean isResolved(BibEntry entry) {
-        if (bibtexFields.isEmpty()) {
-            return false;
-        }
-
-        Optional<String> resolvedFieldContent = Optional.empty();
-        Optional<String> plainFieldContent = Optional.empty();
-        for (Field field : bibtexFields) {
-            // entry type or bibtex key will never be resolved
-            if (InternalField.TYPE_HEADER.equals(field) || InternalField.OBSOLETE_TYPE_HEADER.equals(field)
-                    || InternalField.KEY_FIELD.equals(field)) {
-                return false;
-            } else {
-                plainFieldContent = entry.getField(field);
-                resolvedFieldContent = entry.getResolvedFieldOrAlias(field, database.orElse(null));
-            }
-
-            if (resolvedFieldContent.isPresent()) {
-                break;
-            }
-        }
-        return (!resolvedFieldContent.equals(plainFieldContent));
-    }
-
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
index a9c222a0bbf..741c0027c66 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
@@ -1,12 +1,23 @@
 package org.jabref.gui.maintable;
 
-import org.jabref.Globals;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.preferences.JabRefPreferences;
 
 public class MainTableNameFormatter {
 
-    private MainTableNameFormatter() { }
+    private final boolean namesNatbib;
+    private final boolean namesLastOnly;
+    private final boolean namesAsIs;
+    private final boolean namesFf;
+    private final boolean abbrAuthorNames;
+
+    MainTableNameFormatter(JabRefPreferences preferences) {
+        namesNatbib = preferences.getBoolean(JabRefPreferences.NAMES_NATBIB);
+        namesLastOnly = preferences.getBoolean(JabRefPreferences.NAMES_LAST_ONLY);
+        namesAsIs = preferences.getBoolean(JabRefPreferences.NAMES_AS_IS);
+        namesFf = preferences.getBoolean(JabRefPreferences.NAMES_FIRST_LAST);
+        abbrAuthorNames = preferences.getBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES);
+    }
 
     /**
      * Format a name field for the table, according to user preferences.
@@ -14,19 +25,11 @@ private MainTableNameFormatter() { }
      * @param nameToFormat The contents of the name field.
      * @return The formatted name field.
      */
-    public static String formatName(final String nameToFormat) {
+    public String formatName(final String nameToFormat) {
         if (nameToFormat == null) {
             return null;
         }
 
-        // Read name format options:
-        final boolean namesNatbib = Globals.prefs.getBoolean(JabRefPreferences.NAMES_NATBIB); //MK:
-        final boolean namesLastOnly = Globals.prefs.getBoolean(JabRefPreferences.NAMES_LAST_ONLY);
-        final boolean namesAsIs = Globals.prefs.getBoolean(JabRefPreferences.NAMES_AS_IS);
-        final boolean namesFf = Globals.prefs.getBoolean(JabRefPreferences.NAMES_FIRST_LAST);
-
-        final boolean abbrAuthorNames = Globals.prefs.getBoolean(JabRefPreferences.ABBR_AUTHOR_NAMES); //MK:
-
         if (namesAsIs) {
             return nameToFormat;
         } else if (namesNatbib) {
@@ -35,10 +38,8 @@ public static String formatName(final String nameToFormat) {
             return AuthorList.fixAuthorLastNameOnlyCommas(nameToFormat, false);
         } else if (namesFf) {
             return AuthorList.fixAuthorFirstNameFirstCommas(nameToFormat, abbrAuthorNames, false);
+        } else {
+            return AuthorList.fixAuthorLastNameFirstCommas(nameToFormat, abbrAuthorNames, false);
         }
-
-        // None of namesAsIs, namesNatbib, namesAsIs, namesFf
-        return AuthorList.fixAuthorLastNameFirstCommas(nameToFormat, abbrAuthorNames, false);
     }
-
 }
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index d3d4cc62b42..4820df720d6 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -101,7 +101,7 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager) {
 
         SearchPreferences searchPreferences = new SearchPreferences(Globals.prefs);
         searchDisplayMode = searchPreferences.getSearchMode();
-        
+
         this.searchField.disableProperty().bind(needsDatabase(stateManager).not());
 
         // fits the standard "found x entries"-message thus hinders the searchbar to jump around while searching if the frame width is too small
@@ -162,9 +162,6 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager) {
         visualizer.setDecoration(new IconValidationDecorator(Pos.CENTER_LEFT));
         Platform.runLater(() -> { visualizer.initVisualization(regexValidator.getValidationStatus(), searchField); });
 
-        Timer searchTask = FxTimer.create(java.time.Duration.ofMillis(SEARCH_DELAY), this::performSearch);
-        searchField.textProperty().addListener((observable, oldValue, newValue) -> searchTask.restart());
-
         EasyBind.subscribe(searchField.focusedProperty(), isFocused -> {
             if (isFocused) {
                 KeyValue widthValue = new KeyValue(searchField.maxWidthProperty(), expandedSize);
@@ -183,11 +180,13 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager) {
 
         this.setAlignment(Pos.CENTER_LEFT);
 
+        Timer searchTask = FxTimer.create(java.time.Duration.ofMillis(SEARCH_DELAY), this::performSearch);
         BindingsHelper.bindBidirectional(
                 stateManager.activeSearchQueryProperty(),
                 searchField.textProperty(),
                 searchTerm -> {
-                    performSearch();
+                    // Async update
+                    searchTask.restart();
                 },
                 query -> setSearchTerm(query.map(SearchQuery::getQuery).orElse(""))
         );
diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
index 557d1a5f7c2..e04fd77756b 100644
--- a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
@@ -8,7 +8,6 @@
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.TableCell;
 import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableRow;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
@@ -78,8 +77,7 @@ public ValueTableCellFactory<S, T> withMenu(BiFunction<S, T, ContextMenu> menuFa
 
     @Override
     public TableCell<S, T> call(TableColumn<S, T> param) {
-
-        return new TableCell<S, T>() {
+        return new TableCell<>() {
 
             @Override
             protected void updateItem(T item, boolean empty) {
@@ -91,7 +89,7 @@ protected void updateItem(T item, boolean empty) {
                     setOnMouseClicked(null);
                     setTooltip(null);
                 } else {
-                    S rowItem = ((TableRow<S>) getTableRow()).getItem();
+                    S rowItem = getTableRow().getItem();
 
                     if (toText != null) {
                         setText(toText.apply(item));
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index db66d82b3c6..d7dd008b7d9 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -247,6 +247,14 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
      * @return The resolved field value or null if not found.
      */
     public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase database) {
+        return genericGetResolvedFieldOrAlias(field, database, this::getField);
+    }
+
+    public Optional<String> getResolvedFieldOrAliasLatexFree(Field field, BibDatabase database) {
+        return genericGetResolvedFieldOrAlias(field, database, this::getLatexFreeField);
+    }
+
+    private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase database, GetFieldInterface getFieldInterface) {
         if (InternalField.TYPE_HEADER.equals(field) || InternalField.OBSOLETE_TYPE_HEADER.equals(field)) {
             return Optional.of(type.get().getDisplayName());
         }
@@ -255,7 +263,7 @@ public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase databas
             return getCiteKeyOptional();
         }
 
-        Optional<String> result = getFieldOrAlias(field);
+        Optional<String> result = genericGetFieldOrAlias(field, getFieldInterface);
         // If this field is not set, and the entry has a crossref, try to look up the
         // field in the referred entry, following the biblatex rules
         if (result.isEmpty() && (database != null)) {
@@ -266,7 +274,7 @@ public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase databas
                 Optional<Field> sourceField = getSourceField(field, targetEntry, sourceEntry);
 
                 if (sourceField.isPresent()) {
-                    result = referred.get().getFieldOrAlias(sourceField.get());
+                    result = referred.get().genericGetFieldOrAlias(sourceField.get(), getFieldInterface);
                 }
             }
         }
@@ -870,9 +878,9 @@ public Optional<String> getLatexFreeField(Field field) {
         } else {
             Optional<String> fieldValue = getField(field);
             if (fieldValue.isPresent()) {
-                String latexFreeField = LatexToUnicodeAdapter.format(fieldValue.get()).intern();
-                latexFreeFields.put(field, latexFreeField);
-                return Optional.of(latexFreeField);
+                String latexFreeValue = LatexToUnicodeAdapter.format(fieldValue.get()).intern();
+                latexFreeFields.put(field, latexFreeValue);
+                return Optional.of(latexFreeValue);
             } else {
                 return Optional.empty();
             }

From c630e1d20a593f43cd204c69eb1970d2224317ad Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Sun, 12 Apr 2020 13:23:36 +0200
Subject: [PATCH 2/2] Fix tests

---
 .../java/org/jabref/model/entry/BibEntry.java |  43 ++---
 .../BibtexKeyGeneratorTest.java               | 148 +++++++--------
 .../org/jabref/model/entry/BibEntryTest.java  | 170 +++++++++---------
 3 files changed, 178 insertions(+), 183 deletions(-)

diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index d7dd008b7d9..a7b87a31579 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -11,6 +11,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiFunction;
 import java.util.regex.Pattern;
 
 import javafx.beans.Observable;
@@ -247,14 +248,14 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
      * @return The resolved field value or null if not found.
      */
     public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase database) {
-        return genericGetResolvedFieldOrAlias(field, database, this::getField);
+        return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAlias);
     }
 
     public Optional<String> getResolvedFieldOrAliasLatexFree(Field field, BibDatabase database) {
-        return genericGetResolvedFieldOrAlias(field, database, this::getLatexFreeField);
+        return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAliasLatexFree);
     }
 
-    private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase database, GetFieldInterface getFieldInterface) {
+    private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase database, BiFunction<BibEntry, Field, Optional<String>> getFieldOrAlias) {
         if (InternalField.TYPE_HEADER.equals(field) || InternalField.OBSOLETE_TYPE_HEADER.equals(field)) {
             return Optional.of(type.get().getDisplayName());
         }
@@ -263,7 +264,7 @@ private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase
             return getCiteKeyOptional();
         }
 
-        Optional<String> result = genericGetFieldOrAlias(field, getFieldInterface);
+        Optional<String> result = getFieldOrAlias.apply(this, field);
         // If this field is not set, and the entry has a crossref, try to look up the
         // field in the referred entry, following the biblatex rules
         if (result.isEmpty() && (database != null)) {
@@ -274,7 +275,7 @@ private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase
                 Optional<Field> sourceField = getSourceField(field, targetEntry, sourceEntry);
 
                 if (sourceField.isPresent()) {
-                    result = referred.get().genericGetFieldOrAlias(sourceField.get(), getFieldInterface);
+                    result = getFieldOrAlias.apply(referred.get(), sourceField.get());
                 }
             }
         }
@@ -289,7 +290,7 @@ public String getId() {
     }
 
     /**
-     * Sets this entry's identifier (ID). It is used internally  to distinguish different BibTeX entries. It is <emph>not</emph> the BibTeX key. The BibTexKey is the {@link InternalField.KEY_FIELD}.
+     * Sets this entry's identifier (ID). It is used internally  to distinguish different BibTeX entries. It is <emph>not</emph> the BibTeX key. The BibTexKey is the {@link InternalField#KEY_FIELD}.
      *
      * The entry is also updated in the shared database - provided the database containing it doesn't veto the change.
      *
@@ -404,13 +405,12 @@ public boolean hasField(Field field) {
      *
      * Used by {@link #getFieldOrAlias(Field)} and {@link #getFieldOrAliasLatexFree(Field)}
      *
-     * @param field the field
-     * @param getFieldInterface
-     *
+     * @param field         the 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, GetFieldInterface getFieldInterface) {
-        Optional<String> fieldValue = getFieldInterface.getValueForField(field);
+    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()) {
             return fieldValue;
@@ -420,22 +420,22 @@ private Optional<String> genericGetFieldOrAlias(Field field, GetFieldInterface g
         Field aliasForField = EntryConverter.FIELD_ALIASES.get(field);
 
         if (aliasForField != null) {
-            return getFieldInterface.getValueForField(aliasForField);
+            return getFieldValue.apply(this, aliasForField);
         }
 
         // Finally, handle dates
         if (StandardField.DATE.equals(field)) {
             Optional<Date> date = Date.parse(
-                    getFieldInterface.getValueForField(StandardField.YEAR),
-                    getFieldInterface.getValueForField(StandardField.MONTH),
-                    getFieldInterface.getValueForField(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.equals(field) || StandardField.MONTH.equals(field) || StandardField.DAY.equals(field)) {
-            Optional<String> date = getFieldInterface.getValueForField(StandardField.DATE);
-            if (!date.isPresent()) {
+            Optional<String> date = getFieldValue.apply(this, StandardField.DATE);
+            if (date.isEmpty()) {
                 return Optional.empty();
             }
 
@@ -472,7 +472,7 @@ public Optional<DOI> getDOI() {
      * @return  the stored latex-free content of the field (or its alias)
      */
     public Optional<String> getFieldOrAliasLatexFree(Field name) {
-        return genericGetFieldOrAlias(name, this::getLatexFreeField);
+        return genericGetFieldOrAlias(name, BibEntry::getLatexFreeField);
     }
 
     /**
@@ -500,7 +500,7 @@ public Optional<String> getFieldOrAliasLatexFree(Field name) {
      * </p>
      */
     public Optional<String> getFieldOrAlias(Field field) {
-        return genericGetFieldOrAlias(field, this::getField);
+        return genericGetFieldOrAlias(field, BibEntry::getField);
     }
 
     /**
@@ -951,9 +951,4 @@ public ObservableMap<Field, String> getFieldsObservable() {
     public Observable[] getObservables() {
         return new Observable[] {fields, type};
     }
-
-    private interface GetFieldInterface {
-        Optional<String> getValueForField(Field field);
-    }
-
 }
diff --git a/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java b/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
index e3adfba04bf..222aae68292 100644
--- a/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/bibtexkeypattern/BibtexKeyGeneratorTest.java
@@ -19,7 +19,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
-public class BibtexKeyGeneratorTest {
+class BibtexKeyGeneratorTest {
 
     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_2 = "Isaac Newton and James Maxwell";
@@ -47,12 +47,12 @@ public class BibtexKeyGeneratorTest {
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
-    public void testAndInAuthorName() throws ParseException {
+    void testAndInAuthorName() throws ParseException {
         Optional<BibEntry> entry0 = BibtexParser.singleFromString("@ARTICLE{kohn, author={Simon Holland}}",
                 importFormatPreferences, fileMonitor);
         assertEquals("Holland",
@@ -61,7 +61,7 @@ public void testAndInAuthorName() throws ParseException {
     }
 
     @Test
-    public void testCrossrefAndInAuthorNames() throws Exception {
+    void testCrossrefAndInAuthorNames() throws Exception {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         entry1.setField(StandardField.CROSSREF, "entry2");
@@ -77,7 +77,7 @@ public void testCrossrefAndInAuthorNames() throws Exception {
     }
 
     @Test
-    public void testAndAuthorNames() throws ParseException {
+    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, fileMonitor);
         assertEquals("HerlandHaugeHelgeland",
@@ -86,7 +86,7 @@ public void testAndAuthorNames() throws ParseException {
     }
 
     @Test
-    public void testCrossrefAndAuthorNames() throws Exception {
+    void testCrossrefAndAuthorNames() throws Exception {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         entry1.setField(StandardField.CROSSREF, "entry2");
@@ -102,7 +102,7 @@ public void testCrossrefAndAuthorNames() throws Exception {
     }
 
     @Test
-    public void testSpecialLatexCharacterInAuthorName() throws ParseException {
+    void testSpecialLatexCharacterInAuthorName() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={Simon Popovi\\v{c}ov\\'{a}}}", importFormatPreferences, fileMonitor);
         assertEquals("Popovicova",
@@ -115,7 +115,7 @@ public void testSpecialLatexCharacterInAuthorName() throws ParseException {
      * Ć ć É é Í í Ĺ ĺ Ń ń Ó ó Ŕ ŕ Ś ś Ú ú Ý ý Ź ź
      */
     @Test
-    public void testMakeLabelAndCheckLegalKeys() throws ParseException {
+    void testMakeLabelAndCheckLegalKeys() throws ParseException {
 
         Optional<BibEntry> entry0 = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={Andreas Köning}, year={2000}}", importFormatPreferences, fileMonitor);
@@ -194,7 +194,7 @@ public void testMakeLabelAndCheckLegalKeys() throws ParseException {
      * Test the Labelmaker and with accent grave Chars to test: "ÀÈÌÒÙ";
      */
     @Test
-    public void testMakeLabelAndCheckLegalKeysAccentGrave() throws ParseException {
+    void testMakeLabelAndCheckLegalKeysAccentGrave() throws ParseException {
         Optional<BibEntry> entry0 = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={Andreas Àöning}, year={2000}}", importFormatPreferences, fileMonitor);
         assertEquals("Aoe",
@@ -251,7 +251,7 @@ public void testMakeLabelAndCheckLegalKeysAccentGrave() throws ParseException {
      * @see BibtexKeyGenerator#checkLegalKey(String)
      */
     @Test
-    public void testCheckLegalKey() {
+    void testCheckLegalKey() {
         // not tested/ not in hashmap UNICODE_CHARS:
         // Ł ł   Ő ő Ű ű   Ŀ ŀ   Ħ ħ   Ð ð Þ þ   Œ œ   Æ æ Ø ø Å å   Ə ə Đ đ   Ů ů	Ǣ ǣ ǖ ǘ ǚ ǜ
         //" Ǣ ǣ ǖ ǘ ǚ ǜ   " +
@@ -309,7 +309,7 @@ public void testCheckLegalKey() {
     }
 
     @Test
-    public void testFirstAuthor() {
+    void testFirstAuthor() {
         assertEquals("Newton", BibtexKeyGenerator.firstAuthor(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5));
         assertEquals("Newton", BibtexKeyGenerator.firstAuthor(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
 
@@ -320,12 +320,12 @@ public void testFirstAuthor() {
     }
 
     @Test
-    public void testFirstAuthorNull() {
+    void testFirstAuthorNull() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.firstAuthor(null));
     }
 
     @Test
-    public void testUniversity() throws ParseException {
+    void testUniversity() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University}}}", importFormatPreferences, fileMonitor);
         assertEquals("UniLinkoeping",
@@ -334,7 +334,7 @@ public void testUniversity() throws ParseException {
     }
 
     @Test
-    public void testcrossrefUniversity() throws Exception {
+    void testcrossrefUniversity() throws Exception {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         entry1.setField(StandardField.CROSSREF, "entry2");
@@ -350,7 +350,7 @@ public void testcrossrefUniversity() throws Exception {
     }
 
     @Test
-    public void testDepartment() throws ParseException {
+    void testDepartment() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, Department of Electrical Engineering}}}",
                 importFormatPreferences, fileMonitor);
@@ -360,7 +360,7 @@ public void testDepartment() throws ParseException {
     }
 
     @Test
-    public void testcrossrefDepartment() throws Exception {
+    void testcrossrefDepartment() throws Exception {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         entry1.setField(StandardField.CROSSREF, "entry2");
@@ -376,7 +376,7 @@ public void testcrossrefDepartment() throws Exception {
     }
 
     @Test
-    public void testSchool() throws ParseException {
+    void testSchool() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University, School of Computer Engineering}}}",
                 importFormatPreferences, fileMonitor);
@@ -386,7 +386,7 @@ public void testSchool() throws ParseException {
     }
 
     @Test
-    public void testcrossrefSchool() throws Exception {
+    void testcrossrefSchool() throws Exception {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         entry1.setField(StandardField.CROSSREF, "entry2");
@@ -402,7 +402,7 @@ public void testcrossrefSchool() throws Exception {
     }
 
     @Test
-    public void testInstituteOfTechnology() throws ParseException {
+    void testInstituteOfTechnology() throws ParseException {
         Optional<BibEntry> entry = BibtexParser.singleFromString(
                 "@ARTICLE{kohn, author={{Massachusetts Institute of Technology}}}", importFormatPreferences, fileMonitor);
         assertEquals("MIT",
@@ -411,7 +411,7 @@ public void testInstituteOfTechnology() throws ParseException {
     }
 
     @Test
-    public void testcrossrefInstituteOfTechnology() throws Exception {
+    void testcrossrefInstituteOfTechnology() throws Exception {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         entry1.setField(StandardField.CROSSREF, "entry2");
@@ -427,7 +427,7 @@ public void testcrossrefInstituteOfTechnology() throws Exception {
     }
 
     @Test
-    public void testAuthIniN() {
+    void testAuthIniN() {
         assertEquals("NMEB", BibtexKeyGenerator.authIniN(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, 4));
         assertEquals("NMEB", BibtexKeyGenerator.authIniN(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, 4));
         assertEquals("NeME", BibtexKeyGenerator.authIniN(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, 4));
@@ -444,12 +444,12 @@ public void testAuthIniN() {
     }
 
     @Test
-    public void testAuthIniNNull() {
+    void testAuthIniNNull() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.authIniN(null, 3));
     }
 
     @Test
-    public void testAuthIniNEmptyReturnsEmpty() {
+    void testAuthIniNEmptyReturnsEmpty() {
         assertEquals("", BibtexKeyGenerator.authIniN("", 1));
     }
 
@@ -457,7 +457,7 @@ public void testAuthIniNEmptyReturnsEmpty() {
      * Tests  [auth.auth.ea]
      */
     @Test
-    public void authAuthEa() {
+    void authAuthEa() {
         assertEquals("Newton", BibtexKeyGenerator.authAuthEa(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1));
         assertEquals("Newton.Maxwell",
                 BibtexKeyGenerator.authAuthEa(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2));
@@ -466,7 +466,7 @@ public void authAuthEa() {
     }
 
     @Test
-    public void testAuthEaEmptyReturnsEmpty() {
+    void testAuthEaEmptyReturnsEmpty() {
         assertEquals("", BibtexKeyGenerator.authAuthEa(""));
     }
 
@@ -474,7 +474,7 @@ public void testAuthEaEmptyReturnsEmpty() {
      * Tests the [auth.etal] and [authEtAl] patterns
      */
     @Test
-    public void testAuthEtAl() {
+    void testAuthEtAl() {
         // tests taken from the comments
 
         // [auth.etal]
@@ -498,7 +498,7 @@ public void testAuthEtAl() {
      * Test the [authshort] pattern
      */
     @Test
-    public void testAuthShort() {
+    void testAuthShort() {
         // tests taken from the comments
         assertEquals("NME+", BibtexKeyGenerator.authshort(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4));
         assertEquals("NME", BibtexKeyGenerator.authshort(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3));
@@ -507,7 +507,7 @@ public void testAuthShort() {
     }
 
     @Test
-    public void testAuthShortEmptyReturnsEmpty() {
+    void testAuthShortEmptyReturnsEmpty() {
         assertEquals("", BibtexKeyGenerator.authshort(""));
     }
 
@@ -515,7 +515,7 @@ public void testAuthShortEmptyReturnsEmpty() {
      * Test the [authN_M] pattern
      */
     @Test
-    public void authNM() {
+    void authNM() {
         assertEquals("N", BibtexKeyGenerator.authNofMth(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, 1, 1));
         assertEquals("Max",
                 BibtexKeyGenerator.authNofMth(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, 3, 2));
@@ -535,7 +535,7 @@ public void authNM() {
     }
 
     @Test
-    public void authNMThrowsNPE() {
+    void authNMThrowsNPE() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.authNofMth(null, 2, 4));
     }
 
@@ -543,7 +543,7 @@ public void authNMThrowsNPE() {
      * Tests [authForeIni]
      */
     @Test
-    public void firstAuthorForenameInitials() {
+    void firstAuthorForenameInitials() {
         assertEquals("I", BibtexKeyGenerator
                 .firstAuthorForenameInitials(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
         assertEquals("I", BibtexKeyGenerator
@@ -558,7 +558,7 @@ public void firstAuthorForenameInitials() {
      * Tests [authFirstFull]
      */
     @Test
-    public void firstAuthorVonAndLast() {
+    void firstAuthorVonAndLast() {
         assertEquals("vanderAalst", BibtexKeyGenerator
                 .firstAuthorVonAndLast(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1));
         assertEquals("vanderAalst", BibtexKeyGenerator
@@ -566,7 +566,7 @@ public void firstAuthorVonAndLast() {
     }
 
     @Test
-    public void firstAuthorVonAndLastNoVonInName() {
+    void firstAuthorVonAndLastNoVonInName() {
         assertEquals("Newton",
                 BibtexKeyGenerator.firstAuthorVonAndLast(AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1));
         assertEquals("Newton",
@@ -577,7 +577,7 @@ public void firstAuthorVonAndLastNoVonInName() {
      * Tests [authors]
      */
     @Test
-    public void testAllAuthors() {
+    void testAllAuthors() {
         assertEquals("Newton", BibtexKeyGenerator.allAuthors(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
         assertEquals("NewtonMaxwell",
                 BibtexKeyGenerator.allAuthors(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2));
@@ -589,7 +589,7 @@ public void testAllAuthors() {
      * Tests [authorsAlpha]
      */
     @Test
-    public void authorsAlpha() {
+    void authorsAlpha() {
         assertEquals("New", BibtexKeyGenerator.authorsAlpha(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
         assertEquals("NM", BibtexKeyGenerator.authorsAlpha(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2));
         assertEquals("NME", BibtexKeyGenerator.authorsAlpha(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3));
@@ -606,7 +606,7 @@ public void authorsAlpha() {
      * Tests [authorLast]
      */
     @Test
-    public void lastAuthor() {
+    void lastAuthor() {
         assertEquals("Newton", BibtexKeyGenerator.lastAuthor(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
         assertEquals("Maxwell", BibtexKeyGenerator.lastAuthor(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2));
         assertEquals("Einstein",
@@ -624,7 +624,7 @@ public void lastAuthor() {
      * Tests [authorLastForeIni]
      */
     @Test
-    public void lastAuthorForenameInitials() {
+    void lastAuthorForenameInitials() {
         assertEquals("I",
                 BibtexKeyGenerator.lastAuthorForenameInitials(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
         assertEquals("J",
@@ -646,7 +646,7 @@ public void lastAuthorForenameInitials() {
      * Tests [authorIni]
      */
     @Test
-    public void oneAuthorPlusIni() {
+    void oneAuthorPlusIni() {
         assertEquals("Newto",
                 BibtexKeyGenerator.oneAuthorPlusIni(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1));
         assertEquals("NewtoM",
@@ -668,7 +668,7 @@ public void oneAuthorPlusIni() {
      * Tests the [authorsN] pattern. -> [authors1]
      */
     @Test
-    public void testNAuthors1() {
+    void testNAuthors1() {
         assertEquals("Newton", BibtexKeyGenerator.nAuthors(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, 1));
         assertEquals("NewtonEtAl",
                 BibtexKeyGenerator.nAuthors(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, 1));
@@ -679,7 +679,7 @@ public void testNAuthors1() {
     }
 
     @Test
-    public void testNAuthors1EmptyReturnEmpty() {
+    void testNAuthors1EmptyReturnEmpty() {
         assertEquals("", BibtexKeyGenerator.nAuthors("", 1));
     }
 
@@ -687,7 +687,7 @@ public void testNAuthors1EmptyReturnEmpty() {
      * Tests the [authorsN] pattern. -> [authors3]
      */
     @Test
-    public void testNAuthors3() {
+    void testNAuthors3() {
         assertEquals("Newton", BibtexKeyGenerator.nAuthors(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, 3));
         assertEquals("NewtonMaxwell",
                 BibtexKeyGenerator.nAuthors(AUTHOR_STRING_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, 3));
@@ -698,7 +698,7 @@ public void testNAuthors3() {
     }
 
     @Test
-    public void testFirstPage() {
+    void testFirstPage() {
         assertEquals("7", BibtexKeyGenerator.firstPage("7--27"));
         assertEquals("27", BibtexKeyGenerator.firstPage("--27"));
         assertEquals("", BibtexKeyGenerator.firstPage(""));
@@ -708,12 +708,12 @@ public void testFirstPage() {
         assertEquals("43", BibtexKeyGenerator.firstPage("43+"));
     }
 
-    public void testFirstPageNull() {
+    void testFirstPageNull() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.firstPage(null));
     }
 
     @Test
-    public void testPagePrefix() {
+    void testPagePrefix() {
         assertEquals("L", BibtexKeyGenerator.pagePrefix("L7--27"));
         assertEquals("L--", BibtexKeyGenerator.pagePrefix("L--27"));
         assertEquals("L", BibtexKeyGenerator.pagePrefix("L"));
@@ -731,12 +731,12 @@ public void testPagePrefix() {
     }
 
     @Test
-    public void testPagePrefixNull() {
+    void testPagePrefixNull() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.pagePrefix(null));
     }
 
     @Test
-    public void testLastPage() {
+    void testLastPage() {
 
         assertEquals("27", BibtexKeyGenerator.lastPage("7--27"));
         assertEquals("27", BibtexKeyGenerator.lastPage("--27"));
@@ -748,7 +748,7 @@ public void testLastPage() {
     }
 
     @Test
-    public void testLastPageNull() {
+    void testLastPageNull() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.lastPage(null));
     }
 
@@ -756,7 +756,7 @@ public void testLastPageNull() {
      * Tests [veryShortTitle]
      */
     @Test
-    public void veryShortTitle() {
+    void veryShortTitle() {
         // veryShortTitle is getTitleWords with "1" as count
         int count = 1;
         assertEquals("application",
@@ -789,7 +789,7 @@ public void veryShortTitle() {
      * Tests [shortTitle]
      */
     @Test
-    public void shortTitle() {
+    void shortTitle() {
         // shortTitle is getTitleWords with "3" as count and removed small words
         int count = 3;
         assertEquals("application migration effort",
@@ -820,7 +820,7 @@ public void shortTitle() {
      * Tests [camel]
      */
     @Test
-    public void camel() {
+    void camel() {
         // camel capitalises and concatenates all the words of the title
         assertEquals("ApplicationMigrationEffortInTheCloudTheCaseOfCloudPlatforms",
                 BibtexKeyGenerator.getCamelizedTitle(TITLE_STRING_ALL_LOWER_FOUR_SMALL_WORDS_ONE_EN_DASH));
@@ -845,7 +845,7 @@ public void camel() {
      * Tests [title]
      */
     @Test
-    public void title() {
+    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",
@@ -874,7 +874,7 @@ public void title() {
     }
 
     @Test
-    public void keywordNKeywordsSeparatedBySpace() {
+    void keywordNKeywordsSeparatedBySpace() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
 
@@ -891,7 +891,7 @@ public void keywordNKeywordsSeparatedBySpace() {
     }
 
     @Test
-    public void crossrefkeywordNKeywordsSeparatedBySpace() {
+    void crossrefkeywordNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         BibEntry entry2 = new BibEntry();
@@ -907,7 +907,7 @@ public void crossrefkeywordNKeywordsSeparatedBySpace() {
     }
 
     @Test
-    public void keywordsNKeywordsSeparatedBySpace() {
+    void keywordsNKeywordsSeparatedBySpace() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
 
@@ -925,7 +925,7 @@ public void keywordsNKeywordsSeparatedBySpace() {
     }
 
     @Test
-    public void crossrefkeywordsNKeywordsSeparatedBySpace() {
+    void crossrefkeywordsNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         BibEntry entry2 = new BibEntry();
@@ -941,27 +941,27 @@ public void crossrefkeywordsNKeywordsSeparatedBySpace() {
     }
 
     @Test
-    public void testCheckLegalKeyEnforceLegal() {
+    void testCheckLegalKeyEnforceLegal() {
         assertEquals("AAAA", BibtexKeyGenerator.cleanKey("AA AA", true));
         assertEquals("SPECIALCHARS", BibtexKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,^", true));
         assertEquals("", BibtexKeyGenerator.cleanKey("\n\t\r", true));
     }
 
     @Test
-    public void testCheckLegalKeyDoNotEnforceLegal() {
+    void testCheckLegalKeyDoNotEnforceLegal() {
         assertEquals("AAAA", BibtexKeyGenerator.cleanKey("AA AA", false));
         assertEquals("SPECIALCHARS#~^", BibtexKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,^", false));
         assertEquals("", BibtexKeyGenerator.cleanKey("\n\t\r", false));
     }
 
     @Test
-    public void testCheckLegalNullInNullOut() {
+    void testCheckLegalNullInNullOut() {
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.cleanKey(null, true));
         assertThrows(NullPointerException.class, () -> BibtexKeyGenerator.cleanKey(null, false));
     }
 
     @Test
-    public void testApplyModifiers() {
+    void testApplyModifiers() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "Green Scheduling of Whatever");
         assertEquals("GSo", BibtexKeyGenerator.generateKey(entry, "shorttitleINI"));
@@ -970,7 +970,7 @@ public void testApplyModifiers() {
     }
 
     @Test
-    public void testcrossrefShorttitle() {
+    void testcrossrefShorttitle() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         BibEntry entry2 = new BibEntry();
@@ -985,7 +985,7 @@ public void testcrossrefShorttitle() {
     }
 
     @Test
-    public void testcrossrefShorttitleInitials() {
+    void testcrossrefShorttitleInitials() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry();
         BibEntry entry2 = new BibEntry();
@@ -999,70 +999,70 @@ public void testcrossrefShorttitleInitials() {
     }
 
     @Test
-    public void generateKeyStripsColonFromTitle() throws Exception {
+    void generateKeyStripsColonFromTitle() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "Green Scheduling of: Whatever");
         assertEquals("GreenSchedulingOfWhatever", BibtexKeyGenerator.generateKey(entry, "title"));
     }
 
     @Test
-    public void generateKeyStripsApostropheFromTitle() throws Exception {
+    void generateKeyStripsApostropheFromTitle() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "Green Scheduling of `Whatever`");
         assertEquals("GreenSchedulingofWhatever", BibtexKeyGenerator.generateKey(entry, "title"));
     }
 
     @Test
-    public void generateKeyWithOneModifier() throws Exception {
+    void generateKeyWithOneModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "The Interesting Title");
         assertEquals("theinterestingtitle", BibtexKeyGenerator.generateKey(entry, "title:lower"));
     }
 
     @Test
-    public void generateKeyWithTwoModifiers() throws Exception {
+    void generateKeyWithTwoModifiers() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "The Interesting Title");
         assertEquals("theinterestingtitle", BibtexKeyGenerator.generateKey(entry, "title:lower:(_)"));
     }
 
     @Test
-    public void generateKeyWithTitleCapitalizeModifier() throws Exception {
+    void generateKeyWithTitleCapitalizeModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "the InTeresting title longer than THREE words");
         assertEquals("TheInterestingTitleLongerThanThreeWords", BibtexKeyGenerator.generateKey(entry, "title:capitalize"));
     }
 
     @Test
-    public void generateKeyWithShortTitleCapitalizeModifier() throws Exception {
+    void generateKeyWithShortTitleCapitalizeModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "the InTeresting title longer than THREE words");
         assertEquals("InterestingTitleLonger", BibtexKeyGenerator.generateKey(entry, "shorttitle:capitalize"));
     }
 
     @Test
-    public void generateKeyWithTitleTitleCaseModifier() throws Exception {
+    void generateKeyWithTitleTitleCaseModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "A title WITH some of The key words");
         assertEquals("ATitlewithSomeoftheKeyWords", BibtexKeyGenerator.generateKey(entry, "title:titlecase"));
     }
 
     @Test
-    public void generateKeyWithShortTitleTitleCaseModifier() throws Exception {
+    void generateKeyWithShortTitleTitleCaseModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "the InTeresting title longer than THREE words");
         assertEquals("InterestingTitleLonger", BibtexKeyGenerator.generateKey(entry, "shorttitle:titlecase"));
     }
 
     @Test
-    public void generateKeyWithTitleSentenceCaseModifier() throws Exception {
+    void generateKeyWithTitleSentenceCaseModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "A title WITH some of The key words");
         assertEquals("Atitlewithsomeofthekeywords", BibtexKeyGenerator.generateKey(entry, "title:sentencecase"));
     }
 
     @Test
-    public void generateKeyWithAuthUpperYearShortTitleCapitalizeModifier() throws Exception {
+    void generateKeyWithAuthUpperYearShortTitleCapitalizeModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1);
         entry.setField(StandardField.YEAR, "2019");
@@ -1071,7 +1071,7 @@ public void generateKeyWithAuthUpperYearShortTitleCapitalizeModifier() throws Ex
     }
 
     @Test
-    public void generateKeyWithYearAuthUpperTitleSentenceCaseModifier() throws Exception {
+    void generateKeyWithYearAuthUpperTitleSentenceCaseModifier() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3);
         entry.setField(StandardField.YEAR, "2019");
@@ -1080,7 +1080,7 @@ public void generateKeyWithYearAuthUpperTitleSentenceCaseModifier() throws Excep
     }
 
     @Test
-    public void generateKeyWithMinusInCitationStyleOutsideAField() throws Exception {
+    void generateKeyWithMinusInCitationStyleOutsideAField() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1);
         entry.setField(StandardField.YEAR, "2019");
@@ -1089,7 +1089,7 @@ public void generateKeyWithMinusInCitationStyleOutsideAField() throws Exception
     }
 
     @Test
-    public void generateKeyWithWithFirstNCharacters() throws Exception {
+    void generateKeyWithWithFirstNCharacters() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Newton, Isaac");
         entry.setField(StandardField.YEAR, "2019");
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index e7038e12fd7..45dbeb69470 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -36,210 +36,210 @@ class BibEntryTest {
     private BibEntry entry;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         entry = new BibEntry();
     }
 
     @AfterEach
-    public void tearDown() {
+    void tearDown() {
         entry = null;
     }
 
     @Test
-    public void testDefaultConstructor() {
+    void testDefaultConstructor() {
         assertEquals(StandardEntryType.Misc, entry.getType());
         assertNotNull(entry.getId());
         assertFalse(entry.getField(StandardField.AUTHOR).isPresent());
     }
 
     @Test
-    public void settingTypeToNullThrowsException() {
+    void settingTypeToNullThrowsException() {
         assertThrows(NullPointerException.class, () -> entry.setType(null));
     }
 
     @Test
-    public void setNullFieldThrowsNPE() {
+    void setNullFieldThrowsNPE() {
         assertThrows(NullPointerException.class, () -> entry.setField(null));
     }
 
     @Test
-    public void getFieldIsCaseInsensitive() throws Exception {
+    void getFieldIsCaseInsensitive() throws Exception {
         entry.setField(new UnknownField("TeSt"), "value");
         assertEquals(Optional.of("value"), entry.getField(new UnknownField("tEsT")));
     }
 
     @Test
-    public void getFieldWorksWithBibFieldAsWell() throws Exception {
+    void getFieldWorksWithBibFieldAsWell() throws Exception {
         entry.setField(StandardField.AUTHOR, "value");
         assertEquals(Optional.of("value"), entry.getField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).getField()));
     }
 
     @Test
-    public void newBibEntryIsUnchanged() {
+    void newBibEntryIsUnchanged() {
         assertFalse(entry.hasChanged());
     }
 
     @Test
-    public void setFieldLeadsToAChangedEntry() throws Exception {
+    void setFieldLeadsToAChangedEntry() throws Exception {
         entry.setField(StandardField.AUTHOR, "value");
         assertTrue(entry.hasChanged());
     }
 
     @Test
-    public void setFieldWorksWithBibFieldAsWell() throws Exception {
+    void setFieldWorksWithBibFieldAsWell() throws Exception {
         entry.setField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).getField(), "value");
         assertEquals(Optional.of("value"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
-    public void clonedBibEntryHasUniqueID() throws Exception {
+    void clonedBibEntryHasUniqueID() throws Exception {
         BibEntry entryClone = (BibEntry) entry.clone();
         assertNotEquals(entry.getId(), entryClone.getId());
     }
 
     @Test
-    public void setAndGetAreConsistentForMonth() throws Exception {
+    void setAndGetAreConsistentForMonth() throws Exception {
         entry.setField(StandardField.MONTH, "may");
         assertEquals(Optional.of("may"), entry.getField(StandardField.MONTH));
     }
 
     @Test
-    public void setAndGetAreConsistentForCapitalizedMonth() throws Exception {
+    void setAndGetAreConsistentForCapitalizedMonth() throws Exception {
         entry.setField(StandardField.MONTH, "May");
         assertEquals(Optional.of("May"), entry.getField(StandardField.MONTH));
     }
 
     @Test
-    public void setAndGetAreConsistentForMonthString() throws Exception {
+    void setAndGetAreConsistentForMonthString() throws Exception {
         entry.setField(StandardField.MONTH, "#may#");
         assertEquals(Optional.of("#may#"), entry.getField(StandardField.MONTH));
     }
 
     @Test
-    public void monthCorrectlyReturnedForMonth() throws Exception {
+    void monthCorrectlyReturnedForMonth() throws Exception {
         entry.setField(StandardField.MONTH, "may");
         assertEquals(Optional.of(Month.MAY), entry.getMonth());
     }
 
     @Test
-    public void monthCorrectlyReturnedForCapitalizedMonth() throws Exception {
+    void monthCorrectlyReturnedForCapitalizedMonth() throws Exception {
         entry.setField(StandardField.MONTH, "May");
         assertEquals(Optional.of(Month.MAY), entry.getMonth());
     }
 
     @Test
-    public void monthCorrectlyReturnedForMonthString() throws Exception {
+    void monthCorrectlyReturnedForMonthString() throws Exception {
         entry.setField(StandardField.MONTH, "#may#");
         assertEquals(Optional.of(Month.MAY), entry.getMonth());
     }
 
     @Test
-    public void monthCorrectlyReturnedForMonthMay() throws Exception {
+    void monthCorrectlyReturnedForMonthMay() throws Exception {
         entry.setMonth(Month.MAY);
         assertEquals(Optional.of(Month.MAY), entry.getMonth());
     }
 
     @Test
-    public void monthFieldCorrectlyReturnedForMonthMay() throws Exception {
+    void monthFieldCorrectlyReturnedForMonthMay() throws Exception {
         entry.setMonth(Month.MAY);
         assertEquals(Optional.of("#may#"), entry.getField(StandardField.MONTH));
     }
 
     @Test
-    public void getFieldOrAliasDateWithYearNumericalMonthString() {
+    void getFieldOrAliasDateWithYearNumericalMonthString() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "3");
         assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
-    public void getFieldOrAliasDateWithYearAbbreviatedMonth() {
+    void getFieldOrAliasDateWithYearAbbreviatedMonth() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "#mar#");
         assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
-    public void getFieldOrAliasDateWithYearAbbreviatedMonthString() {
+    void getFieldOrAliasDateWithYearAbbreviatedMonthString() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "mar");
         assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
-    public void getFieldOrAliasDateWithOnlyYear() {
+    void getFieldOrAliasDateWithOnlyYear() {
         entry.setField(StandardField.YEAR, "2003");
         assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
-    public void getFieldOrAliasYearWithDateYYYY() {
+    void getFieldOrAliasYearWithDateYYYY() {
         entry.setField(StandardField.DATE, "2003");
         assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
     }
 
     @Test
-    public void getFieldOrAliasYearWithDateYYYYMM() {
+    void getFieldOrAliasYearWithDateYYYYMM() {
         entry.setField(StandardField.DATE, "2003-03");
         assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
     }
 
     @Test
-    public void getFieldOrAliasYearWithDateYYYYMMDD() {
+    void getFieldOrAliasYearWithDateYYYYMMDD() {
         entry.setField(StandardField.DATE, "2003-03-30");
         assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
     }
 
     @Test
-    public void getFieldOrAliasMonthWithDateYYYYReturnsNull() {
+    void getFieldOrAliasMonthWithDateYYYYReturnsNull() {
         entry.setField(StandardField.DATE, "2003");
         assertEquals(Optional.empty(), entry.getFieldOrAlias(StandardField.MONTH));
     }
 
     @Test
-    public void getFieldOrAliasMonthWithDateYYYYMM() {
+    void getFieldOrAliasMonthWithDateYYYYMM() {
         entry.setField(StandardField.DATE, "2003-03");
         assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
     }
 
     @Test
-    public void getFieldOrAliasMonthWithDateYYYYMMDD() {
+    void getFieldOrAliasMonthWithDateYYYYMMDD() {
         entry.setField(StandardField.DATE, "2003-03-30");
         assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
     }
 
     @Test
-    public void getFieldOrAliasLatexFreeAlreadyFreeValueIsUnchanged() {
+    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));
     }
 
     @Test
-    public void getFieldOrAliasLatexFreeAlreadyFreeAliasValueIsUnchanged() {
+    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));
     }
 
     @Test
-    public void getFieldOrAliasLatexFreeBracesAreRemoved() {
+    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));
     }
 
     @Test
-    public void getFieldOrAliasLatexFreeBracesAreRemovedFromAlias() {
+    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));
     }
 
     @Test
-    public void getFieldOrAliasLatexFreeComplexConversionInAlias() {
+    void getFieldOrAliasLatexFreeComplexConversionInAlias() {
         entry.setField(StandardField.JOURNAL, "A 32~{mA} {$\\Sigma\\Delta$}-modulator");
         assertEquals(Optional.of("A 32 mA ΣΔ-modulator"), entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE));
     }
 
     @Test
-    public void testGetAndAddToLinkedFileList() {
+    void testGetAndAddToLinkedFileList() {
         List<LinkedFile> files = entry.getFiles();
         files.add(new LinkedFile("", "", ""));
         entry.setFiles(files);
@@ -247,14 +247,14 @@ public void testGetAndAddToLinkedFileList() {
     }
 
     @Test
-    public void testGetEmptyKeywords() {
+    void testGetEmptyKeywords() {
         KeywordList actual = entry.getKeywords(',');
 
         assertEquals(new KeywordList(), actual);
     }
 
     @Test
-    public void testGetSingleKeywords() {
+    void testGetSingleKeywords() {
         entry.addKeyword("kw", ',');
         KeywordList actual = entry.getKeywords(',');
 
@@ -262,34 +262,34 @@ public void testGetSingleKeywords() {
     }
 
     @Test
-    public void settingCiteKeyLeadsToCorrectCiteKey() {
+    void settingCiteKeyLeadsToCorrectCiteKey() {
         assertFalse(entry.hasCiteKey());
         entry.setCiteKey("Einstein1931");
         assertEquals(Optional.of("Einstein1931"), entry.getCiteKeyOptional());
     }
 
     @Test
-    public void settingCiteKeyLeadsToHasCiteKy() {
+    void settingCiteKeyLeadsToHasCiteKy() {
         assertFalse(entry.hasCiteKey());
         entry.setCiteKey("Einstein1931");
         assertTrue(entry.hasCiteKey());
     }
 
     @Test
-    public void clearFieldWorksForAuthor() {
+    void clearFieldWorksForAuthor() {
         entry.setField(StandardField.AUTHOR, "Albert Einstein");
         entry.clearField(StandardField.AUTHOR);
         assertEquals(Optional.empty(), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
-    public void setFieldWorksForAuthor() {
+    void setFieldWorksForAuthor() {
         entry.setField(StandardField.AUTHOR, "Albert Einstein");
         assertEquals(Optional.of("Albert Einstein"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
-    public void allFieldsPresentDefault() {
+    void allFieldsPresentDefault() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         e.setField(StandardField.AUTHOR, "abc");
         e.setField(StandardField.TITLE, "abc");
@@ -305,7 +305,7 @@ public void allFieldsPresentDefault() {
     }
 
     @Test
-    public void allFieldsPresentOr() {
+    void allFieldsPresentOr() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         e.setField(StandardField.AUTHOR, "abc");
         e.setField(StandardField.TITLE, "abc");
@@ -320,13 +320,13 @@ public void allFieldsPresentOr() {
     }
 
     @Test
-    public void isNullCiteKeyThrowsNPE() {
+    void isNullCiteKeyThrowsNPE() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         assertThrows(NullPointerException.class, () -> e.setCiteKey(null));
     }
 
     @Test
-    public void isEmptyCiteKey() {
+    void isEmptyCiteKey() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         assertFalse(e.hasCiteKey());
 
@@ -341,23 +341,23 @@ public void isEmptyCiteKey() {
     }
 
     @Test
-    public void identicObjectsareEqual() throws Exception {
+    void identicObjectsareEqual() throws Exception {
         BibEntry otherEntry = entry;
         assertTrue(entry.equals(otherEntry));
     }
 
     @Test
-    public void compareToNullObjectIsFalse() throws Exception {
+    void compareToNullObjectIsFalse() throws Exception {
         assertFalse(entry.equals(null));
     }
 
     @Test
-    public void compareToDifferentClassIsFalse() throws Exception {
+    void compareToDifferentClassIsFalse() throws Exception {
         assertFalse(entry.equals(new Object()));
     }
 
     @Test
-    public void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
+    void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
         entry.setId("1");
         entry.setField(new UnknownField("key"), "value");
         BibEntry otherEntry = new BibEntry();
@@ -368,45 +368,45 @@ public void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
     }
 
     @Test
-    public void addNullKeywordThrowsNPE() {
+    void addNullKeywordThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         assertThrows(NullPointerException.class, () -> entry.addKeyword((Keyword) null, ','));
     }
 
     @Test
-    public void putNullKeywordListThrowsNPE() {
+    void putNullKeywordListThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         assertThrows(NullPointerException.class, () -> entry.putKeywords((KeywordList) null, ','));
     }
 
     @Test
-    public void putNullKeywordSeparatorThrowsNPE() {
+    void putNullKeywordSeparatorThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         assertThrows(NullPointerException.class, () -> entry.putKeywords(Arrays.asList("A", "B"), null));
     }
 
     @Test
-    public void testGetSeparatedKeywordsAreCorrect() {
+    void testGetSeparatedKeywordsAreCorrect() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         assertEquals(new KeywordList("Foo", "Bar"), entry.getKeywords(','));
     }
 
     @Test
-    public void testAddKeywordIsCorrect() {
+    void testAddKeywordIsCorrect() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
         assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
     }
 
     @Test
-    public void testAddKeywordHasChanged() {
+    void testAddKeywordHasChanged() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
         assertTrue(entry.hasChanged());
     }
 
     @Test
-    public void testAddKeywordTwiceYiedsOnlyOne() {
+    void testAddKeywordTwiceYiedsOnlyOne() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
         entry.addKeyword("FooBar", ',');
@@ -414,28 +414,28 @@ public void testAddKeywordTwiceYiedsOnlyOne() {
     }
 
     @Test
-    public void addKeywordIsCaseSensitive() {
+    void addKeywordIsCaseSensitive() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FOO", ',');
         assertEquals(new KeywordList("Foo", "Bar", "FOO"), entry.getKeywords(','));
     }
 
     @Test
-    public void testAddKeywordWithDifferentCapitalizationChanges() {
+    void testAddKeywordWithDifferentCapitalizationChanges() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FOO", ',');
         assertTrue(entry.hasChanged());
     }
 
     @Test
-    public void testAddKeywordEmptyKeywordIsNotAdded() {
+    void testAddKeywordEmptyKeywordIsNotAdded() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("", ',');
         assertEquals(new KeywordList("Foo", "Bar"), entry.getKeywords(','));
     }
 
     @Test
-    public void testAddKeywordEmptyKeywordNotChanged() {
+    void testAddKeywordEmptyKeywordNotChanged() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.setChanged(false);
         entry.addKeyword("", ',');
@@ -443,83 +443,83 @@ public void testAddKeywordEmptyKeywordNotChanged() {
     }
 
     @Test
-    public void texNewBibEntryHasNoKeywords() {
+    void texNewBibEntryHasNoKeywords() {
         assertTrue(entry.getKeywords(',').isEmpty());
     }
 
     @Test
-    public void texNewBibEntryHasNoKeywordsEvenAfterAddingEmptyKeyword() {
+    void texNewBibEntryHasNoKeywordsEvenAfterAddingEmptyKeyword() {
         entry.addKeyword("", ',');
         assertTrue(entry.getKeywords(',').isEmpty());
     }
 
     @Test
-    public void texNewBibEntryAfterAddingEmptyKeywordNotChanged() {
+    void texNewBibEntryAfterAddingEmptyKeywordNotChanged() {
         entry.addKeyword("", ',');
         assertFalse(entry.hasChanged());
     }
 
     @Test
-    public void testAddKeywordsWorksAsExpected() {
+    void testAddKeywordsWorksAsExpected() {
         entry.addKeywords(Arrays.asList("Foo", "Bar"), ',');
         assertEquals(new KeywordList("Foo", "Bar"), entry.getKeywords(','));
     }
 
     @Test
-    public void testPutKeywordsOverwritesOldKeywords() {
+    void testPutKeywordsOverwritesOldKeywords() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("Yin", "Yang"), ',');
         assertEquals(new KeywordList("Yin", "Yang"), entry.getKeywords(','));
     }
 
     @Test
-    public void testPutKeywordsHasChanged() {
+    void testPutKeywordsHasChanged() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("Yin", "Yang"), ',');
         assertTrue(entry.hasChanged());
     }
 
     @Test
-    public void testPutKeywordsPutEmpyListErasesPreviousKeywords() {
+    void testPutKeywordsPutEmpyListErasesPreviousKeywords() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Collections.emptyList(), ',');
         assertTrue(entry.getKeywords(',').isEmpty());
     }
 
     @Test
-    public void testPutKeywordsPutEmpyListHasChanged() {
+    void testPutKeywordsPutEmpyListHasChanged() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Collections.emptyList(), ',');
         assertTrue(entry.hasChanged());
     }
 
     @Test
-    public void testPutKeywordsPutEmpyListToEmptyBibentry() {
+    void testPutKeywordsPutEmpyListToEmptyBibentry() {
         entry.putKeywords(Collections.emptyList(), ',');
         assertTrue(entry.getKeywords(',').isEmpty());
     }
 
     @Test
-    public void testPutKeywordsPutEmpyListToEmptyBibentryNotChanged() {
+    void testPutKeywordsPutEmpyListToEmptyBibentryNotChanged() {
         entry.putKeywords(Collections.emptyList(), ',');
         assertFalse(entry.hasChanged());
     }
 
     @Test
-    public void putKeywordsToEmptyReturnsNoChange() {
+    void putKeywordsToEmptyReturnsNoChange() {
         Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
         assertEquals(Optional.empty(), change);
     }
 
     @Test
-    public void clearKeywordsReturnsChange() {
+    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);
     }
 
     @Test
-    public void changeKeywordsReturnsChange() {
+    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")),
@@ -527,26 +527,26 @@ public void changeKeywordsReturnsChange() {
     }
 
     @Test
-    public void putKeywordsToSameReturnsNoChange() {
+    void putKeywordsToSameReturnsNoChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Foo", "Bar"), ',');
         assertEquals(Optional.empty(), change);
     }
 
     @Test
-    public void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
+    void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
         entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
         assertEquals(new KeywordList("w1", "w2a w2b", "w3"), entry.getKeywords(','));
     }
 
     @Test
-    public void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
+    void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
         Optional<FieldChange> change = entry.removeKeywords(SpecialField.RANKING.getKeyWords(), ',');
         assertEquals(Optional.empty(), change);
     }
 
     @Test
-    public void removeKeywordsWithEmptyListDoesNothing() {
+    void removeKeywordsWithEmptyListDoesNothing() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
         Optional<FieldChange> change = entry.removeKeywords(new KeywordList(), ',');
@@ -554,7 +554,7 @@ public void removeKeywordsWithEmptyListDoesNothing() {
     }
 
     @Test
-    public void removeKeywordsWithNonExistingKeywordsDoesNothing() {
+    void removeKeywordsWithNonExistingKeywordsDoesNothing() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
         Optional<FieldChange> change = entry.removeKeywords(KeywordList.parse("kw3, kw4", ','), ',');
@@ -563,7 +563,7 @@ public void removeKeywordsWithNonExistingKeywordsDoesNothing() {
     }
 
     @Test
-    public void removeKeywordsWithExistingKeywordsRemovesThem() {
+    void removeKeywordsWithExistingKeywordsRemovesThem() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2", "kw3"), ',');
         Optional<FieldChange> change = entry.removeKeywords(KeywordList.parse("kw1, kw2", ','), ',');
@@ -572,7 +572,7 @@ public void removeKeywordsWithExistingKeywordsRemovesThem() {
     }
 
     @Test
-    public void keywordListCorrectlyConstructedForThreeKeywords() {
+    void keywordListCorrectlyConstructedForThreeKeywords() {
         entry.addKeyword("kw", ',');
         entry.addKeyword("kw2", ',');
         entry.addKeyword("kw3", ',');
@@ -581,7 +581,7 @@ public void keywordListCorrectlyConstructedForThreeKeywords() {
     }
 
     @Test
-    public void testGetEmptyResolvedKeywords() {
+    void testGetEmptyResolvedKeywords() {
         BibDatabase database = new BibDatabase();
         entry.setField(StandardField.CROSSREF, "entry2");
         database.insertEntry(entry);
@@ -596,7 +596,7 @@ public void testGetEmptyResolvedKeywords() {
     }
 
     @Test
-    public void testGetSingleResolvedKeywords() {
+    void testGetSingleResolvedKeywords() {
         BibDatabase database = new BibDatabase();
         entry.setField(StandardField.CROSSREF, "entry2");
 
@@ -613,7 +613,7 @@ public void testGetSingleResolvedKeywords() {
     }
 
     @Test
-    public void testGetResolvedKeywords() {
+    void testGetResolvedKeywords() {
         BibDatabase database = new BibDatabase();
         entry.setField(StandardField.CROSSREF, "entry2");
 
@@ -632,13 +632,13 @@ public void testGetResolvedKeywords() {
     }
 
     @Test
-    public void settingTitleFieldsLeadsToChangeFlagged() {
+    void settingTitleFieldsLeadsToChangeFlagged() {
         entry.setField(StandardField.AUTHOR, "value");
         assertTrue(entry.hasChanged());
     }
 
     @Test
-    public void builderReturnsABibEntryNotChangedFlagged() {
+    void builderReturnsABibEntryNotChangedFlagged() {
         entry = new BibEntry().withField(StandardField.AUTHOR, "value");
         assertFalse(entry.hasChanged());
     }