From 50875f9673aa445f0a158dbe15232bb65639b052 Mon Sep 17 00:00:00 2001
From: Linus Dietz <linus@lynyus.de>
Date: Sun, 11 Nov 2018 14:54:54 +0100
Subject: [PATCH 1/6] Update archunit from 0.9.1 -> 0.9.2

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

diff --git a/build.gradle b/build.gradle
index 24665d8c2be..c24ad34130e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -174,8 +174,8 @@ dependencies {
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.2'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.2'
-    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.1'
-    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.1'
+    testCompile 'com.tngtech.archunit:archunit-junit5-api:0.9.2'
+    testRuntime 'com.tngtech.archunit:archunit-junit5-engine:0.9.2'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 

From 38a91e102e1fe8e2f7d26fbeff777b9f5f88ebdd Mon Sep 17 00:00:00 2001
From: Ali_Zhagparov <ali_zhagparov@epam.com>
Date: Thu, 15 Nov 2018 09:51:46 +0600
Subject: [PATCH 2/6] fix save button

---
 .../java/org/jabref/gui/exporter/SaveDatabaseAction.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 60d43a613cb..ecd1d7e6a2f 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -163,7 +163,14 @@ public boolean save() {
             panel.frame().output(Localization.lang("Saving library") + "...");
             panel.setSaving(true);
             return doSave();
+        } else {
+            Optional<Path> savePath = getSavePath();
+            if (savePath.isPresent()) {
+                saveAs(savePath.get());
+                return true;
+            }
         }
+
         return false;
     }
 

From 7412ee5baee876c5f2205f0e226122449f438b37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Nov 2018 09:26:39 +0100
Subject: [PATCH 3/6] Bump applicationinsights-logging-log4j2 from 2.2.0 to
 2.2.1 (#4487)

Bumps [applicationinsights-logging-log4j2](https://github.com/Microsoft/ApplicationInsights-Java) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases)
- [Changelog](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/2.2.0...2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c24ad34130e..e4262ceb102 100644
--- a/build.gradle
+++ b/build.gradle
@@ -158,7 +158,7 @@ dependencies {
     errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
     compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.0'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'

From 544a2d55ad91bbadf854681d2a538d38b24a4fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20S=C3=A1nchez?=
 <42875859+AndresSan6@users.noreply.github.com>
Date: Thu, 15 Nov 2018 04:41:35 -0600
Subject: [PATCH 4/6] Added feature to add server timezone when connecting to
 shared database (#4483)

* Added feature to add server timezone when connecting to shared database

* Rolled back to previous version of AUTHORS. When I run the , it added previous users from the computer I am using.
---
 CHANGELOG.md                                      |  1 +
 .../gui/shared/SharedDatabaseLoginDialog.fxml     |  2 ++
 .../gui/shared/SharedDatabaseLoginDialogView.java |  2 ++
 .../SharedDatabaseLoginDialogViewModel.java       |  5 +++++
 .../logic/shared/DBMSConnectionProperties.java    | 15 +++++++++++++--
 .../shared/prefs/SharedDatabasePreferences.java   | 10 ++++++++++
 .../shared/DatabaseConnectionProperties.java      |  2 ++
 src/main/resources/l10n/JabRef_en.properties      |  1 +
 .../jabref/logic/shared/DBMSConnectionTest.java   |  2 +-
 .../org/jabref/logic/shared/TestConnector.java    |  6 +++---
 10 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ace7046089..8da79177b93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- Added server timezone parameter when connecting to a shared database.
 - We updated the dialog for setting up general fields.
 - URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
 - We changed the behavior of the field formatting dialog such that the `bibtexkey` is not changed when formatting all fields or all text fields.
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
index c8c3d49729c..30808026c50 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialog.fxml
@@ -52,6 +52,8 @@
                         <CheckBox fx:id="useSSL" mnemonicParsing="false" text="%Use SSL" GridPane.rowIndex="5" />
                         <TextField fx:id="fileKeystore" GridPane.columnIndex="1" GridPane.rowIndex="6" />
                         <Button fx:id="browseKeystore" mnemonicParsing="false" onAction="#showOpenKeystoreFileDialog" text="%Browse" GridPane.columnIndex="2" GridPane.rowIndex="6" />
+                        <Label text="%Server Timezone:" GridPane.rowIndex="8"/>
+                        <TextField fx:id="serverTimezone" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="8" />
                         <GridPane>
                           <columnConstraints>
                             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index 4964fd8bb2d..612c2267aea 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -43,6 +43,7 @@ public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
     @FXML private TextField fileKeystore;
     @FXML private PasswordField passwordKeystore;
     @FXML private Button browseKeystore;
+    @FXML private TextField serverTimezone;
 
     @Inject private DialogService dialogService;
 
@@ -83,6 +84,7 @@ 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());
 
         folder.textProperty().bindBidirectional(viewModel.folderProperty());
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 18d0c881baf..dddbce8101a 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -69,6 +69,7 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final StringProperty keystore = new SimpleStringProperty("");
     private final BooleanProperty useSSL = new SimpleBooleanProperty();
     private final StringProperty keyStorePasswordProperty = new SimpleStringProperty("");
+    private final StringProperty serverTimezone = new SimpleStringProperty("");
 
     private final JabRefFrame frame;
     private final DialogService dialogService;
@@ -118,6 +119,7 @@ public void openDatabase() {
         connectionProperties.setPassword(password.getValue());
         connectionProperties.setUseSSL(useSSL.getValue());
         connectionProperties.setKeyStore(keystore.getValue());
+        connectionProperties.setServerTimezone(serverTimezone.getValue());
 
         setupKeyStore();
         openSharedDatabase(connectionProperties);
@@ -200,6 +202,7 @@ private void setPreferences() {
         prefs.setUser(user.getValue());
         prefs.setUseSSL(useSSL.getValue());
         prefs.setKeystoreFile(keystore.getValue());
+        prefs.setServerTimezone(serverTimezone.getValue());
 
         if (rememberPassword.get()) {
             try {
@@ -364,4 +367,6 @@ public ValidationStatus keystoreValidation() {
     public ValidationStatus formValidation() {
         return formValidator.getValidationStatus();
     }
+
+    public StringProperty serverTimezoneProperty() { return serverTimezone; }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index 6373c1e3035..f39eb8a41a4 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -28,6 +28,7 @@ public class DBMSConnectionProperties implements DatabaseConnectionProperties {
     private String user;
     private String password;
     private boolean useSSL;
+    private String serverTimezone;
 
     //Not needed for connection, but stored for future login
     private String keyStore;
@@ -41,7 +42,7 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
     }
 
     public DBMSConnectionProperties(DBMSType type, String host, int port, String database, String user,
-                                    String password, boolean useSSL) {
+                                    String password, boolean useSSL, String serverTimezone) {
         this.type = type;
         this.host = host;
         this.port = port;
@@ -49,6 +50,7 @@ public DBMSConnectionProperties(DBMSType type, String host, int port, String dat
         this.user = user;
         this.password = password;
         this.useSSL = useSSL;
+        this.serverTimezone = serverTimezone;
     }
 
     @Override
@@ -118,6 +120,11 @@ public String getUrl() {
         return type.getUrl(host, port, database);
     }
 
+    @Override
+    public String getServerTimezone() { return serverTimezone; }
+
+    public void setServerTimezone(String serverTimezone) { this.serverTimezone = serverTimezone; }
+
     /**
      * Returns username, password and ssl as Properties Object
      * @return Properties with values for user, password and ssl
@@ -126,6 +133,7 @@ public Properties asProperties() {
         Properties props = new Properties();
         props.setProperty("user", user);
         props.setProperty("password", password);
+        props.setProperty("serverTimezone", serverTimezone);
 
         if (useSSL) {
             props.setProperty("ssl", Boolean.toString(useSSL));
@@ -161,7 +169,9 @@ public boolean equals(Object obj) {
                && Objects.equals(port, properties.getPort())
                && Objects.equals(database, properties.getDatabase())
                && Objects.equals(user, properties.getUser())
-               && Objects.equals(useSSL, properties.isUseSSL());
+               && Objects.equals(useSSL, properties.isUseSSL())
+               && Objects.equals(serverTimezone, properties.getServerTimezone());
+
     }
 
     @Override
@@ -184,6 +194,7 @@ private void setFromPreferences(SharedDatabasePreferences prefs) {
         prefs.getPort().ifPresent(thePort -> this.port = Integer.parseInt(thePort));
         prefs.getName().ifPresent(theDatabase -> this.database = theDatabase);
         prefs.getKeyStoreFile().ifPresent(theKeystore -> this.keyStore = theKeystore);
+        prefs.getServerTimezone().ifPresent(theServerTimezone -> this.serverTimezone = theServerTimezone);
         this.setUseSSL(prefs.isUseSSL());
 
         if (prefs.getUser().isPresent()) {
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 14b306a6b94..45346f334a2 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -32,6 +32,7 @@ public class SharedDatabasePreferences {
     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;
@@ -72,6 +73,10 @@ public Optional<String> getKeyStoreFile() {
         return getOptionalValue(SHARED_DATABASE_KEYSTORE_FILE);
     }
 
+    public Optional<String> getServerTimezone() {
+        return getOptionalValue(SHARED_DATABASE_SERVER_TIMEZONE);
+    }
+
     public boolean getRememberPassword() {
         return internalPrefs.getBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, false);
     }
@@ -116,6 +121,10 @@ public void setKeystoreFile(String keystoreFile) {
         internalPrefs.put(SHARED_DATABASE_KEYSTORE_FILE, keystoreFile);
     }
 
+    public void setServerTimezone(String serverTimezone) {
+        internalPrefs.put(SHARED_DATABASE_SERVER_TIMEZONE, serverTimezone);
+    }
+
     public void clearPassword() {
         internalPrefs.remove(SHARED_DATABASE_PASSWORD);
     }
@@ -142,6 +151,7 @@ public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properti
         setUser(properties.getUser());
         setUseSSL(properties.isUseSSL());
         setKeystoreFile(properties.getKeyStore());
+        setServerTimezone(properties.getServerTimezone());
 
         try {
             setPassword(new Password(properties.getPassword().toCharArray(), properties.getUser()).encrypt());
diff --git a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java b/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
index 152078b6af7..d6966994bf0 100644
--- a/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
+++ b/src/main/java/org/jabref/model/database/shared/DatabaseConnectionProperties.java
@@ -20,4 +20,6 @@ public interface DatabaseConnectionProperties {
 
     boolean isUseSSL();
 
+    String getServerTimezone();
+
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 46918dfc565..056a1952eb0 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2227,6 +2227,7 @@ User\:=User\:
 Keystore\ password\:=Keystore password\:
 Keystore\:=Keystore\:
 Password\:=Password\:
+Server\ Timezone\:=Server Timezone\:
 Remember\ Password=Remember Password
 Use\ SSL=Use SSL
 Move\ preprint\ information\ from\ 'URL'\ and\ 'journal'\ field\ to\ the\ 'eprint'\ field=Move preprint information from 'URL' and 'journal' field to the 'eprint' field
diff --git a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
index 1594d8a93da..d7fb060f4d0 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -26,6 +26,6 @@ public void testGetConnection(DBMSType dbmsType) throws SQLException, InvalidDBM
     @Test
     public void testGetConnectionFail(DBMSType dbmsType) throws SQLException, InvalidDBMSConnectionPropertiesException {
         assertThrows(SQLException.class,
-                () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false)).getConnection());
+                () -> new DBMSConnection(new DBMSConnectionProperties(dbmsType, "XXXX", 0, "XXXX", "XXXX", "XXXX", false, "XXXX")).getConnection());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/TestConnector.java b/src/test/java/org/jabref/logic/shared/TestConnector.java
index 2d42b85e410..9949b83e649 100644
--- a/src/test/java/org/jabref/logic/shared/TestConnector.java
+++ b/src/test/java/org/jabref/logic/shared/TestConnector.java
@@ -17,15 +17,15 @@ public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType) throws SQL
     public static DBMSConnectionProperties getTestConnectionProperties(DBMSType dbmsType) {
 
         if (dbmsType == DBMSType.MYSQL) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "root", "", false);
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "root", "", false, "");
         }
 
         if (dbmsType == DBMSType.POSTGRESQL) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "postgres", "", false);
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "jabref", "postgres", "", false, "");
         }
 
         if (dbmsType == DBMSType.ORACLE) {
-            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "xe", "travis", "travis", false);
+            return new DBMSConnectionProperties(dbmsType, "localhost", dbmsType.getDefaultPort(), "xe", "travis", "travis", false, "");
         }
 
         return new DBMSConnectionProperties();

From 81f15e9e6cdfbf738098fb252e5458e8b3b39bdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Nov 2018 11:42:19 +0100
Subject: [PATCH 5/6] Bump applicationinsights-core from 2.2.0 to 2.2.1 (#4488)

Bumps [applicationinsights-core](https://github.com/Microsoft/ApplicationInsights-Java) from 2.2.0 to 2.2.1.
- [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases)
- [Changelog](https://github.com/Microsoft/ApplicationInsights-Java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Microsoft/ApplicationInsights-Java/compare/2.2.0...2.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e4262ceb102..f364470d047 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,7 +157,7 @@ dependencies {
 
     errorproneJavac 'com.google.errorprone:javac:1.8.0-u20'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.0'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.2.1'
     compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.2.1'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'

From 2953849312b3364f437cb4fbc5d1885a8121ee1d Mon Sep 17 00:00:00 2001
From: Tobias Diez <tobiasdiez@gmx.de>
Date: Fri, 16 Nov 2018 19:53:00 +0100
Subject: [PATCH 6/6] Change location of some fields in the entry editor
 (#4448)

* Change location of some fields in the entry editor

  - Journal/Year/Month in biblatex mode -> Deprecated (if filled)
  - DOI/URL: General -> Optional
  - Internal fields like ranking, read status and priority: Other -> General
  - Moreover, empty deprecated fields are no longer shown

* Fix tests

* Change Review to Comment field
---
 CHANGELOG.md                                  |  5 ++
 .../gui/entryeditor/DeprecatedFieldsTab.java  |  6 +-
 .../logic/integrity/NoBibtexFieldChecker.java | 23 +++--
 .../model/entry/BiblatexEntryTypes.java       | 87 ++++++++-----------
 .../model/entry/InternalBibtexFields.java     | 28 +++---
 .../jabref/preferences/JabRefPreferences.java |  2 +-
 .../logic/integrity/IntegrityCheckTest.java   | 58 ++++++-------
 .../integrity/NoBibTexFieldCheckerTest.java   | 24 ++---
 8 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8da79177b93..1067763a760 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,11 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- We changed the location of some fields in the entry editor (you might need to reset your preferences for these changes to come into effect)
+  - Journal/Year/Month in biblatex mode -> Deprecated (if filled)
+  - DOI/URL: General -> Optional
+  - Internal fields like ranking, read status and priority: Other -> General
+  - Moreover, empty deprecated fields are no longer shown
 - Added server timezone parameter when connecting to a shared database.
 - We updated the dialog for setting up general fields.
 - URL field formatting is updated. All whitespace chars, located at the beginning/ending of the url, are trimmed automatically
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 3b3c1c66438..2e372e7a42c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Collection;
+import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
 
@@ -25,6 +26,9 @@ public DeprecatedFieldsTab(BibDatabaseContext databaseContext, SuggestionProvide
 
     @Override
     protected Collection<String> determineFieldsToShow(BibEntry entry, EntryType entryType) {
-        return entryType.getDeprecatedFields();
+        return entryType.getDeprecatedFields()
+                        .stream()
+                        .filter(entry::hasField)
+                        .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index d2e9bfb09d5..cb1eaef67df 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -10,7 +10,6 @@
 import org.jabref.model.entry.BiblatexEntryTypes;
 import org.jabref.model.entry.BibtexEntryTypes;
 import org.jabref.model.entry.FieldName;
-import org.jabref.model.entry.InternalBibtexFields;
 
 /**
  * This checker checks whether the entry does not contain any field appearing only in biblatex (and not in BibTeX)
@@ -20,14 +19,15 @@ public class NoBibtexFieldChecker implements Checker {
     private List<String> getAllBiblatexOnlyFields() {
         Set<String> allBibtexFields = BibtexEntryTypes.ALL.stream().flatMap(type -> type.getAllFields().stream()).collect(Collectors.toSet());
         return BiblatexEntryTypes.ALL.stream()
-                .flatMap(type -> type.getAllFields().stream())
-                .filter(fieldName -> !allBibtexFields.contains(fieldName))
-                // these fields are displayed by JabRef as default
-                .filter(fieldName -> !InternalBibtexFields.DEFAULT_GENERAL_FIELDS.contains(fieldName))
-                .filter(fieldName -> !fieldName.equals(FieldName.ABSTRACT))
-                .filter(fieldName -> !fieldName.equals(FieldName.REVIEW))
-                .sorted()
-                .collect(Collectors.toList());
+                                     .flatMap(type -> type.getAllFields().stream())
+                                     .filter(fieldName -> !allBibtexFields.contains(fieldName))
+                                     // these fields are displayed by JabRef as default
+                                     .filter(fieldName -> !fieldName.equals(FieldName.ABSTRACT))
+                                     .filter(fieldName -> !fieldName.equals(FieldName.COMMENT))
+                                     .filter(fieldName -> !fieldName.equals(FieldName.DOI))
+                                     .filter(fieldName -> !fieldName.equals(FieldName.URL))
+                                     .sorted()
+                                     .collect(Collectors.toList());
     }
 
     @Override
@@ -35,8 +35,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         // non-static initalization of ALL_BIBLATEX_ONLY_FIELDS as the user can customize the entry types during runtime
         final List<String> allBiblatexOnlyFields = getAllBiblatexOnlyFields();
         return entry.getFieldNames().stream()
-                .filter(name ->  allBiblatexOnlyFields.contains(name))
-                .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
+                    .filter(allBiblatexOnlyFields::contains)
+                    .map(name -> new IntegrityMessage(Localization.lang("biblatex field only"), entry, name)).collect(Collectors.toList());
     }
-
 }
diff --git a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java b/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
index a73f39fcf50..f78c20291d8 100644
--- a/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
+++ b/src/main/java/org/jabref/model/entry/BiblatexEntryTypes.java
@@ -21,14 +21,12 @@ public class BiblatexEntryTypes {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE,
-                    FieldName.orFields(FieldName.JOURNAL, FieldName.JOURNALTITLE),
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.JOURNALTITLE, FieldName.DATE);
             addAllOptional(FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.SUBTITLE,
                     FieldName.TITLEADDON, FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.JOURNALSUBTITLE, FieldName.ISSUETITLE, FieldName.ISSUESUBTITLE, FieldName.LANGUAGE,
                     FieldName.ORIGLANGUAGE, FieldName.SERIES, FieldName.VOLUME, FieldName.NUMBER, FieldName.EID,
-                    FieldName.ISSUE, FieldName.MONTH, FieldName.PAGES, FieldName.VERSION, FieldName.NOTE,
+                    FieldName.ISSUE, FieldName.PAGES, FieldName.VERSION, FieldName.NOTE,
                     FieldName.ISSN, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -53,7 +51,7 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION,
                     FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON,
@@ -84,7 +82,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION,
                     FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON,
@@ -115,8 +113,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE, FieldName.DATE);
             addAllOptional(FieldName.BOOKAUTHOR, FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB,
                     FieldName.EDITORC, FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR,
                     FieldName.INTRODUCTION, FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE,
@@ -195,8 +192,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.HOWPUBLISHED,
                     FieldName.TYPE, FieldName.NOTE, FieldName.LOCATION, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
@@ -223,7 +219,7 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC, FieldName.TRANSLATOR,
                     FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION, FieldName.FOREWORD,
                     FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.MAINTITLE,
@@ -254,7 +250,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC, FieldName.TRANSLATOR,
                     FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION, FieldName.FOREWORD,
                     FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE,
@@ -285,8 +281,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC,
                     FieldName.TRANSLATOR, FieldName.ANNOTATOR, FieldName.COMMENTATOR, FieldName.INTRODUCTION,
                     FieldName.FOREWORD, FieldName.AFTERWORD, FieldName.SUBTITLE, FieldName.TITLEADDON,
@@ -341,8 +336,7 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.EDITION,
                     FieldName.TYPE, FieldName.SERIES, FieldName.NUMBER, FieldName.VERSION, FieldName.NOTE,
                     FieldName.ORGANIZATION, FieldName.PUBLISHER, FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER,
@@ -368,11 +362,10 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.HOWPUBLISHED,
                     FieldName.TYPE, FieldName.VERSION, FieldName.NOTE, FieldName.ORGANIZATION, FieldName.LOCATION,
-                    FieldName.MONTH, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
+                    FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
 
@@ -393,10 +386,9 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.NOTE, FieldName.ORGANIZATION, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE), FieldName.URL);
+            addAllRequired(FieldName.orFields(FieldName.AUTHOR, FieldName.EDITOR), FieldName.TITLE, FieldName.DATE, FieldName.URL);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.VERSION,
-                    FieldName.NOTE, FieldName.ORGANIZATION, FieldName.MONTH, FieldName.ADDENDUM, FieldName.PUBSTATE,
+                    FieldName.NOTE, FieldName.ORGANIZATION, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.URLDATE);
         }
 
@@ -418,10 +410,9 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.NUMBER,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.NUMBER, FieldName.DATE);
             addAllOptional(FieldName.HOLDER, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.TYPE,
-                    FieldName.VERSION, FieldName.LOCATION, FieldName.NOTE, FieldName.MONTH, FieldName.ADDENDUM,
+                    FieldName.VERSION, FieldName.LOCATION, FieldName.NOTE, FieldName.ADDENDUM,
                     FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE,
                     FieldName.URL, FieldName.URLDATE);
         }
@@ -444,10 +435,10 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.EDITOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITORA, FieldName.EDITORB, FieldName.EDITORC, FieldName.SUBTITLE,
                     FieldName.ISSUETITLE, FieldName.ISSUESUBTITLE, FieldName.LANGUAGE, FieldName.SERIES,
-                    FieldName.VOLUME, FieldName.NUMBER, FieldName.ISSUE, FieldName.MONTH, FieldName.NOTE,
+                    FieldName.VOLUME, FieldName.NUMBER, FieldName.ISSUE, FieldName.NOTE,
                     FieldName.ISSN, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -496,12 +487,12 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.MAINTITLE,
                     FieldName.MAINSUBTITLE, FieldName.MAINTITLEADDON, FieldName.EVENTTITLE, FieldName.EVENTTITLEADDON,
                     FieldName.EVENTDATE, FieldName.VENUE, FieldName.LANGUAGE, FieldName.VOLUME, FieldName.PART,
                     FieldName.VOLUMES, FieldName.SERIES, FieldName.NUMBER, FieldName.NOTE, FieldName.ORGANIZATION,
-                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.MONTH, FieldName.YEAR, FieldName.ISBN,
+                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.ISBN,
                     FieldName.CHAPTER, FieldName.PAGES, FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL,
                     FieldName.URLDATE);
@@ -527,11 +518,11 @@ public Set<String> getPrimaryOptionalFields() {
                 FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.EVENTTITLE,
                     FieldName.EVENTTITLEADDON, FieldName.EVENTDATE, FieldName.VENUE, FieldName.LANGUAGE,
                     FieldName.VOLUMES, FieldName.SERIES, FieldName.NUMBER, FieldName.NOTE, FieldName.ORGANIZATION,
-                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.PAGETOTAL,
+                    FieldName.PUBLISHER, FieldName.LOCATION, FieldName.ISBN, FieldName.PAGETOTAL,
                     FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS,
                     FieldName.EPRINTTYPE, FieldName.URL,
                     FieldName.URLDATE);
@@ -558,14 +549,13 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.BOOKTITLE, FieldName.DATE);
             addAllOptional(FieldName.EDITOR, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.MAINTITLE,
                     FieldName.MAINSUBTITLE, FieldName.MAINTITLEADDON, FieldName.BOOKSUBTITLE, FieldName.BOOKTITLEADDON,
                     FieldName.EVENTTITLE, FieldName.EVENTTITLEADDON, FieldName.EVENTDATE, FieldName.VENUE,
                     FieldName.LANGUAGE, FieldName.VOLUME, FieldName.PART, FieldName.VOLUMES, FieldName.SERIES,
                     FieldName.NUMBER, FieldName.NOTE, FieldName.ORGANIZATION, FieldName.PUBLISHER, FieldName.LOCATION,
-                    FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES, FieldName.ADDENDUM,
+                    FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES, FieldName.ADDENDUM,
                     FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE,
                     FieldName.URL, FieldName.URLDATE);
         }
@@ -661,10 +651,9 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NUMBER,
-                    FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION, FieldName.MONTH, FieldName.ISRN,
+                    FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION, FieldName.ISRN,
                     FieldName.CHAPTER, FieldName.PAGES, FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL,
                     FieldName.URLDATE);
@@ -701,10 +690,9 @@ public String getName() {
                         FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.TYPE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NOTE,
-                    FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
+                    FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -727,9 +715,9 @@ public Set<String> getPrimaryOptionalFields() {
                         FieldName.PUBSTATE, FieldName.URL, FieldName.URLDATE)));
 
         {
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.DATE);
             addAllOptional(FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.HOWPUBLISHED,
-                    FieldName.NOTE, FieldName.LOCATION, FieldName.MONTH, FieldName.ADDENDUM, FieldName.PUBSTATE,
+                    FieldName.NOTE, FieldName.LOCATION, FieldName.ADDENDUM, FieldName.PUBSTATE,
                     FieldName.URL, FieldName.URLDATE);
         }
 
@@ -803,10 +791,9 @@ public Set<String> getPrimaryOptionalFields() {
 
         {
             // Treated as alias of "THESIS", except FieldName.TYPE field is optional
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.TYPE, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NOTE,
-                    FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
+                    FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -831,10 +818,9 @@ public Set<String> getPrimaryOptionalFields() {
 
         {
             // Treated as alias of "THESIS", except FieldName.TYPE field is optional
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.TYPE, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE, FieldName.NOTE,
-                    FieldName.LOCATION, FieldName.MONTH, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
+                    FieldName.LOCATION, FieldName.ISBN, FieldName.CHAPTER, FieldName.PAGES,
                     FieldName.PAGETOTAL, FieldName.ADDENDUM, FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT,
                     FieldName.EPRINTCLASS, FieldName.EPRINTTYPE, FieldName.URL, FieldName.URLDATE);
         }
@@ -859,10 +845,9 @@ public Set<String> getPrimaryOptionalFields() {
 
         {
             // Treated as alias of "REPORT", except FieldName.TYPE field is optional
-            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION,
-                    FieldName.orFields(FieldName.YEAR, FieldName.DATE));
+            addAllRequired(FieldName.AUTHOR, FieldName.TITLE, FieldName.INSTITUTION, FieldName.DATE);
             addAllOptional(FieldName.TYPE, FieldName.SUBTITLE, FieldName.TITLEADDON, FieldName.LANGUAGE,
-                    FieldName.NUMBER, FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION, FieldName.MONTH,
+                    FieldName.NUMBER, FieldName.VERSION, FieldName.NOTE, FieldName.LOCATION,
                     FieldName.ISRN, FieldName.CHAPTER, FieldName.PAGES, FieldName.PAGETOTAL, FieldName.ADDENDUM,
                     FieldName.PUBSTATE, FieldName.DOI, FieldName.EPRINT, FieldName.EPRINTCLASS, FieldName.EPRINTTYPE,
                     FieldName.URL, FieldName.URLDATE);
diff --git a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java b/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
index 5de79d360d6..463241b2c6d 100644
--- a/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
+++ b/src/main/java/org/jabref/model/entry/InternalBibtexFields.java
@@ -28,14 +28,8 @@
  * - add a additional properties functionality into the BibtexSingleField class
  */
 public class InternalBibtexFields {
-    /**
-     * These are the fields JabRef always displays as default
-     * {@link org.jabref.preferences.JabRefPreferences#setLanguageDependentDefaultValues()}
-     *
-     * A user can change them. The change is currently stored in the preferences only and not explicitly exposed as separate preferences object
-     */
-    public static final List<String> DEFAULT_GENERAL_FIELDS = Arrays.asList(
-            FieldName.CROSSREF, FieldName.KEYWORDS, FieldName.FILE, FieldName.DOI, FieldName.URL, FieldName.GROUPS, FieldName.OWNER, FieldName.TIMESTAMP
+    private static final List<String> DEFAULT_GENERAL_FIELDS = Arrays.asList(
+            FieldName.CROSSREF, FieldName.KEYWORDS, FieldName.FILE, FieldName.GROUPS, FieldName.OWNER, FieldName.TIMESTAMP
     );
 
     // Lists of fields with special properties
@@ -88,8 +82,10 @@ public class InternalBibtexFields {
 
     private static final List<String> SPECIAL_FIELDS = Arrays.asList(
             SpecialField.PRINTED.getFieldName(),
-            SpecialField.PRIORITY.getFieldName(), SpecialField.QUALITY.getFieldName(),
-            SpecialField.RANKING.getFieldName(), SpecialField.READ_STATUS.getFieldName(),
+            SpecialField.PRIORITY.getFieldName(),
+            SpecialField.QUALITY.getFieldName(),
+            SpecialField.RANKING.getFieldName(),
+            SpecialField.READ_STATUS.getFieldName(),
             SpecialField.RELEVANCE.getFieldName()
     );
 
@@ -473,6 +469,18 @@ public static List<String> getIEEETranBSTctlYesNoFields() {
         return YES_NO_FIELDS;
     }
 
+    /**
+     * These are the fields JabRef always displays as default {@link org.jabref.preferences.JabRefPreferences#setLanguageDependentDefaultValues()}
+     *
+     * A user can change them. The change is currently stored in the preferences only and not explicitly exposed as
+     * separate preferences object
+     */
+    public static List<String> getDefaultGeneralFields() {
+        List<String> defaultGeneralFields = new ArrayList<>(DEFAULT_GENERAL_FIELDS);
+        defaultGeneralFields.addAll(SPECIAL_FIELDS);
+        return defaultGeneralFields;
+    }
+
     /**
      * Insert a field into the internal list
      */
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 65024a89f13..cd69952856f 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -988,7 +988,7 @@ public List<String> getCustomTabFieldNames() {
     public void setLanguageDependentDefaultValues() {
         // Entry editor tab 0:
         defaults.put(CUSTOM_TAB_NAME + "_def0", Localization.lang("General"));
-        String fieldNames = InternalBibtexFields.DEFAULT_GENERAL_FIELDS.stream().collect(Collectors.joining(";"));
+        String fieldNames = InternalBibtexFields.getDefaultGeneralFields().stream().collect(Collectors.joining(";"));
         defaults.put(CUSTOM_TAB_FIELDS + "_def0", fieldNames);
 
         // Entry editor tab 1:
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index 10b75ae8a37..54a1d715e99 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -33,10 +33,10 @@
 import static org.mockito.Mockito.mock;
 
 @ExtendWith(TempDirectory.class)
-public class IntegrityCheckTest {
+class IntegrityCheckTest {
 
     @Test
-    public void testEntryTypeChecks() {
+    void testEntryTypeChecks() {
         assertCorrect(withMode(createContext("title", "sometitle", "article"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("title", "sometitle", "patent"), BibDatabaseMode.BIBTEX));
         assertCorrect((withMode(createContext("title", "sometitle", "patent"), BibDatabaseMode.BIBLATEX)));
@@ -44,7 +44,7 @@ public void testEntryTypeChecks() {
     }
 
     @Test
-    public void testUrlChecks() {
+    void testUrlChecks() {
         assertCorrect(createContext("url", "http://www.google.com"));
         assertCorrect(createContext("url", "file://c:/asdf/asdf"));
         assertCorrect(createContext("url", "http://scikit-learn.org/stable/modules/ensemble.html#random-forests"));
@@ -55,7 +55,7 @@ public void testUrlChecks() {
     }
 
     @Test
-    public void testYearChecks() {
+    void testYearChecks() {
         assertCorrect(createContext("year", "2014"));
         assertCorrect(createContext("year", "1986"));
         assertCorrect(createContext("year", "around 1986"));
@@ -74,7 +74,7 @@ public void testYearChecks() {
     }
 
     @Test
-    public void testEditionChecks() {
+    void testEditionChecks() {
         assertCorrect(withMode(createContext("edition", "Second"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("edition", "Third"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("edition", "second"), BibDatabaseMode.BIBTEX));
@@ -89,7 +89,7 @@ public void testEditionChecks() {
     }
 
     @Test
-    public void testNoteChecks() {
+    void testNoteChecks() {
         assertCorrect(withMode(createContext("note", "Lorem ipsum"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("note", "Lorem ipsum? 10"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("note", "lorem ipsum"), BibDatabaseMode.BIBTEX));
@@ -99,7 +99,7 @@ public void testNoteChecks() {
     }
 
     @Test
-    public void testHowpublishedChecks() {
+    void testHowpublishedChecks() {
         assertCorrect(withMode(createContext("howpublished", "Lorem ipsum"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("howpublished", "Lorem ipsum? 10"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("howpublished", "lorem ipsum"), BibDatabaseMode.BIBTEX));
@@ -109,7 +109,7 @@ public void testHowpublishedChecks() {
     }
 
     @Test
-    public void testMonthChecks() {
+    void testMonthChecks() {
         assertCorrect(withMode(createContext("month", "#mar#"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("month", "#dec#"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("month", "#bla#"), BibDatabaseMode.BIBTEX));
@@ -127,13 +127,13 @@ public void testMonthChecks() {
     }
 
     @Test
-    public void testJournaltitleChecks() {
+    void testJournaltitleChecks() {
         assertWrong(withMode(createContext("journaltitle", "A journal"), BibDatabaseMode.BIBLATEX));
         assertWrong(withMode(createContext("journaltitle", "A journal"), BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    public void testBibtexkeyChecks() {
+    void testBibtexkeyChecks() {
         final BibDatabaseContext correctContext = createContext("bibtexkey", "Knuth2014");
         correctContext.getDatabase().getEntries().get(0).setField("author", "Knuth");
         correctContext.getDatabase().getEntries().get(0).setField("year", "2014");
@@ -146,7 +146,7 @@ public void testBibtexkeyChecks() {
     }
 
     @Test
-    public void testBracketChecks() {
+    void testBracketChecks() {
         assertCorrect(createContext("title", "x"));
         assertCorrect(createContext("title", "{x}"));
         assertCorrect(createContext("title", "{x}x{}x{{}}"));
@@ -156,7 +156,7 @@ public void testBracketChecks() {
     }
 
     @Test
-    public void testAuthorNameChecks() {
+    void testAuthorNameChecks() {
         for (String field : InternalBibtexFields.getPersonNameFields()) {
             // getPersonNameFields returns fields that are available in biblatex only
             // if run without mode, the NoBibtexFieldChecker will complain that "afterword" is a biblatex only field
@@ -173,7 +173,7 @@ public void testAuthorNameChecks() {
     }
 
     @Test
-    public void testTitleChecks() {
+    void testTitleChecks() {
         assertCorrect(withMode(createContext("title", "This is a title"), BibDatabaseMode.BIBTEX));
         assertWrong(withMode(createContext("title", "This is a Title"), BibDatabaseMode.BIBTEX));
         assertCorrect(withMode(createContext("title", "This is a {T}itle"), BibDatabaseMode.BIBTEX));
@@ -192,7 +192,7 @@ public void testTitleChecks() {
     }
 
     @Test
-    public void testAbbreviationChecks() {
+    void testAbbreviationChecks() {
         for (String field : Arrays.asList("booktitle", "journal")) {
             assertCorrect(createContext(field, "IEEE Software"));
             assertCorrect(createContext(field, ""));
@@ -201,13 +201,13 @@ public void testAbbreviationChecks() {
     }
 
     @Test
-    public void testJournalIsKnownInAbbreviationList() {
+    void testJournalIsKnownInAbbreviationList() {
         assertCorrect(createContext("journal", "IEEE Software"));
         assertWrong(createContext("journal", "IEEE Whocares"));
     }
 
     @Test
-    public void testFileChecks() {
+    void testFileChecks() {
         MetaData metaData = mock(MetaData.class);
         Mockito.when(metaData.getDefaultFileDirectory()).thenReturn(Optional.of("."));
         Mockito.when(metaData.getUserFileDirectory(any(String.class))).thenReturn(Optional.empty());
@@ -220,32 +220,32 @@ public void testFileChecks() {
     }
 
     @Test
-    public void fileCheckFindsFilesRelativeToBibFile(@TempDirectory.TempDir Path testFolder) throws IOException {
+    void fileCheckFindsFilesRelativeToBibFile(@TempDirectory.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("file", ":file.pdf:PDF");
-        databaseContext.setDatabaseFile(bibFile.toFile());
+        databaseContext.setDatabaseFile(bibFile);
 
         assertCorrect(databaseContext);
     }
 
     @Test
-    public void testTypeChecks() {
+    void testTypeChecks() {
         assertCorrect(createContext("pages", "11--15", "inproceedings"));
         assertWrong(createContext("pages", "11--15", "proceedings"));
     }
 
     @Test
-    public void testBooktitleChecks() {
+    void testBooktitleChecks() {
         assertCorrect(createContext("booktitle", "2014 Fourth International Conference on Digital Information and Communication Technology and it's Applications (DICTAP)", "proceedings"));
         assertWrong(createContext("booktitle", "Digital Information and Communication Technology and it's Applications (DICTAP), 2014 Fourth International Conference on", "proceedings"));
     }
 
     @Test
-    public void testPageNumbersChecks() {
+    void testPageNumbersChecks() {
         assertCorrect(createContext("pages", "1--2"));
         assertCorrect(createContext("pages", "12"));
         assertWrong(createContext("pages", "1-2"));
@@ -260,7 +260,7 @@ public void testPageNumbersChecks() {
     }
 
     @Test
-    public void testBiblatexPageNumbersChecks() {
+    void testBiblatexPageNumbersChecks() {
         assertCorrect(withMode(createContext("pages", "1--2"), BibDatabaseMode.BIBLATEX));
         assertCorrect(withMode(createContext("pages", "12"), BibDatabaseMode.BIBLATEX));
         assertCorrect(withMode(createContext("pages", "1-2"), BibDatabaseMode.BIBLATEX)); // only diff to bibtex
@@ -275,7 +275,7 @@ public void testBiblatexPageNumbersChecks() {
     }
 
     @Test
-    public void testBibStringChecks() {
+    void testBibStringChecks() {
         assertCorrect(createContext("title", "Not a single hash mark"));
         assertCorrect(createContext("month", "#jan#"));
         assertCorrect(createContext("author", "#einstein# and #newton#"));
@@ -284,7 +284,7 @@ public void testBibStringChecks() {
     }
 
     @Test
-    public void testHTMLCharacterChecks() {
+    void testHTMLCharacterChecks() {
         assertCorrect(createContext("title", "Not a single {HTML} character"));
         assertCorrect(createContext("month", "#jan#"));
         assertCorrect(createContext("author", "A. Einstein and I. Newton"));
@@ -295,7 +295,7 @@ public void testHTMLCharacterChecks() {
     }
 
     @Test
-    public void testISSNChecks() {
+    void testISSNChecks() {
         assertCorrect(createContext("issn", "0020-7217"));
         assertCorrect(createContext("issn", "1687-6180"));
         assertCorrect(createContext("issn", "2434-561x"));
@@ -304,7 +304,7 @@ public void testISSNChecks() {
     }
 
     @Test
-    public void testISBNChecks() {
+    void testISBNChecks() {
         assertCorrect(createContext("isbn", "0-201-53082-1"));
         assertCorrect(createContext("isbn", "0-9752298-0-X"));
         assertCorrect(createContext("isbn", "978-0-306-40615-7"));
@@ -314,7 +314,7 @@ public void testISBNChecks() {
     }
 
     @Test
-    public void testDOIChecks() {
+    void testDOIChecks() {
         assertCorrect(createContext("doi", "10.1023/A:1022883727209"));
         assertCorrect(createContext("doi", "10.17487/rfc1436"));
         assertCorrect(createContext("doi", "10.1002/(SICI)1097-4571(199205)43:4<284::AID-ASI3>3.0.CO;2-0"));
@@ -322,7 +322,7 @@ public void testDOIChecks() {
     }
 
     @Test
-    public void testEntryIsUnchangedAfterChecks() {
+    void testEntryIsUnchangedAfterChecks() {
         BibEntry entry = new BibEntry();
 
         // populate with all known fields
@@ -349,7 +349,7 @@ public void testEntryIsUnchangedAfterChecks() {
     }
 
     @Test
-    public void testASCIIChecks() {
+    void testASCIIChecks() {
         assertCorrect(createContext("title", "Only ascii characters!'@12"));
         assertWrong(createContext("month", "Umlauts are nöt ällowed"));
         assertWrong(createContext("author", "Some unicode ⊕"));
diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
index 1ce9aae56a7..40295364ecc 100644
--- a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
@@ -9,26 +9,26 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-public class NoBibTexFieldCheckerTest {
+class NoBibTexFieldCheckerTest {
 
     private final NoBibtexFieldChecker checker = new NoBibtexFieldChecker();
 
     @Test
-    public void abstractIsNotRecognizedAsBiblatexOnlyField() {
+    void abstractIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("abstract", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void addressIsNotRecognizedAsBiblatexOnlyField() {
+    void addressIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("address", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void afterwordIsRecognizedAsBiblatexOnlyField() {
+    void afterwordIsRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("afterword", "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, "afterword");
@@ -37,35 +37,35 @@ public void afterwordIsRecognizedAsBiblatexOnlyField() {
     }
 
     @Test
-    public void arbitraryNonBiblatexFieldIsNotRecognizedAsBiblatexOnlyField() {
+    void arbitraryNonBiblatexFieldIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("fieldNameNotDefinedInThebiblatexManual", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void commentIsNotRecognizedAsBiblatexOnlyField() {
+    void commentIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("comment", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void instituationIsNotRecognizedAsBiblatexOnlyField() {
+    void instituationIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("institution", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void journalIsNotRecognizedAsBiblatexOnlyField() {
+    void journalIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("journal", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void journaltitleIsRecognizedAsBiblatexOnlyField() {
+    void journaltitleIsRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("journaltitle", "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, "journaltitle");
@@ -74,14 +74,14 @@ public void journaltitleIsRecognizedAsBiblatexOnlyField() {
     }
 
     @Test
-    public void keywordsNotRecognizedAsBiblatexOnlyField() {
+    void keywordsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("keywords", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
     @Test
-    public void locationIsRecognizedAsBiblatexOnlyField() {
+    void locationIsRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("location", "test");
         IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, "location");
@@ -90,7 +90,7 @@ public void locationIsRecognizedAsBiblatexOnlyField() {
     }
 
     @Test
-    public void reviewIsNotRecognizedAsBiblatexOnlyField() {
+    void reviewIsNotRecognizedAsBiblatexOnlyField() {
         BibEntry entry = new BibEntry();
         entry.setField("review", "test");
         assertEquals(Collections.emptyList(), checker.check(entry));