Fix downloaded files moved to citation key dir

CHANGELOG.md

@@ -85,6 +85,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where "null" appeared in generated BibTeX keys. [#6459](https://github.com/JabRef/jabref/issues/6459)
 - We fixed an issue where the authors' names were incorrectly displayed in the authors' column when they were bracketed. [#6465](https://github.com/JabRef/jabref/issues/6465) [#6459](https://github.com/JabRef/jabref/issues/6459)
 - We fixed an issue where importing certain unlinked files would result in an exception [#5815](https://github.com/JabRef/jabref/issues/5815)
+- We fixed an issue where downloaded files would be moved to a directory named after the citationkey when no file directory pattern is specified [#6589](https://github.com/JabRef/jabref/issues/6589)
 
 ### Removed
 

src/main/java/org/jabref/logic/util/io/FileUtil.java

@@ -284,7 +284,7 @@ public static String createDirNameFromPattern(BibDatabase database, BibEntry ent
         String targetName = BracketedPattern.expandBrackets(directoryNamePattern, ';', entry, database);
 
         if (targetName.isEmpty()) {
-            targetName = entry.getCiteKeyOptional().orElse("default");
+            return targetName;
         }
 
         // Removes illegal characters from directory name

src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java

@@ -111,6 +111,19 @@ void movesFileWithFileDirPattern() throws Exception {
         assertTrue(Files.exists(fileAfter));
     }
 
+    @Test
+    void doesNotMoveFileWithEmptyFileDirPattern() throws Exception {
+        when(filePreferences.getFileDirPattern()).thenReturn("");
+        cleanup.cleanup(entry);
+
+        Path fileAfter = defaultFileFolder.resolve("test.pdf");
+        assertEquals(
+                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", "test.pdf", ""))),
+                entry.getField(StandardField.FILE));
+        assertFalse(Files.exists(fileBefore));
+        assertTrue(Files.exists(fileAfter));
+    }
+
     @Test
     void movesFileWithSubdirectoryPattern() throws Exception {
         when(filePreferences.getFileDirPattern()).thenReturn("[entrytype]/[year]/[auth]");

src/test/java/org/jabref/logic/util/io/FileUtilTest.java

@@ -357,15 +357,26 @@ void invalidFilenameWithoutExtension() {
     @Test
     void testGetLinkedDirNameDefaultFullTitle() {
         // bibkey - title
-        String fileNamePattern = "PDF/[year]/[auth]/[bibtexkey] - [fulltitle]";
+        String fileDirPattern = "PDF/[year]/[auth]/[bibtexkey] - [fulltitle]";
         BibEntry entry = new BibEntry();
         entry.setCiteKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
         entry.setField(StandardField.YEAR, "1998");
         entry.setField(StandardField.AUTHOR, "A. Åuthör and Author, Bete");
 
-        assertEquals("PDF/1998/Åuthör/1234 - mytitle",
-                FileUtil.createDirNameFromPattern(null, entry, fileNamePattern));
+        assertEquals("PDF/1998/Åuthör/1234 - mytitle", FileUtil.createDirNameFromPattern(null, entry, fileDirPattern));
+    }
+
+    @Test
+    void testGetLinkedDirNamePatternEmpty() {
+        // bibkey - title
+        BibEntry entry = new BibEntry();
+        entry.setCiteKey("1234");
+        entry.setField(StandardField.TITLE, "mytitle");
+        entry.setField(StandardField.YEAR, "1998");
+        entry.setField(StandardField.AUTHOR, "A. Åuthör and Author, Bete");
+
+        assertEquals("", FileUtil.createDirNameFromPattern(null, entry, ""));
     }
 
     @Test