use builder of BibEntry with citation key

Author: josephyim

jabsrv/src/test/java/org/jabref/http/server/cayw/CAYWResourceTest.java

@@ -27,7 +27,7 @@ protected Application configure() {
         resourceConfig.register(new AbstractBinder() {
             @Override protected void configure() {
                 SrvStateManager mockSrv = Mockito.mock(SrvStateManager.class);
-                BibEntry bibEntry = new BibEntry("Author2023test");
+                BibEntry bibEntry = new BibEntry().withCitationKey("Author2023test");
                 Mockito.when(mockSrv.getSelectedEntries()).thenReturn(FXCollections.observableArrayList(bibEntry));
                 bind(mockSrv).to(SrvStateManager.class);
             }

jabsrv/src/test/java/org/jabref/http/server/cayw/format/CAYWFormattersTest.java

@@ -2,6 +2,8 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.jabref.http.server.cayw.CAYWQueryParams;
 import org.jabref.http.server.cayw.gui.CAYWEntry;
@@ -15,13 +17,16 @@
 
 class CAYWFormattersTest {
 
-    private static CAYWEntry caywEntry(String key) {
-        BibEntry bibEntry = new BibEntry();
-        bibEntry.setCitationKey(key);
-        return new CAYWEntry(bibEntry, "", "", "");
+    private List<CAYWEntry> caywEntries(String... keys) {
+        if (keys == null) {
+            return List.of();
+        }
+        return Stream.of(keys)
+                     .map(key -> new CAYWEntry(new BibEntry().withCitationKey(key), key, key, ""))
+                     .collect(Collectors.toList());
     }
 
-    private static CAYWQueryParams queryParams(String command) {
+    private CAYWQueryParams queryParams(String command) {
         CAYWQueryParams mock = Mockito.mock(CAYWQueryParams.class);
         Mockito.when(mock.getCommand()).thenReturn(Optional.ofNullable(command));
         return mock;
@@ -30,15 +35,15 @@ private static CAYWQueryParams queryParams(String command) {
     @Test
     void biblatex_noCommand() {
         BibLatexFormatter formatter = new BibLatexFormatter("autocite");
-        String actual = formatter.format(queryParams(null), List.of(caywEntry("key1"), caywEntry("key2")));
+        String actual = formatter.format(queryParams(null), caywEntries("key1", "key2"));
         assertEquals("\\autocite{key1,key2}", actual);
         assertEquals(MediaType.TEXT_PLAIN_TYPE, formatter.getMediaType());
     }
 
     @Test
     void biblatex_explicitCommand() {
         BibLatexFormatter formatter = new BibLatexFormatter("autocite");
-        String actual = formatter.format(queryParams("cite"), List.of(caywEntry("key1")));
+        String actual = formatter.format(queryParams("cite"), caywEntries("key1"));
         assertEquals("\\cite{key1}", actual);
         assertEquals(MediaType.TEXT_PLAIN_TYPE, formatter.getMediaType());
     }
@@ -47,26 +52,23 @@ void biblatex_explicitCommand() {
     void biblatex_missingKey() {
         // If you decide to DROP empties, change formatter + this expectation.
         BibLatexFormatter formatter = new BibLatexFormatter("autocite");
-        CAYWEntry entry1 = caywEntry("key1");
-        CAYWEntry entry2 = caywEntry("");
-        CAYWEntry entry3 = caywEntry("key3");
-        String actual = formatter.format(queryParams(null), List.of(entry1, entry2, entry3));
+        String actual = formatter.format(queryParams(null), caywEntries("key1", "", "key3"));
         assertEquals("\\autocite{key1,key3}", actual); // current implementation
         assertEquals(MediaType.TEXT_PLAIN_TYPE, formatter.getMediaType());
     }
 
     @Test
     void natbib_citep() {
         NatbibFormatter formatter = new NatbibFormatter("citep");
-        String actual = formatter.format(queryParams(null), List.of(caywEntry("key1"), caywEntry("key2")));
+        String actual = formatter.format(queryParams(null), caywEntries("key1", "key2"));
         assertEquals("\\citep{key1,key2}", actual);
         assertEquals(MediaType.TEXT_PLAIN_TYPE, formatter.getMediaType());
     }
 
     @Test
     void mmd() {
         MMDFormatter formatter = new MMDFormatter();
-        String actual = formatter.format(queryParams(null), List.of(caywEntry("key1"), caywEntry("key2")));
+        String actual = formatter.format(queryParams(null), caywEntries("key1", "key2"));
         // Whatever your MMD formatter currently emits; adjust expected accordingly.
         assertEquals("[#key1][][#key2][]", actual);
         assertEquals(MediaType.TEXT_PLAIN_TYPE, formatter.getMediaType());
@@ -75,14 +77,14 @@ void mmd() {
     @Test
     void pandoc() {
         PandocFormatter formatter = new PandocFormatter();
-        String actual = formatter.format(queryParams(null), List.of(caywEntry("key1"), caywEntry("key2")));
+        String actual = formatter.format(queryParams(null), caywEntries("key1", "key2"));
         assertEquals("[@key1; @key2]", actual);
     }
 
     @Test
     void typst() {
         TypstFormatter formatter = new TypstFormatter();
-        String actual = formatter.format(queryParams(null), List.of(caywEntry("key1"), caywEntry("key2")));
+        String actual = formatter.format(queryParams(null), caywEntries("key1", "key2"));
         assertEquals("@key1 @key2", actual);
     }
 }