Fix NPE when importing from CLI

src/main/java/org/jabref/cli/ArgumentProcessor.java

@@ -220,13 +220,12 @@ private List<ParserResult> processArguments() {
         if (cli.isFileExport()) {
             if (!loaded.isEmpty()) {
                 exportFile(loaded, cli.getFileExport().split(","));
+                LOGGER.debug("Finished export");
             } else {
                 System.err.println(Localization.lang("The output option depends on a valid import option."));
             }
         }
 
-        LOGGER.debug("Finished export");
-
         if (cli.isPreferencesExport()) {
             try {
                 Globals.prefs.exportPreferences(cli.getPreferencesExport());

src/main/java/org/jabref/logic/importer/ParserResult.java

@@ -168,7 +168,7 @@ public String getErrorMessage() {
     }
 
     public BibDatabaseContext getDatabaseContext() {
-        return new BibDatabaseContext(database, metaData, file.toFile());
+        return new BibDatabaseContext(database, metaData, file);
     }
 
     public void setDatabaseContext(BibDatabaseContext bibDatabaseContext) {

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

@@ -31,7 +31,7 @@ public class BibDatabaseContext {
     /**
      * The file where this database was last saved to.
      */
-    private File file;
+    private Optional<Path> file;
     private DatabaseSynchronizer dbmsSynchronizer;
     private CoarseChangeFilter dbmsListener;
     private DatabaseLocation location;
@@ -57,28 +57,29 @@ public BibDatabaseContext(BibDatabase database, MetaData metaData, Defaults defa
         this.database = Objects.requireNonNull(database);
         this.metaData = Objects.requireNonNull(metaData);
         this.location = DatabaseLocation.LOCAL;
+        this.file = Optional.empty();
     }
 
     public BibDatabaseContext(BibDatabase database, MetaData metaData) {
         this(database, metaData, new Defaults());
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, File file, Defaults defaults,
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path file, Defaults defaults,
                               DatabaseLocation location) {
         this(database, metaData, defaults);
         Objects.requireNonNull(location);
-        this.setDatabaseFile(file);
+        this.file = Optional.ofNullable(file);
 
         if (location == DatabaseLocation.LOCAL) {
             convertToLocalDatabase();
         }
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, File file, Defaults defaults) {
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path file, Defaults defaults) {
         this(database, metaData, file, defaults, DatabaseLocation.LOCAL);
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, File file) {
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path file) {
         this(database, metaData, file, new Defaults());
     }
 
@@ -109,19 +110,19 @@ public void setMode(BibDatabaseMode bibDatabaseMode) {
      */
     @Deprecated
     public Optional<File> getDatabaseFile() {
-        return Optional.ofNullable(file);
+        return file.map(Path::toFile);
     }
 
     public void setDatabaseFile(File file) {
-        this.file = file;
+        this.file = Optional.ofNullable(file).map(File::toPath);
     }
 
     public Optional<Path> getDatabasePath() {
-        return Optional.ofNullable(file).map(File::toPath);
+        return file;
     }
 
     public void clearDatabaseFile() {
-        this.file = null;
+        this.file = Optional.empty();
     }
 
     public BibDatabase getDatabase() {
@@ -188,16 +189,12 @@ public List<String> getFileDirectories(String fieldName, FileDirectoryPreference
         List<String> fileDirs = new ArrayList<>();
 
         // 1. metadata user-specific directory
-        Optional<String> userFileDirectory = metaData.getUserFileDirectory(preferences.getUser());
-        if (userFileDirectory.isPresent()) {
-            fileDirs.add(getFileDirectoryPath(userFileDirectory.get()));
-        }
+        metaData.getUserFileDirectory(preferences.getUser())
+                .ifPresent(userFileDirectory -> fileDirs.add(getFileDirectoryPath(userFileDirectory)));
 
         // 2. metadata general directory
-        Optional<String> metaDataDirectory = metaData.getDefaultFileDirectory();
-        if (metaDataDirectory.isPresent()) {
-            fileDirs.add(getFileDirectoryPath(metaDataDirectory.get()));
-        }
+        metaData.getDefaultFileDirectory()
+                .ifPresent(metaDataDirectory -> fileDirs.add(getFileDirectoryPath(metaDataDirectory)));
 
         // 3. preferences directory
         preferences.getFileDirectory(fieldName).ifPresent(path -> fileDirs.add(path.toAbsolutePath().toString()));

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

@@ -36,6 +36,8 @@ public static BibDatabase createDatabase(Collection<BibEntry> bibentries) {
      * an unsucessful import (wrong format) that returns a number of empty entries.
      */
     public static List<BibEntry> purgeEmptyEntries(Collection<BibEntry> entries) {
-        return entries.stream().filter(e -> !e.getFieldNames().isEmpty()).collect(Collectors.toList());
+        return entries.stream()
+                      .filter(entry -> !entry.getFieldNames().isEmpty())
+                      .collect(Collectors.toList());
     }
 }

src/test/java/org/jabref/cli/JabRefCLITest.java

@@ -7,10 +7,10 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class JabRefCLITest {
+class JabRefCLITest {
 
     @Test
-    public void testCLIParsingLongOptions() {
+    void parsingLongOptions() {
         JabRefCLI cli = new JabRefCLI(new String[] {"--nogui", "--import=some/file", "--output=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -20,7 +20,7 @@ public void testCLIParsingLongOptions() {
     }
 
     @Test
-    public void testCLIParsingShortOptions() {
+    void parsingShortOptions() {
         JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-i=some/file", "-o=some/export/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -30,7 +30,7 @@ public void testCLIParsingShortOptions() {
     }
 
     @Test
-    public void testPreferencesExport() {
+    void preferencesExport() {
         JabRefCLI cli = new JabRefCLI(new String[] {"-n", "-x=some/file"});
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -39,11 +39,20 @@ public void testPreferencesExport() {
     }
 
     @Test
-    public void recognizesImportBibtex() {
+    void recognizesImportBibtex() {
         String bibtex = "@article{test, title=\"test title\"}";
         JabRefCLI cli = new JabRefCLI(new String[]{"-ib", bibtex});
         assertEquals(Collections.emptyList(), cli.getLeftOver());
         assertTrue(cli.isBibtexImport());
         assertEquals(bibtex, cli.getBibtexImport());
     }
+
+    @Test
+    void recognizesImportBibtexLong() {
+        String bibtex = "@article{test, title=\"test title\"}";
+        JabRefCLI cli = new JabRefCLI(new String[]{"-importBibtex", bibtex});
+        assertEquals(Collections.emptyList(), cli.getLeftOver());
+        assertTrue(cli.isBibtexImport());
+        assertEquals(bibtex, cli.getBibtexImport());
+    }
 }