Merge branch 'main' into fix-12810-escape-keyword-separators

Author: Rajas55

src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java

@@ -36,8 +36,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class StyleSelectDialogViewModel {
 
     private final DialogService dialogService;
@@ -49,6 +47,8 @@ public class StyleSelectDialogViewModel {
     private final FilePreferences filePreferences;
     private final OpenOfficePreferences openOfficePreferences;
 
+    private final BibEntryTypesManager bibEntryTypesManager;
+
     private final ObjectProperty<Tab> selectedTab = new SimpleObjectProperty<>();
 
     private final ListProperty<JStyleSelectViewModel> jStyles = new SimpleListProperty<>(FXCollections.observableArrayList());
@@ -73,6 +73,8 @@ public StyleSelectDialogViewModel(DialogService dialogService,
         this.filePreferences = preferences.getFilePreferences();
         this.openOfficePreferences = preferences.getOpenOfficePreferences();
 
+        this.bibEntryTypesManager = bibEntryTypesManager;
+
         jStyles.addAll(loadJStyles());
 
         OOStyle currentStyle = openOfficePreferences.getCurrentStyle();
@@ -198,7 +200,7 @@ public void addCslStyleFile() {
 
                 List<CitationStyle> allStyles = CSLStyleLoader.getStyles();
                 List<CitationStylePreviewLayout> updatedLayouts = allStyles.stream()
-                                                                           .map(style -> new CitationStylePreviewLayout(style, Injector.instantiateModelOrService(BibEntryTypesManager.class)))
+                                                                           .map(style -> new CitationStylePreviewLayout(style, bibEntryTypesManager))
                                                                            .toList();
 
                 availableCslLayouts.setAll(updatedLayouts);

src/main/java/org/jabref/model/database/BibDatabase.java

@@ -41,6 +41,7 @@
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -233,7 +234,7 @@ public synchronized void removeEntries(List<BibEntry> toBeDeleted) {
     public synchronized void removeEntries(List<BibEntry> toBeDeleted, EntriesEventSource eventSource) {
         Objects.requireNonNull(toBeDeleted);
 
-        Collection idsToBeDeleted;
+        Collection<String> idsToBeDeleted;
         if (toBeDeleted.size() > 10) {
             idsToBeDeleted = new HashSet<>();
         } else {
@@ -271,19 +272,20 @@ private void forEachCitationKey(BibEntry entry, Consumer<String> keyConsumer) {
         }
     }
 
-    public Set<BibEntry> getEntriesForCitationKey(String citationKey) {
-        return citationIndex.getOrDefault(citationKey, Collections.emptySet());
+    public Set<BibEntry> getEntriesForCitationKey(@Nullable String citationKey) {
+        // explicit null check because citationIndex is a ConcurrentHashMap and will throw NPE on null
+        return citationKey != null ? citationIndex.getOrDefault(citationKey, Collections.emptySet()) : Collections.emptySet();
     }
 
     private Set<String> getReferencedCitationKeys(BibEntry entry) {
         Set<String> keys = new HashSet<>();
-        forEachCitationKey(entry, key -> keys.add(key));
+        forEachCitationKey(entry, keys::add);
         return keys;
     }
 
     private void indexEntry(BibEntry entry) {
         forEachCitationKey(entry, key ->
-                citationIndex.computeIfAbsent(key, k -> ConcurrentHashMap.newKeySet()).add(entry)
+                citationIndex.computeIfAbsent(key, _ -> ConcurrentHashMap.newKeySet()).add(entry)
         );
     }
 
@@ -514,9 +516,7 @@ private String resolveString(String label, Set<String> usedIds, Set<String> allU
                 }
                 // If not, log this string's ID now.
                 usedIds.add(string.getId());
-                if (allUsedIds != null) {
-                    allUsedIds.add(string.getId());
-                }
+                allUsedIds.add(string.getId());
 
                 // Ok, we found the string. Now we must make sure we
                 // resolve any references to other strings in this one.

src/main/java/org/jabref/model/database/KeyChangeListener.java

@@ -14,6 +14,7 @@
 import org.jabref.model.entry.field.InternalField;
 
 import com.google.common.eventbus.Subscribe;
+import org.jspecify.annotations.Nullable;
 
 public class KeyChangeListener {
 
@@ -41,7 +42,7 @@ public void listen(EntriesRemovedEvent event) {
         }
     }
 
-    private void updateEntryLinks(String newKey, String oldKey) {
+    private void updateEntryLinks(String newKey, @Nullable String oldKey) {
         Set<BibEntry> affectedEntries = database.getEntriesForCitationKey(oldKey);
         for (BibEntry entry : affectedEntries) {
             entry.getFields(field -> field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK))