Revert "Mark some methods as deprecated in BibEntry and BibDatabase (#1913)" (#2023)

This reverts commit a9eb978.

# Conflicts:
#	src/main/java/net/sf/jabref/logic/importer/fileformat/PdfContentImporter.java
#	src/main/java/net/sf/jabref/model/database/BibDatabase.java
#	src/main/java/net/sf/jabref/model/entry/BibEntry.java
#	src/test/java/net/sf/jabref/logic/search/DatabaseSearcherTest.java

Author: koppor

src/jmh/java/net/sf/jabref/benchmarks/Benchmarks.java

@@ -58,7 +58,7 @@ public void init() throws Exception {
             entry.setField("keyword", "testkeyword");
             entry.setField("year", "1" + i);
             entry.setField("rnd", "2" + randomizer.nextInt());
-            database.insertEntryWithDuplicationCheck(entry);
+            database.insertEntry(entry);
         }
         BibtexDatabaseWriter<StringSaveSession> databaseWriter = new BibtexDatabaseWriter<>(StringSaveSession::new);
         StringSaveSession saveSession = databaseWriter.savePartOfDatabase(

src/main/java/net/sf/jabref/collab/EntryAddChange.java

@@ -31,8 +31,8 @@ public EntryAddChange(BibEntry diskEntry) {
     @Override
     public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound undoEdit) {
         diskEntry.setId(IdGenerator.next());
-        panel.getDatabase().insertEntryWithDuplicationCheck(diskEntry);
-        secondary.insertEntryWithDuplicationCheck(diskEntry);
+        panel.getDatabase().insertEntry(diskEntry);
+        secondary.insertEntry(diskEntry);
         undoEdit.addEdit(new UndoableInsertEntry(panel.getDatabase(), diskEntry, panel));
         return true;
     }

src/main/java/net/sf/jabref/gui/BasePanel.java

@@ -830,7 +830,7 @@ private void paste() {
                 // independently of the copied
                 // ones.
                 be.setId(IdGenerator.next());
-                bibDatabaseContext.getDatabase().insertEntryWithDuplicationCheck(be);
+                bibDatabaseContext.getDatabase().insertEntry(be);
 
                 ce.addEdit(new UndoableInsertEntry(bibDatabaseContext.getDatabase(), be, BasePanel.this));
 
@@ -1138,7 +1138,7 @@ public BibEntry newEntry(EntryType type) {
             String id = IdGenerator.next();
             final BibEntry be = new BibEntry(id, actualType.getName());
             try {
-                bibDatabaseContext.getDatabase().insertEntryWithDuplicationCheck(be);
+                bibDatabaseContext.getDatabase().insertEntry(be);
                 // Set owner/timestamp if options are enabled:
                 List<BibEntry> list = new ArrayList<>();
                 list.add(be);
@@ -1305,7 +1305,7 @@ public void listen(EntryRemovedEvent removedEntryEvent) {
     public void insertEntry(final BibEntry bibEntry) {
         if (bibEntry != null) {
             try {
-                bibDatabaseContext.getDatabase().insertEntryWithDuplicationCheck(bibEntry);
+                bibDatabaseContext.getDatabase().insertEntry(bibEntry);
                 if (Globals.prefs.getBoolean(JabRefPreferences.USE_OWNER)) {
                     // Set owner field to default value
                     UpdateField.setAutomaticFields(bibEntry, true, true, Globals.prefs.getUpdateFieldPreferences());

src/main/java/net/sf/jabref/gui/DuplicateSearch.java

@@ -124,7 +124,7 @@ public void run() {
                 // and adding merged entries:
                 if (!toAdd.isEmpty()) {
                     for (BibEntry entry : toAdd) {
-                        panel.getDatabase().insertEntryWithDuplicationCheck(entry);
+                        panel.getDatabase().insertEntry(entry);
                         ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), entry, panel));
                     }
                     panel.markBaseChanged();

src/main/java/net/sf/jabref/gui/externalfiles/DroppedFileHandler.java

@@ -294,7 +294,7 @@ private boolean tryXmpImport(String fileName, ExternalFileType fileType, NamedCo
 
                 aXmpEntriesInFile.setId(IdGenerator.next());
                 edits.addEdit(new UndoableInsertEntry(panel.getDatabase(), aXmpEntriesInFile, panel));
-                panel.getDatabase().insertEntryWithDuplicationCheck(aXmpEntriesInFile);
+                panel.getDatabase().insertEntry(aXmpEntriesInFile);
                 doLink(aXmpEntriesInFile, fileType, destFilename, true, edits);
 
             }

src/main/java/net/sf/jabref/gui/importer/EntryFromFileCreatorManager.java

@@ -147,7 +147,7 @@ public int addEntriesFromFiles(List<File> files,
                 if (!database.containsEntryWithId(entry.get().getId())) {
                     // Work around SIDE EFFECT of creator.createEntry. The EntryFromPDFCreator also creates the entry in the table
                     // Therefore, we only insert the entry if it is not already present
-                    if (database.insertEntryWithDuplicationCheck(entry.get())) {
+                    if (database.insertEntry(entry.get())) {
                         importGUIMessages.add("Problem importing " + f.getPath() + ": Insert into BibDatabase failed.");
                     } else {
                         count++;

src/main/java/net/sf/jabref/gui/importer/ImportInspectionDialog.java

@@ -459,7 +459,7 @@ private void generateKeyForEntry(BibEntry entry) {
 
             entry.setId(IdGenerator.next());
             // Add the entry to the database we are working with:
-            database.insertEntryWithDuplicationCheck(entry);
+            database.insertEntry(entry);
 
             // Generate a unique key:
             BibtexKeyPatternUtil.makeLabel(localMetaData, database, entry,
@@ -502,7 +502,7 @@ private void generateKeys() {
             for (BibEntry entry : entries) {
 
                 entry.setId(IdGenerator.next());
-                database.insertEntryWithDuplicationCheck(entry);
+                database.insertEntry(entry);
 
                 BibtexKeyPatternUtil.makeLabel(localMetaData, database, entry,
                         Globals.prefs.getBibtexKeyPatternPreferences());
@@ -736,7 +736,7 @@ private void addSelectedEntries(NamedCompound ce, final List<BibEntry> selected)
                 }
 
                 entry.setId(IdGenerator.next());
-                panel.getDatabase().insertEntryWithDuplicationCheck(entry);
+                panel.getDatabase().insertEntry(entry);
                 ce.addEdit(new UndoableInsertEntry(panel.getDatabase(), entry, panel));
 
             }

src/main/java/net/sf/jabref/gui/importer/ImportMenuItem.java

@@ -206,7 +206,7 @@ private ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImp
 
                 // Merge entries:
                 for (BibEntry entry : pr.getDatabase().getEntries()) {
-                    database.insertEntryWithDuplicationCheck(entry);
+                    database.insertEntry(entry);
                 }
 
                 // Merge strings:
@@ -233,7 +233,7 @@ private ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImp
                     if (markEntries) {
                         EntryMarker.markEntry(entry, EntryMarker.IMPORT_MARK_LEVEL, false, new NamedCompound(""));
                     }
-                    database.insertEntryWithDuplicationCheck(entry);
+                    database.insertEntry(entry);
                 }
             }
         }

src/main/java/net/sf/jabref/gui/importer/actions/AppendDatabaseAction.java

@@ -118,7 +118,7 @@ private static void mergeFromBibtex(JabRefFrame frame, BasePanel panel, ParserRe
                 be.setId(IdGenerator.next());
                 UpdateField.setAutomaticFields(be, overwriteOwner, overwriteTimeStamp,
                         Globals.prefs.getUpdateFieldPreferences());
-                database.insertEntryWithDuplicationCheck(be);
+                database.insertEntry(be);
                 appendedEntries.add(be);
                 originalEntries.add(originalEntry);
                 ce.addEdit(new UndoableInsertEntry(database, be, panel));

src/main/java/net/sf/jabref/gui/maintable/MainTableColumn.java

@@ -94,7 +94,7 @@ public Object getColumnValue(BibEntry entry) {
 
         Optional<String> content = Optional.empty();
         for (String field : bibtexFields) {
-            content = entry.getResolvedFieldOrAlias(field, database.orElse(null));
+            content = BibDatabase.getResolvedField(field, entry, database.orElse(null));
             if (content.isPresent()) {
                 isNameColumn = InternalBibtexFields.getFieldProperties(field).contains(FieldProperty.PERSON_NAMES);
                 break;
@@ -127,7 +127,7 @@ public JLabel getHeaderLabel() {
      * 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, getResolvedFieldOrAlias()
+     * - There are some alias fields. For example, if the entry has a date field but no year field, getResolvedField()
      *   will return the year value from the date field when queried for year
      *
      *
@@ -148,7 +148,7 @@ public boolean isResolved(BibEntry entry) {
                 return false;
             } else {
                 plainFieldContent = entry.getField(field);
-                resolvedFieldContent = entry.getResolvedFieldOrAlias(field, database.orElse(null));
+                resolvedFieldContent = BibDatabase.getResolvedField(field, entry, database.orElse(null));
             }
 
             if (resolvedFieldContent.isPresent()) {