Merge remote-tracking branch 'upstream/main' into jackson3

Siedlerchr · Siedlerchr · commit f4047931dfb4 · 2025-11-13T21:20:50.000+01:00
* upstream/main: Fix NPE on startup (#14272)
diff --git a/jabgui/src/main/java/org/jabref/Launcher.java b/jabgui/src/main/java/org/jabref/Launcher.java
@@ -7,7 +7,6 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 import org.jabref.cli.ArgumentProcessor;
 import org.jabref.gui.JabRefGUI;
@@ -51,51 +50,56 @@ public enum MultipleInstanceAction {
     }
 
     public static void main(String[] args) {
-        initLogging(args);
-
-        Injector.setModelOrService(BuildInfo.class, new BuildInfo());
-
-        final JabRefGuiPreferences preferences = JabRefGuiPreferences.getInstance();
-
-        ArgumentProcessor argumentProcessor = new ArgumentProcessor(
-                args,
-                ArgumentProcessor.Mode.INITIAL_START,
-                preferences);
+        try {
+            initLogging(args);
+
+            Injector.setModelOrService(BuildInfo.class, new BuildInfo());
+
+            final JabRefGuiPreferences preferences = JabRefGuiPreferences.getInstance();
+
+            ArgumentProcessor argumentProcessor = new ArgumentProcessor(
+                    args,
+                    ArgumentProcessor.Mode.INITIAL_START,
+                    preferences);
+
+            if (!argumentProcessor.getGuiCli().usageHelpRequested) {
+                Injector.setModelOrService(CliPreferences.class, preferences);
+                Injector.setModelOrService(GuiPreferences.class, preferences);
+
+                // Early exit in case another instance is already running
+                MultipleInstanceAction instanceAction = handleMultipleAppInstances(args, preferences.getRemotePreferences());
+                if (instanceAction == MultipleInstanceAction.SHUTDOWN) {
+                    systemExit();
+                } else if (instanceAction == MultipleInstanceAction.FOCUS) {
+                    // Send focus command to running instance
+                    RemotePreferences remotePreferences = preferences.getRemotePreferences();
+                    RemoteClient remoteClient = new RemoteClient(remotePreferences.getPort());
+                    remoteClient.sendFocus();
+                    systemExit();
+                }
 
-        if (!argumentProcessor.getGuiCli().usageHelpRequested) {
-            Injector.setModelOrService(CliPreferences.class, preferences);
-            Injector.setModelOrService(GuiPreferences.class, preferences);
+                configureProxy(preferences.getProxyPreferences());
+                configureSSL(preferences.getSSLPreferences());
+            }
 
-            // Early exit in case another instance is already running
-            MultipleInstanceAction instanceAction = handleMultipleAppInstances(args, preferences.getRemotePreferences());
-            if (instanceAction == MultipleInstanceAction.SHUTDOWN) {
-                systemExit();
-            } else if (instanceAction == MultipleInstanceAction.FOCUS) {
-                // Send focus command to running instance
-                RemotePreferences remotePreferences = preferences.getRemotePreferences();
-                RemoteClient remoteClient = new RemoteClient(remotePreferences.getPort());
-                remoteClient.sendFocus();
+            List<UiCommand> uiCommands = argumentProcessor.processArguments();
+            if (argumentProcessor.shouldShutDown()) {
                 systemExit();
             }
 
-            configureProxy(preferences.getProxyPreferences());
-            configureSSL(preferences.getSSLPreferences());
-        }
-
-        List<UiCommand> uiCommands = argumentProcessor.processArguments();
-        if (argumentProcessor.shouldShutDown()) {
-            systemExit();
-        }
-
-        PreferencesMigrations.runMigrations(preferences);
+            PreferencesMigrations.runMigrations(preferences);
 
-        PostgreServer postgreServer = new PostgreServer();
-        Injector.setModelOrService(PostgreServer.class, postgreServer);
+            PostgreServer postgreServer = new PostgreServer();
+            Injector.setModelOrService(PostgreServer.class, postgreServer);
 
-        CSLStyleLoader.loadInternalStyles();
+            CSLStyleLoader.loadInternalStyles();
 
-        JabRefGUI.setup(uiCommands, preferences);
-        JabRefGUI.launch(JabRefGUI.class, args);
+            JabRefGUI.setup(uiCommands, preferences);
+            JabRefGUI.launch(JabRefGUI.class, args);
+        } catch (Throwable throwable) {
+            LOGGER.error("Could not launch JabRef", throwable);
+            throw throwable;
+        }
     }
 
     /**
@@ -126,16 +130,15 @@ public static void initLogging(String[] args) {
 
         // The "Shared File Writer" is explained at
         // https://tinylog.org/v2/configuration/#shared-file-writer
-        Map<String, String> configuration = Map.of(
-                "level", logLevel.name().toLowerCase(),
-                "writerFile", "rolling file",
-                "writerFile.level", logLevel.name().toLowerCase(),
-                // We need to manually join the path, because ".resolve" does not work on Windows, because ":" is not allowed in file names on Windows
-                "writerFile.file", directory + File.separator + "log_{date:yyyy-MM-dd_HH-mm-ss}.txt",
-                "writerFile.charset", "UTF-8",
-                "writerFile.policies", "startup",
-                "writerFile.backups", "30");
-        configuration.forEach(Configuration::set);
+        Configuration.set("level", logLevel.name().toLowerCase());
+        Configuration.set("writerFile", "rolling file");
+        Configuration.set("writerFile.level", logLevel.name().toLowerCase());
+        // We need to manually join the path, because ".resolve" does not work on Windows,
+        // because ":" is not allowed in file names on Windows
+        Configuration.set("writerFile.file", directory + File.separator + "log_{date:yyyy-MM-dd_HH-mm-ss}.txt");
+        Configuration.set("writerFile.charset", "UTF-8");
+        Configuration.set("writerFile.policies", "startup");
+        Configuration.set("writerFile.backups", "30");
 
         LOGGER = LoggerFactory.getLogger(Launcher.class);
     }
diff --git a/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java b/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -101,52 +101,57 @@ public static void setup(List<UiCommand> uiCommands,
 
     @Override
     public void start(Stage stage) {
-        this.mainStage = stage;
-        Injector.setModelOrService(Stage.class, mainStage);
+        try {
+            this.mainStage = stage;
+            Injector.setModelOrService(Stage.class, mainStage);
+
+            initialize();
+
+            JabRefGUI.mainFrame = new JabRefFrame(
+                    mainStage,
+                    dialogService,
+                    fileUpdateMonitor,
+                    preferences,
+                    aiService,
+                    stateManager,
+                    countingUndoManager,
+                    Injector.instantiateModelOrService(BibEntryTypesManager.class),
+                    clipBoardManager,
+                    taskExecutor,
+                    gitHandlerRegistry);
+
+            openWindow();
+
+            startBackgroundTasks();
+
+            if (!fileUpdateMonitor.isActive()) {
+                dialogService.showErrorDialogAndWait(
+                        Localization.lang("Unable to monitor file changes. Please close files " +
+                                "and processes and restart. You may encounter errors if you continue " +
+                                "with this session."));
+            }
+
+            BuildInfo buildInfo = Injector.instantiateModelOrService(BuildInfo.class);
+            EasyBind.subscribe(preferences.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
+                if (enabled) {
+                    new VersionWorker(buildInfo.version,
+                            dialogService,
+                            taskExecutor,
+                            preferences)
+                            .checkForNewVersionDelayed();
+                }
+            });
+
+            setupProxy();
+        } catch (Throwable throwable) {
+            LOGGER.error("Error during initialization", throwable);
+            throw throwable;
+        }
 
         FallbackExceptionHandler.installExceptionHandler((exception, thread) -> UiTaskExecutor.runInJavaFXThread(() -> {
             DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
             dialogService.showErrorDialogAndWait("Uncaught exception occurred in " + thread, exception);
         }));
-
-        initialize();
-
-        JabRefGUI.mainFrame = new JabRefFrame(
-                mainStage,
-                dialogService,
-                fileUpdateMonitor,
-                preferences,
-                aiService,
-                stateManager,
-                countingUndoManager,
-                Injector.instantiateModelOrService(BibEntryTypesManager.class),
-                clipBoardManager,
-                taskExecutor,
-                gitHandlerRegistry);
-
-        openWindow();
-
-        startBackgroundTasks();
-
-        if (!fileUpdateMonitor.isActive()) {
-            dialogService.showErrorDialogAndWait(
-                    Localization.lang("Unable to monitor file changes. Please close files " +
-                            "and processes and restart. You may encounter errors if you continue " +
-                            "with this session."));
-        }
-
-        BuildInfo buildInfo = Injector.instantiateModelOrService(BuildInfo.class);
-        EasyBind.subscribe(preferences.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
-            if (enabled) {
-                new VersionWorker(buildInfo.version,
-                        dialogService,
-                        taskExecutor,
-                        preferences)
-                        .checkForNewVersionDelayed();
-            }
-        });
-
-        setupProxy();
     }
 
     public void initialize() {
diff --git a/jabgui/src/main/java/org/jabref/gui/newentry/NewEntryView.java b/jabgui/src/main/java/org/jabref/gui/newentry/NewEntryView.java
@@ -72,6 +72,7 @@
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import jakarta.inject.Inject;
+import org.jspecify.annotations.NonNull;
 
 public class NewEntryView extends BaseDialog<BibEntry> {
     private static final String BIBTEX_REGEX = "^@([A-Za-z]+)\\{,";
@@ -590,13 +591,14 @@ private static IdBasedFetcher fetcherFromName(String fetcherName, List<IdBasedFe
         return null;
     }
 
-    private static PlainCitationParserChoice parserFromName(String parserName, List<PlainCitationParserChoice> parsers) {
+    private static @NonNull PlainCitationParserChoice parserFromName(String parserName, List<PlainCitationParserChoice> parsers) {
         for (PlainCitationParserChoice parser : parsers) {
             if (parser.getLocalizedName().equals(parserName)) {
                 return parser;
             }
         }
-        return null;
+        // If nothing could be mapped, return the default - set at {@link org.jabref.gui.preferences.JabRefGuiPreferences.JabRefGuiPreferences}
+        return PlainCitationParserChoice.RULE_BASED_GENERAL;
     }
 
     private Optional<Identifier> extractValidIdentifierFromClipboard() {
diff --git a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -2212,6 +2212,13 @@ public ImporterPreferences getImporterPreferences() {
             return importerPreferences;
         }
 
+        PlainCitationParserChoice defaultPlainCitationParser;
+        try {
+            defaultPlainCitationParser = PlainCitationParserChoice.valueOf(get(DEFAULT_PLAIN_CITATION_PARSER));
+        } catch (IllegalArgumentException ex) {
+            defaultPlainCitationParser = PlainCitationParserChoice.RULE_BASED_GENERAL;
+        }
+
         importerPreferences = new ImporterPreferences(
                 getBoolean(IMPORTERS_ENABLED),
                 getBoolean(GENERATE_KEY_ON_IMPORT),
@@ -2222,7 +2229,7 @@ public ImporterPreferences getImporterPreferences() {
                 getDefaultFetcherKeys(),
                 getBoolean(FETCHER_CUSTOM_KEY_PERSIST),
                 getStringList(SEARCH_CATALOGS),
-                PlainCitationParserChoice.valueOf(get(DEFAULT_PLAIN_CITATION_PARSER)),
+                defaultPlainCitationParser,
                 getInt(CITATIONS_RELATIONS_STORE_TTL)
         );
 

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@`
`72`	`72`	`import com.tobiasdiez.easybind.EasyBind;`
`73`	`73`	`import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;`
`74`	`74`	`import jakarta.inject.Inject;`
	`75`	`+import org.jspecify.annotations.NonNull;`
`75`	`76`
`76`	`77`	`public class NewEntryView extends BaseDialog<BibEntry> {`
`77`	`78`	`private static final String BIBTEX_REGEX = "^@([A-Za-z]+)\\{,";`
`@@ -590,13 +591,14 @@ private static IdBasedFetcher fetcherFromName(String fetcherName, List<IdBasedFe`
`590`	`591`	`return null;`
`591`	`592`	`}`
`592`	`593`
`593`		`- private static PlainCitationParserChoice parserFromName(String parserName, List<PlainCitationParserChoice> parsers) {`
	`594`	`+ private static @NonNull PlainCitationParserChoice parserFromName(String parserName, List<PlainCitationParserChoice> parsers) {`
`594`	`595`	`for (PlainCitationParserChoice parser : parsers) {`
`595`	`596`	`if (parser.getLocalizedName().equals(parserName)) {`
`596`	`597`	`return parser;`
`597`	`598`	`}`
`598`	`599`	`}`
`599`		`- return null;`
	`600`	`+ // If nothing could be mapped, return the default - set at {@link org.jabref.gui.preferences.JabRefGuiPreferences.JabRefGuiPreferences}`
	`601`	`+ return PlainCitationParserChoice.RULE_BASED_GENERAL;`
`600`	`602`	`}`
`601`	`603`
`602`	`604`	`private Optional<Identifier> extractValidIdentifierFromClipboard() {`