From 7d72fd8f4d3b3f7ec4afa59484b0db8d01a02499 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Mon, 24 Feb 2020 20:50:08 +0100
Subject: [PATCH 01/48] Add performSearch test case

Add more tests
---
 .../importer/fetcher/WorldcatFetcher.java     | 23 +++++++++
 .../importer/fetcher/WorldcatFetcherTest.java | 51 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
 create mode 100644 src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
new file mode 100644
index 00000000000..3968ca0c84f
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -0,0 +1,23 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.util.List;
+
+import org.jabref.logic.importer.EntryBasedFetcher;
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.model.entry.BibEntry;
+
+public class WorldcatFetcher implements EntryBasedFetcher {
+
+	@Override
+	public String getName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
new file mode 100644
index 00000000000..6f093214e69
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -0,0 +1,51 @@
+package org.jabref.logic.importer.fetcher;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.List;
+
+import org.jabref.logic.importer.FetcherException;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.testutils.category.FetcherTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+
+@FetcherTest
+public class WorldcatFetcherTest{
+
+	private WorldcatFetcher fetcher;
+
+	@BeforeEach
+	public void setUp() {
+		fetcher = new WorldcatFetcher();
+	}
+
+	@Test
+	public void testPerformSearchForBadTitle() throws FetcherException{
+		BibEntry entry = new BibEntry();
+		//Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
+		entry.setField(StandardField.TITLE, "ASDhbsd fnm");
+		List<BibEntry> list = fetcher.performSearch(entry);
+		assertTrue(list.isEmpty());
+	}
+
+	@Test
+	public void testPerformSearchForExistingTitle() throws FetcherException{
+		BibEntry entry = new BibEntry();
+		//Example "The very best of Glenn Miller". Verified on same link as above
+		entry.setField(StandardField.TITLE, "The very best of Glenn");
+		List<BibEntry> list = fetcher.performSearch(entry);
+		assertFalse(list.isEmpty());
+	}
+
+	@Test
+	public void testPerformSearchForNullTitle() throws FetcherException{
+		BibEntry entry = new BibEntry();
+		entry.setField(StandardField.TITLE, null);
+		List<BibEntry> list = fetcher.performSearch(entry);
+		assertTrue(list.isEmpty());
+	}
+
+}
\ No newline at end of file

From ee96fdc356a5c9073ff1c838c549644b3f235a1d Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 25 Feb 2020 13:59:31 +0100
Subject: [PATCH 02/48] Add basics of fetcher

---
 .../importer/fetcher/WorldcatFetcher.java     | 49 +++++++++++++++++--
 .../logic/importer/WebFetchersTest.java       |  5 +-
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 3968ca0c84f..60f1ed6f6bd 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -1,23 +1,64 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
 
 public class WorldcatFetcher implements EntryBasedFetcher {
 
+	private final static String NAME = "Worldcat Fetcher";
+	private final static String API_KEY = "API-KEY";
+	private final static String WORLDCAT_URL = "http://www.worldcat.org/webservices/catalog/search/worldcat/opensearch?wskey=" + API_KEY + "&";
+
 	@Override
 	public String getName() {
-		// TODO Auto-generated method stub
-		return null;
+		return NAME;
+	}
+
+	private String getURL(String title){
+		String query = "q=srw.ti+all+\"" + title.replaceAll(" ", "%20") + "\"";
+		return WORLDCAT_URL + query.replace("\"", "%22");
+	}
+
+	private String makeRequest(String title) throws FetcherException{
+		try {
+			URLDownload urlDownload = new URLDownload(getURL(title));
+			URLDownload.bypassSSLVerification();
+			String resp = urlDownload.asString();
+
+			return resp;
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new FetcherException("IO Exception", e);
+		}
 	}
 
+	//Example http://www.worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+"The very best of Glenn"&wskey={built-in-api-key}
 	@Override
 	public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
-		// TODO Auto-generated method stub
-		return null;
+		Optional<String> entryTitle = entry.getLatexFreeField(StandardField.TITLE);
+		if(entryTitle.isPresent()){
+			String xmlResponse = makeRequest(entryTitle.get());
+			/*
+				- Create importer (implements importer)
+				- Check if recognized format
+					- yes
+						- set parserResult to importer.importDatabase
+						- return pR.getDbase.getEntries()
+					- no
+						- return empty bibdatabase's entries
+			*/
+			return null;
+		} else {
+			return new ArrayList<>();
+		}
 	}
 
 }
\ No newline at end of file
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 904f8198716..44382d727fb 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -9,6 +9,7 @@
 import org.jabref.logic.importer.fetcher.IsbnViaEbookDeFetcher;
 import org.jabref.logic.importer.fetcher.IsbnViaOttoBibFetcher;
 import org.jabref.logic.importer.fetcher.MrDLibFetcher;
+import org.jabref.logic.importer.fetcher.WorldcatFetcher;
 
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfoList;
@@ -61,7 +62,9 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throw
             Set<Class<?>> expected = controlClasses.loadClasses().stream().collect(Collectors.toSet());
 
             expected.remove(EntryBasedParserFetcher.class);
-            expected.remove(MrDLibFetcher.class);
+			expected.remove(MrDLibFetcher.class);
+			expected.remove(WorldcatFetcher.class);
+
             assertEquals(expected, getClasses(idFetchers));
         }
     }

From 61a45fe9e225f956d1f339612c8a25217fda0b54 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 25 Feb 2020 14:30:18 +0100
Subject: [PATCH 03/48] Start work on importer

---
 .../importer/fileformat/WorldcatImporter.java | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java

diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
new file mode 100644
index 00000000000..50c927e76f6
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -0,0 +1,88 @@
+package org.jabref.logic.importer.fileformat;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.jabref.logic.importer.Importer;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.util.FileType;
+import org.jabref.logic.util.StandardFileType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+public class WorldcatImporter extends Importer {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(WorldcatImporter.class);
+
+	private final static String NAME = "WorldcatImporter";
+	private final static String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
+	
+
+	private String stringifyReader(BufferedReader bf){
+		StringBuilder sb = new StringBuilder();
+		String ln;
+		try {
+			while((ln = bf.readLine()) != null){
+				sb.append(ln);
+			}
+		} catch (IOException e) {
+			LOGGER.error(e.getMessage(), e);
+			throw new IllegalArgumentException("Bad argument");
+		}
+	}
+
+	private Document parse(String s){
+		try{
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			DocumentBuilder builder = factory.newDocumentBuilder();
+
+			return builder.parse(s);
+		} catch(ParserConfigurationException e){
+			throw new IllegalArgumentException("Parser Config Exception: " + e.getMessage(), e);
+		} catch(SAXException e){
+			throw new IllegalArgumentException("SAX Exception: " + e.getMessage(), e);
+		} catch(IOException e){
+			throw new IllegalArgumentException("IO Exception: " + e.getMessage(), e);
+		}
+	}
+
+	@Override
+	public boolean isRecognizedFormat(BufferedReader input) throws IOException {
+		try {
+			String strInput = stringifyReader(input);
+			Document doc = parse(strInput);
+			return doc.getElementsByTagName("feed") != null;
+		} catch (IllegalArgumentException e) {
+
+			return false;
+		}
+	}
+
+	@Override
+	public ParserResult importDatabase(BufferedReader input) throws IOException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getName() {
+		return NAME;
+	}
+
+	@Override
+	public FileType getFileType() {
+		return StandardFileType.XML;
+	}
+
+	@Override
+	public String getDescription() {
+		return DESCRIPTION;
+	}
+
+}
\ No newline at end of file

From b2570859289e73c91f1e55f17ed558f69326e67e Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 26 Feb 2020 10:56:56 +0100
Subject: [PATCH 04/48] Create worldcat importer test

Start parsing XML

Finish importer, still no key though
---
 .../importer/fetcher/WorldcatFetcher.java     | 45 +++++----
 .../importer/fileformat/WorldcatImporter.java | 99 +++++++++++++++----
 .../logic/importer/WorldcatImporterTest.java  | 54 ++++++++++
 3 files changed, 161 insertions(+), 37 deletions(-)
 create mode 100644 src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 60f1ed6f6bd..83166676e5b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -7,29 +7,33 @@
 
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fileformat.WorldcatImporter;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
 public class WorldcatFetcher implements EntryBasedFetcher {
 
 	private final static String NAME = "Worldcat Fetcher";
-	private final static String API_KEY = "API-KEY";
-	private final static String WORLDCAT_URL = "http://www.worldcat.org/webservices/catalog/search/worldcat/opensearch?wskey=" + API_KEY + "&";
+	public final static String API_KEY = "API-KEY";
+
+	private final static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
 
 	@Override
 	public String getName() {
 		return NAME;
 	}
 
-	private String getURL(String title){
-		String query = "q=srw.ti+all+\"" + title.replaceAll(" ", "%20") + "\"";
-		return WORLDCAT_URL + query.replace("\"", "%22");
+	private String getOpenSearchURL(String title){
+		String query = "&q=srw.ti+all+\"" + title.replaceAll(" ", "%20") + "\"";
+		return WORLDCAT_OPEN_SEARCH_URL + query.replace("\"", "%22");
 	}
 
-	private String makeRequest(String title) throws FetcherException{
+	private String makeOpenSearchRequest(String title) throws FetcherException{
 		try {
-			URLDownload urlDownload = new URLDownload(getURL(title));
+			URLDownload urlDownload = new URLDownload(getOpenSearchURL(title));
 			URLDownload.bypassSSLVerification();
 			String resp = urlDownload.asString();
 
@@ -45,17 +49,22 @@ private String makeRequest(String title) throws FetcherException{
 	public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
 		Optional<String> entryTitle = entry.getLatexFreeField(StandardField.TITLE);
 		if(entryTitle.isPresent()){
-			String xmlResponse = makeRequest(entryTitle.get());
-			/*
-				- Create importer (implements importer)
-				- Check if recognized format
-					- yes
-						- set parserResult to importer.importDatabase
-						- return pR.getDbase.getEntries()
-					- no
-						- return empty bibdatabase's entries
-			*/
-			return null;
+			String xmlResponse = makeOpenSearchRequest(entryTitle.get());
+			WorldcatImporter importer = new WorldcatImporter(); 
+			ParserResult parserResult;
+			try{
+				if(importer.isRecognizedFormat(xmlResponse)){
+					parserResult = importer.importDatabase(xmlResponse);
+				} else{
+					// For displaying An ErrorMessage
+					BibDatabase errorBibDataBase = new BibDatabase();
+					parserResult = new ParserResult(errorBibDataBase);
+				}
+				return parserResult.getDatabase().getEntries();
+			}
+			catch(IOException e){
+				throw new FetcherException("IO Exception " + e.getMessage(), e);
+			}
 		} else {
 			return new ArrayList<>();
 		}
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 50c927e76f6..464fed7d615 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -2,6 +2,9 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -9,40 +12,39 @@
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.importer.fetcher.WorldcatFetcher;
+import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.StandardFileType;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.StandardField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 public class WorldcatImporter extends Importer {
 
+	private String WORLDCAT_READ_URL;
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(WorldcatImporter.class);
 
 	private final static String NAME = "WorldcatImporter";
 	private final static String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
-	
 
-	private String stringifyReader(BufferedReader bf){
-		StringBuilder sb = new StringBuilder();
-		String ln;
-		try {
-			while((ln = bf.readLine()) != null){
-				sb.append(ln);
-			}
-		} catch (IOException e) {
-			LOGGER.error(e.getMessage(), e);
-			throw new IllegalArgumentException("Bad argument");
-		}
+	public WorldcatImporter(){
+		this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + WorldcatFetcher.API_KEY;
 	}
 
-	private Document parse(String s){
+	private Document parse(BufferedReader s){
 		try{
 			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 			DocumentBuilder builder = factory.newDocumentBuilder();
 
-			return builder.parse(s);
+			return builder.parse(new InputSource(s));
 		} catch(ParserConfigurationException e){
 			throw new IllegalArgumentException("Parser Config Exception: " + e.getMessage(), e);
 		} catch(SAXException e){
@@ -52,22 +54,81 @@ private Document parse(String s){
 		}
 	}
 
+	private Element getSpecificInfoOnOCLC(String id) throws IOException {
+		URLDownload urlDownload = new URLDownload(WORLDCAT_READ_URL.replace("{OCLC-NUMBER}", id));
+		URLDownload.bypassSSLVerification();
+		String resp = urlDownload.asString();	
+
+		//Used when no API key is present. Comment out lines above as well
+		// String resp = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><oclcdcs xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:oclcterms=\"http://purl.org/oclc/terms/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"> <dc:creator>Miller, Glenn.</dc:creator> <dc:date>2010</dc:date> <dc:description>Remastered versions of Glenn Miller's original recordings which bring a freshness to his beloved classics. The album also features a version of 'In the mood' with Jodie Prenger, winner of the BBC's 'I'll do anything'.</dc:description> <dc:description>In the mood -- Moonlight serenade -- Don't sit under the apple tree (with anyone else but me) -- Tuxedo junction -- A string of pearls -- Pennsylvania 6-5000 -- Chattanooga choo-choo -- American patrol -- (I've got a gal in) Kalamazoo -- On a little street in Singapore -- The St. Louis blues march -- A nightingale sang in Berkeley Square -- Star dust -- Little brown jug -- When you wish upon a star -- The woodpecker song -- G.I. jive -- Fools rush in -- Over there -- Blueberry hill -- Over the rainbow -- Serenade in blue -- When Johnny comes marching home -- In the mood (feat. Jodie Prenger).</dc:description> <dc:format>1 CD (72 min., 18 sec.) ; 4 3/4 in.</dc:format> <dc:language xsi:type=\"http://purl.org/dc/terms/ISO639-2\">eng</dc:language> <dc:publisher>Sony Music Entertainment</dc:publisher> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Dance orchestra music.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Big band music.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Popular music--1931-1940.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Popular music--1941-1950.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Compact discs.</dc:subject> <dc:title>The very best of Glenn Miller </dc:title> <dc:type>Sound</dc:type> <oclcterms:recordCreationDate xsi:type=\"http://purl.org/oclc/terms/marc008date\">101104</oclcterms:recordCreationDate> <oclcterms:recordIdentifier>754508587</oclcterms:recordIdentifier> </oclcdcs>";
+		
+		Document mainDoc = parse(new BufferedReader(new StringReader(resp)));
+		NodeList parentElemOfTags = mainDoc.getElementsByTagName("oclcdcs");
+
+		return (Element) parentElemOfTags.item(0);
+	}
+
+
 	@Override
 	public boolean isRecognizedFormat(BufferedReader input) throws IOException {
 		try {
-			String strInput = stringifyReader(input);
-			Document doc = parse(strInput);
+			Document doc = parse(input);
 			return doc.getElementsByTagName("feed") != null;
 		} catch (IllegalArgumentException e) {
-
 			return false;
 		}
 	}
 
+	private Element getElementByTag(Element xml, String tag){
+		NodeList nl = xml.getElementsByTagName(tag);
+		return (Element) nl.item(0);
+	}
+
+	private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException{
+		Element authorsElem = getElementByTag(xmlEntry, "author");
+		String authors = getElementByTag(authorsElem, "name").getTextContent();
+
+		String title = getElementByTag(xmlEntry, "title").getTextContent();
+
+		String url = getElementByTag(xmlEntry, "link").getAttribute("href");
+
+		String oclc = xmlEntry.getElementsByTagName("oclcterms:recordIdentifier").item(0).getTextContent();
+		System.out.println(oclc + " , " + title);
+		Element detailedInfo = getSpecificInfoOnOCLC(oclc);
+
+		String date = detailedInfo.getElementsByTagName("dc:date").item(0).getTextContent();
+
+		String publisher = detailedInfo.getElementsByTagName("dc:publisher").item(0).getTextContent();
+
+		BibEntry entry = new BibEntry();
+
+		entry.setField(StandardField.AUTHOR, authors);
+		entry.setField(StandardField.TITLE, title);
+		entry.setField(StandardField.URL, url);
+		entry.setField(StandardField.YEAR, date);
+		entry.setField(StandardField.JOURNAL, publisher);
+
+		return entry;
+	}
+
+	private ParserResult docToParserRes(Document doc) throws IOException{
+		Element feed = (Element) doc.getElementsByTagName("feed").item(0);
+		NodeList entryXMLList = feed.getElementsByTagName("entry");
+
+		List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength());
+		for(int i = 0; i < entryXMLList.getLength(); i++){
+			Element xmlEntry = (Element) entryXMLList.item(i);
+			BibEntry bibEntry = xmlEntryToBibEntry(xmlEntry);
+			bibList.add(bibEntry);		
+		}
+
+		return new ParserResult(bibList);
+	}
+
 	@Override
 	public ParserResult importDatabase(BufferedReader input) throws IOException {
-		// TODO Auto-generated method stub
-		return null;
+		Document parsedDoc = parse(input);
+		return docToParserRes(parsedDoc);
 	}
 
 	@Override
diff --git a/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
new file mode 100644
index 00000000000..6fc59a4647f
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
@@ -0,0 +1,54 @@
+package org.jabref.logic.importer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+
+import org.jabref.logic.importer.fileformat.WorldcatImporter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class WorldcatImporterTest {
+	private final String XML_WITH_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><feed xmlns=\"http://www.w3.org/2005/Atom\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:diag=\"http://www.loc.gov/zing/srw/diagnostic/\" xmlns:oclcterms=\"http://purl.org/oclc/terms/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\"><title>OCLC Worldcat Search: srw.ti all \"The very best of Glenn\"</title><id>http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}</id><updated>2020-02-25T06:16:25-05:00</updated><subtitle>Search results for srw.ti all \"The very best of Glenn\" at http://worldcat.org/webservices/catalog</subtitle><opensearch:totalResults>89</opensearch:totalResults><opensearch:startIndex>1</opensearch:startIndex><opensearch:itemsPerPage>10</opensearch:itemsPerPage><opensearch:Query role=\"request\" searchTerms=\"srw.ti all &quot;The very best of Glenn&quot;\" startPage=\"1\"/><link rel=\"alternate\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;wskey={built-in-api-key}\" type=\"text/html\"/><link rel=\"self\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"first\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"next\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=11&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"last\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=89&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"search\" type=\"application/opensearchdescription+xml\" href=\"http://worldcat.org/webservices/catalog/opensearch.description.xml\"/><entry><author><name>Miller, Glenn.</name></author><title>The very best of Glenn Miller</title><link href=\"http://worldcat.org/oclc/754508587\"/><id>http://worldcat.org/oclc/754508587</id><updated>2017-06-29T19:46:28Z</updated><summary>Remastered versions of Glenn Miller's original recordings which bring a freshness to his beloved classics. The album also features a version of 'In the mood' with Jodie Prenger, winner of the BBC's 'I'll do anything'.</summary><oclcterms:recordIdentifier>754508587</oclcterms:recordIdentifier></entry><entry><author><name>Brennan, Walter, 1894-1974.</name></author><title>The very best of Walter Brennan.</title><link href=\"http://worldcat.org/oclc/17009787\"/><id>http://worldcat.org/oclc/17009787</id><updated>2018-07-02T10:57:48Z</updated><dc:identifier>urn:LCCN:95789751</dc:identifier><oclcterms:recordIdentifier>17009787</oclcterms:recordIdentifier></entry><entry><author><name>Frey, Glenn, composer, performer.</name></author><title>Above the clouds : the very best of Glenn Frey</title><link href=\"http://worldcat.org/oclc/1040990604\"/><id>http://worldcat.org/oclc/1040990604</id><updated>2019-05-06T02:09:58Z</updated><oclcterms:recordIdentifier>1040990604</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn, 1954- performer.</name></author><title>The very best of Glenn Miller.</title><link href=\"http://worldcat.org/oclc/1140416403\"/><id>http://worldcat.org/oclc/1140416403</id><updated>2020-02-13T17:01:04Z</updated><oclcterms:recordIdentifier>1140416403</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn.</name></author><title>Very Best of Glenn Miller.</title><link href=\"http://worldcat.org/oclc/630547816\"/><id>http://worldcat.org/oclc/630547816</id><updated>2018-11-28T18:44:17Z</updated><oclcterms:recordIdentifier>630547816</oclcterms:recordIdentifier></entry><entry><author><name>Yarbrough, Glenn.</name></author><title>Glenn yarbrough - his very best</title><link href=\"http://worldcat.org/oclc/1098394025\"/><id>http://worldcat.org/oclc/1098394025</id><updated>2019-04-25T11:56:52Z</updated><oclcterms:recordIdentifier>1098394025</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn.</name></author><title>The very best of Glenn Miller : hits &amp; rarities</title><link href=\"http://worldcat.org/oclc/809462816\"/><id>http://worldcat.org/oclc/809462816</id><updated>2020-01-23T10:02:43Z</updated><oclcterms:recordIdentifier>809462816</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn, 1904-1944, performer.</name></author><title>The very best of Glenn Miller &amp; his orchestra.</title><link href=\"http://worldcat.org/oclc/1123215070\"/><id>http://worldcat.org/oclc/1123215070</id><updated>2019-11-07T01:19:22Z</updated><oclcterms:recordIdentifier>1123215070</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn, 1904-1944.</name></author><title>The very best of Glenn Miller : in the mood.</title><link href=\"http://worldcat.org/oclc/55688833\"/><id>http://worldcat.org/oclc/55688833</id><updated>2016-11-17T00:02:35Z</updated><oclcterms:recordIdentifier>55688833</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn.</name></author><title>Glenn Miller story : the very best of</title><link href=\"http://worldcat.org/oclc/421718747\"/><id>http://worldcat.org/oclc/421718747</id><updated>2018-10-08T09:50:51Z</updated><oclcterms:recordIdentifier>421718747</oclcterms:recordIdentifier></entry></feed>";
+	private final String XML_WITHOUT_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><feed xmlns=\"http://www.w3.org/2005/Atom\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:diag=\"http://www.loc.gov/zing/srw/diagnostic/\" xmlns:oclcterms=\"http://purl.org/oclc/terms/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\"/>";
+	
+	WorldcatImporter importer;
+
+	@BeforeEach
+	public void setUp(){
+		importer = new WorldcatImporter();
+	}
+	
+	@Test
+	public void withResultIsRecognizedFormat() throws IOException{
+		boolean isReq = importer.isRecognizedFormat(XML_WITH_RESULT);
+		assertTrue(isReq);
+	}
+
+	@Test
+	public void withoutResultIsRecognizedFormat() throws IOException{
+		boolean isReq = importer.isRecognizedFormat(XML_WITHOUT_RESULT);
+		assertTrue(isReq);
+	}
+
+	@Test
+	public void badXMLIsNotRecognizedFormat() throws IOException{
+		boolean isReq = importer.isRecognizedFormat("Nah bruh");
+		assertFalse(isReq);
+	}
+
+	@Test
+	public void withResultReturnsNonEmptyResult() throws IOException{
+		ParserResult res = importer.importDatabase(XML_WITH_RESULT);
+		assertTrue(res.getDatabase().getEntries().size() > 0);
+	}
+
+	@Test
+	public void withoutResultReturnsEmptyResult() throws IOException{
+		ParserResult res = importer.importDatabase(XML_WITHOUT_RESULT);
+		assertEquals(0, res.getDatabase().getEntries().size());
+	}
+
+}
\ No newline at end of file

From 27069f4770c8f7472e955e5ce20e9a52c9b4b904 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Thu, 27 Feb 2020 10:57:36 +0100
Subject: [PATCH 05/48] Clean up and document worldcat fetcher and importer

---
 .../importer/fetcher/WorldcatFetcher.java     | 13 ++++++-
 .../importer/fileformat/WorldcatImporter.java | 39 ++++++++++++++++---
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 83166676e5b..fe7aeeef929 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -17,7 +17,7 @@
 public class WorldcatFetcher implements EntryBasedFetcher {
 
 	private final static String NAME = "Worldcat Fetcher";
-	public final static String API_KEY = "API-KEY";
+	public final static String API_KEY = "API-KEY-GOES-HERE";
 
 	private final static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
 
@@ -26,11 +26,21 @@ public String getName() {
 		return NAME;
 	}
 
+	/**
+	 * Create a open search query with specified title
+	 * @param title the title to include in the query
+	 * @return the earch query for the api
+	 */
 	private String getOpenSearchURL(String title){
 		String query = "&q=srw.ti+all+\"" + title.replaceAll(" ", "%20") + "\"";
 		return WORLDCAT_OPEN_SEARCH_URL + query.replace("\"", "%22");
 	}
 
+	/**
+	 * Make request to open search API of Worldcat, with specified title
+	 * @param title the title of the search
+	 * @return the body of the HTTP response
+	 */
 	private String makeOpenSearchRequest(String title) throws FetcherException{
 		try {
 			URLDownload urlDownload = new URLDownload(getOpenSearchURL(title));
@@ -44,7 +54,6 @@ private String makeOpenSearchRequest(String title) throws FetcherException{
 		}
 	}
 
-	//Example http://www.worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+"The very best of Glenn"&wskey={built-in-api-key}
 	@Override
 	public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
 		Optional<String> entryTitle = entry.getLatexFreeField(StandardField.TITLE);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 464fed7d615..6f458ef93da 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -30,15 +30,20 @@ public class WorldcatImporter extends Importer {
 
 	private String WORLDCAT_READ_URL;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(WorldcatImporter.class);
-
 	private final static String NAME = "WorldcatImporter";
 	private final static String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
 
 	public WorldcatImporter(){
+		//Used the same key as Worldcat fether
 		this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + WorldcatFetcher.API_KEY;
 	}
 
+	/**
+	 * Parse the reader to an xml document
+	 * @param s the reader to be parsed
+	 * @return XML document representing the content of s
+	 * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
+	 */
 	private Document parse(BufferedReader s){
 		try{
 			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -54,14 +59,16 @@ private Document parse(BufferedReader s){
 		}
 	}
 
+	/**
+	 * Get more information about a article through its OCLC id
+	 * @param id the oclc id
+	 * @return the XML element that contains all tags
+	 */
 	private Element getSpecificInfoOnOCLC(String id) throws IOException {
 		URLDownload urlDownload = new URLDownload(WORLDCAT_READ_URL.replace("{OCLC-NUMBER}", id));
 		URLDownload.bypassSSLVerification();
 		String resp = urlDownload.asString();	
 
-		//Used when no API key is present. Comment out lines above as well
-		// String resp = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><oclcdcs xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:oclcterms=\"http://purl.org/oclc/terms/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"> <dc:creator>Miller, Glenn.</dc:creator> <dc:date>2010</dc:date> <dc:description>Remastered versions of Glenn Miller's original recordings which bring a freshness to his beloved classics. The album also features a version of 'In the mood' with Jodie Prenger, winner of the BBC's 'I'll do anything'.</dc:description> <dc:description>In the mood -- Moonlight serenade -- Don't sit under the apple tree (with anyone else but me) -- Tuxedo junction -- A string of pearls -- Pennsylvania 6-5000 -- Chattanooga choo-choo -- American patrol -- (I've got a gal in) Kalamazoo -- On a little street in Singapore -- The St. Louis blues march -- A nightingale sang in Berkeley Square -- Star dust -- Little brown jug -- When you wish upon a star -- The woodpecker song -- G.I. jive -- Fools rush in -- Over there -- Blueberry hill -- Over the rainbow -- Serenade in blue -- When Johnny comes marching home -- In the mood (feat. Jodie Prenger).</dc:description> <dc:format>1 CD (72 min., 18 sec.) ; 4 3/4 in.</dc:format> <dc:language xsi:type=\"http://purl.org/dc/terms/ISO639-2\">eng</dc:language> <dc:publisher>Sony Music Entertainment</dc:publisher> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Dance orchestra music.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Big band music.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Popular music--1931-1940.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Popular music--1941-1950.</dc:subject> <dc:subject xsi:type=\"http://purl.org/dc/terms/LCSH\">Compact discs.</dc:subject> <dc:title>The very best of Glenn Miller </dc:title> <dc:type>Sound</dc:type> <oclcterms:recordCreationDate xsi:type=\"http://purl.org/oclc/terms/marc008date\">101104</oclcterms:recordCreationDate> <oclcterms:recordIdentifier>754508587</oclcterms:recordIdentifier> </oclcdcs>";
-		
 		Document mainDoc = parse(new BufferedReader(new StringReader(resp)));
 		NodeList parentElemOfTags = mainDoc.getElementsByTagName("oclcdcs");
 
@@ -79,11 +86,24 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
 		}
 	}
 
-	private Element getElementByTag(Element xml, String tag){
+	/**
+	 * Get the element of a tag in an XML element
+	 * @param xml the element do search trough
+	 * @param tag the tag to find
+	 * @return the tag element
+	 * @throws NullPointerException if there is no element by this tag
+	 */
+	private Element getElementByTag(Element xml, String tag) throws NullPointerException{
 		NodeList nl = xml.getElementsByTagName(tag);
 		return (Element) nl.item(0);
 	}
 
+	/**
+	 * Parse the xml entry to a bib entry
+	 * @param xmlEntry the XML element from open search
+	 * @return the correspoinding bibentry
+	 * @throws IOException if we cannot search Worldcat with the OCLC of the entry
+	 */
 	private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException{
 		Element authorsElem = getElementByTag(xmlEntry, "author");
 		String authors = getElementByTag(authorsElem, "name").getTextContent();
@@ -111,6 +131,13 @@ private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException{
 		return entry;
 	}
 
+	/**
+	 * Parse an XML documents with open search entries to a parserResult of 
+	 * the bibentries
+	 * @param doc the main XML document from open search
+	 * @return the ParserResult containing the BibEntries collection
+	 * @throws IOException if {@link xmlEntryToBibEntry} throws 
+	 */
 	private ParserResult docToParserRes(Document doc) throws IOException{
 		Element feed = (Element) doc.getElementsByTagName("feed").item(0);
 		NodeList entryXMLList = feed.getElementsByTagName("entry");

From caa70765bdb438b01c04e91fe031d36a1924e699 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Thu, 27 Feb 2020 11:08:04 +0100
Subject: [PATCH 06/48] Add worldcat fetcher to webFetchers

Add Changelog
---
 CHANGELOG.md                                             | 2 ++
 src/main/java/org/jabref/logic/importer/WebFetchers.java | 4 +++-
 .../jabref/logic/importer/fetcher/WorldcatFetcher.java   | 5 +++++
 .../logic/importer/fileformat/WorldcatImporter.java      | 9 ++++-----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 149ea8d8bc7..c5bcdb72f62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We made the filters more easily accessible in the integrity check dialog. [#5955](https://github.com/JabRef/jabref/pull/5955)
 - We reimplemented and improved the dialog "Customize entry types". [#4719](https://github.com/JabRef/jabref/issues/4719)
 - We added an [American Physical Society](https://journals.aps.org/) fetcher. [#818](https://github.com/JabRef/jabref/issues/818)
+- We reimplemented and improved the dialog "Customize entry types" [#4719](https://github.com/JabRef/jabref/issues/4719)
+- We added an Worldcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [Worldcat](http://www.worldcat.org/webservices/catalog/)
 
 ### Fixed
 
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 72c3ace87ab..c3a1c8371e8 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -34,6 +34,7 @@
 import org.jabref.logic.importer.fetcher.SpringerFetcher;
 import org.jabref.logic.importer.fetcher.SpringerLink;
 import org.jabref.logic.importer.fetcher.TitleFetcher;
+import org.jabref.logic.importer.fetcher.WorldcatFetcher;
 import org.jabref.logic.importer.fetcher.ZbMATH;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
@@ -133,7 +134,8 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPre
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
-        set.add(new CrossRef());
+		set.add(new CrossRef());
+		set.add(new WorldcatFetcher());
         return set;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index fe7aeeef929..65194a3db53 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -14,6 +14,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+/**
+ * EntryBasedFetcher that searches the Worldcat database
+ * 
+ * @see https://www.oclc.org/developer/develop/web-services/worldcat-search-api/bibliographic-resource.en.html
+ */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
 	private final static String NAME = "Worldcat Fetcher";
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 6f458ef93da..e162a8379bc 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -18,8 +18,6 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -60,7 +58,8 @@ private Document parse(BufferedReader s){
 	}
 
 	/**
-	 * Get more information about a article through its OCLC id
+	 * Get more information about a article through its OCLC id. Picks the first 
+	 * element with this tag
 	 * @param id the oclc id
 	 * @return the XML element that contains all tags
 	 */
@@ -87,7 +86,8 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
 	}
 
 	/**
-	 * Get the element of a tag in an XML element
+	 * Get the element of a tag in an XML element. Picks the first element
+	 * with this tag
 	 * @param xml the element do search trough
 	 * @param tag the tag to find
 	 * @return the tag element
@@ -113,7 +113,6 @@ private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException{
 		String url = getElementByTag(xmlEntry, "link").getAttribute("href");
 
 		String oclc = xmlEntry.getElementsByTagName("oclcterms:recordIdentifier").item(0).getTextContent();
-		System.out.println(oclc + " , " + title);
 		Element detailedInfo = getSpecificInfoOnOCLC(oclc);
 
 		String date = detailedInfo.getElementsByTagName("dc:date").item(0).getTextContent();

From d303999f7da86b30d16970ac1cae9f1dacaaebd2 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Thu, 27 Feb 2020 15:10:56 +0100
Subject: [PATCH 07/48] Fix tests

---
 src/test/java/org/jabref/logic/importer/WebFetchersTest.java    | 1 -
 .../java/org/jabref/logic/importer/WorldcatImporterTest.java    | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 44382d727fb..dcd7fc97775 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -63,7 +63,6 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throw
 
             expected.remove(EntryBasedParserFetcher.class);
 			expected.remove(MrDLibFetcher.class);
-			expected.remove(WorldcatFetcher.class);
 
             assertEquals(expected, getClasses(idFetchers));
         }
diff --git a/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
index 6fc59a4647f..7442318be9a 100644
--- a/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
@@ -8,6 +8,7 @@
 
 import org.jabref.logic.importer.fileformat.WorldcatImporter;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class WorldcatImporterTest {
@@ -39,6 +40,7 @@ public void badXMLIsNotRecognizedFormat() throws IOException{
 		assertFalse(isReq);
 	}
 
+	@Disabled("Will not work without API key")
 	@Test
 	public void withResultReturnsNonEmptyResult() throws IOException{
 		ParserResult res = importer.importDatabase(XML_WITH_RESULT);

From e0ab5374cf0b6da7518135dfb91a22b7bb29e627 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 19:12:16 +0200
Subject: [PATCH 08/48] Change to java.net.URL and fix formatting

---
 src/main/java/org/jabref/logic/importer/WebFetchers.java   | 4 ++--
 .../org/jabref/logic/importer/fetcher/WorldcatFetcher.java | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index c3a1c8371e8..342a9d56770 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -134,8 +134,8 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPre
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
-		set.add(new CrossRef());
-		set.add(new WorldcatFetcher());
+        set.add(new CrossRef());
+        set.add(new WorldcatFetcher());
         return set;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 65194a3db53..c796b201af6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -14,6 +14,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+import java.net.URL;
+
 /**
  * EntryBasedFetcher that searches the Worldcat database
  * 
@@ -37,8 +39,9 @@ public String getName() {
 	 * @return the earch query for the api
 	 */
 	private String getOpenSearchURL(String title){
-		String query = "&q=srw.ti+all+\"" + title.replaceAll(" ", "%20") + "\"";
-		return WORLDCAT_OPEN_SEARCH_URL + query.replace("\"", "%22");
+		String query = "&q=srw.ti+all+\"" + title + "\"";
+		URL url = new URL(WORLDCAT_OPEN_SEARCH_URL + query);
+		return url.toString();
 	}
 
 	/**

From 8503720ed69fd32605d3f8c9a4049c9a887f792a Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 20:21:05 +0200
Subject: [PATCH 09/48] Move XML tests to own files

---
 .../importer/fetcher/WorldcatFetcher.java     |  12 +-
 .../logic/importer/WorldcatImporterTest.java  |  56 ---------
 .../fileformat/WorldcatImporterTest.java      |  93 ++++++++++++++
 .../WorldcatImporterTestWithResult.xml        | 119 ++++++++++++++++++
 .../WorldcatImporterTestWithoutResult.xml     |   2 +
 5 files changed, 221 insertions(+), 61 deletions(-)
 delete mode 100644 src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
 create mode 100644 src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
 create mode 100644 src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
 create mode 100644 src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index c796b201af6..a82ff0d1c75 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -15,6 +15,7 @@
 import org.jabref.model.entry.field.StandardField;
 
 import java.net.URL;
+import java.net.MalformedURLException;
 
 /**
  * EntryBasedFetcher that searches the Worldcat database
@@ -38,7 +39,7 @@ public String getName() {
 	 * @param title the title to include in the query
 	 * @return the earch query for the api
 	 */
-	private String getOpenSearchURL(String title){
+	private String getOpenSearchURL(String title) throws MalformedURLException{
 		String query = "&q=srw.ti+all+\"" + title + "\"";
 		URL url = new URL(WORLDCAT_OPEN_SEARCH_URL + query);
 		return url.toString();
@@ -56,10 +57,11 @@ private String makeOpenSearchRequest(String title) throws FetcherException{
 			String resp = urlDownload.asString();
 
 			return resp;
+		} catch (MalformedURLException e) {
+			throw new FetcherException("Bad url", e);
 		} catch (IOException e) {
-			e.printStackTrace();
-			throw new FetcherException("IO Exception", e);
-		}
+			throw new FetcherException("Error with Open Search Request (Worldcat)", e);
+		} 
 	}
 
 	@Override
@@ -80,7 +82,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
 				return parserResult.getDatabase().getEntries();
 			}
 			catch(IOException e){
-				throw new FetcherException("IO Exception " + e.getMessage(), e);
+				throw new FetcherException("Could not perform search (Worldcat) ", e);
 			}
 		} else {
 			return new ArrayList<>();
diff --git a/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
deleted file mode 100644
index 7442318be9a..00000000000
--- a/src/test/java/org/jabref/logic/importer/WorldcatImporterTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.jabref.logic.importer;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import java.io.IOException;
-
-import org.jabref.logic.importer.fileformat.WorldcatImporter;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-public class WorldcatImporterTest {
-	private final String XML_WITH_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><feed xmlns=\"http://www.w3.org/2005/Atom\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:diag=\"http://www.loc.gov/zing/srw/diagnostic/\" xmlns:oclcterms=\"http://purl.org/oclc/terms/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\"><title>OCLC Worldcat Search: srw.ti all \"The very best of Glenn\"</title><id>http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}</id><updated>2020-02-25T06:16:25-05:00</updated><subtitle>Search results for srw.ti all \"The very best of Glenn\" at http://worldcat.org/webservices/catalog</subtitle><opensearch:totalResults>89</opensearch:totalResults><opensearch:startIndex>1</opensearch:startIndex><opensearch:itemsPerPage>10</opensearch:itemsPerPage><opensearch:Query role=\"request\" searchTerms=\"srw.ti all &quot;The very best of Glenn&quot;\" startPage=\"1\"/><link rel=\"alternate\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;wskey={built-in-api-key}\" type=\"text/html\"/><link rel=\"self\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"first\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"next\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=11&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"last\" href=\"http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=89&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}\" type=\"application/atom+xml\"/><link rel=\"search\" type=\"application/opensearchdescription+xml\" href=\"http://worldcat.org/webservices/catalog/opensearch.description.xml\"/><entry><author><name>Miller, Glenn.</name></author><title>The very best of Glenn Miller</title><link href=\"http://worldcat.org/oclc/754508587\"/><id>http://worldcat.org/oclc/754508587</id><updated>2017-06-29T19:46:28Z</updated><summary>Remastered versions of Glenn Miller's original recordings which bring a freshness to his beloved classics. The album also features a version of 'In the mood' with Jodie Prenger, winner of the BBC's 'I'll do anything'.</summary><oclcterms:recordIdentifier>754508587</oclcterms:recordIdentifier></entry><entry><author><name>Brennan, Walter, 1894-1974.</name></author><title>The very best of Walter Brennan.</title><link href=\"http://worldcat.org/oclc/17009787\"/><id>http://worldcat.org/oclc/17009787</id><updated>2018-07-02T10:57:48Z</updated><dc:identifier>urn:LCCN:95789751</dc:identifier><oclcterms:recordIdentifier>17009787</oclcterms:recordIdentifier></entry><entry><author><name>Frey, Glenn, composer, performer.</name></author><title>Above the clouds : the very best of Glenn Frey</title><link href=\"http://worldcat.org/oclc/1040990604\"/><id>http://worldcat.org/oclc/1040990604</id><updated>2019-05-06T02:09:58Z</updated><oclcterms:recordIdentifier>1040990604</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn, 1954- performer.</name></author><title>The very best of Glenn Miller.</title><link href=\"http://worldcat.org/oclc/1140416403\"/><id>http://worldcat.org/oclc/1140416403</id><updated>2020-02-13T17:01:04Z</updated><oclcterms:recordIdentifier>1140416403</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn.</name></author><title>Very Best of Glenn Miller.</title><link href=\"http://worldcat.org/oclc/630547816\"/><id>http://worldcat.org/oclc/630547816</id><updated>2018-11-28T18:44:17Z</updated><oclcterms:recordIdentifier>630547816</oclcterms:recordIdentifier></entry><entry><author><name>Yarbrough, Glenn.</name></author><title>Glenn yarbrough - his very best</title><link href=\"http://worldcat.org/oclc/1098394025\"/><id>http://worldcat.org/oclc/1098394025</id><updated>2019-04-25T11:56:52Z</updated><oclcterms:recordIdentifier>1098394025</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn.</name></author><title>The very best of Glenn Miller : hits &amp; rarities</title><link href=\"http://worldcat.org/oclc/809462816\"/><id>http://worldcat.org/oclc/809462816</id><updated>2020-01-23T10:02:43Z</updated><oclcterms:recordIdentifier>809462816</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn, 1904-1944, performer.</name></author><title>The very best of Glenn Miller &amp; his orchestra.</title><link href=\"http://worldcat.org/oclc/1123215070\"/><id>http://worldcat.org/oclc/1123215070</id><updated>2019-11-07T01:19:22Z</updated><oclcterms:recordIdentifier>1123215070</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn, 1904-1944.</name></author><title>The very best of Glenn Miller : in the mood.</title><link href=\"http://worldcat.org/oclc/55688833\"/><id>http://worldcat.org/oclc/55688833</id><updated>2016-11-17T00:02:35Z</updated><oclcterms:recordIdentifier>55688833</oclcterms:recordIdentifier></entry><entry><author><name>Miller, Glenn.</name></author><title>Glenn Miller story : the very best of</title><link href=\"http://worldcat.org/oclc/421718747\"/><id>http://worldcat.org/oclc/421718747</id><updated>2018-10-08T09:50:51Z</updated><oclcterms:recordIdentifier>421718747</oclcterms:recordIdentifier></entry></feed>";
-	private final String XML_WITHOUT_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><feed xmlns=\"http://www.w3.org/2005/Atom\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:diag=\"http://www.loc.gov/zing/srw/diagnostic/\" xmlns:oclcterms=\"http://purl.org/oclc/terms/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:opensearch=\"http://a9.com/-/spec/opensearch/1.1/\"/>";
-	
-	WorldcatImporter importer;
-
-	@BeforeEach
-	public void setUp(){
-		importer = new WorldcatImporter();
-	}
-	
-	@Test
-	public void withResultIsRecognizedFormat() throws IOException{
-		boolean isReq = importer.isRecognizedFormat(XML_WITH_RESULT);
-		assertTrue(isReq);
-	}
-
-	@Test
-	public void withoutResultIsRecognizedFormat() throws IOException{
-		boolean isReq = importer.isRecognizedFormat(XML_WITHOUT_RESULT);
-		assertTrue(isReq);
-	}
-
-	@Test
-	public void badXMLIsNotRecognizedFormat() throws IOException{
-		boolean isReq = importer.isRecognizedFormat("Nah bruh");
-		assertFalse(isReq);
-	}
-
-	@Disabled("Will not work without API key")
-	@Test
-	public void withResultReturnsNonEmptyResult() throws IOException{
-		ParserResult res = importer.importDatabase(XML_WITH_RESULT);
-		assertTrue(res.getDatabase().getEntries().size() > 0);
-	}
-
-	@Test
-	public void withoutResultReturnsEmptyResult() throws IOException{
-		ParserResult res = importer.importDatabase(XML_WITHOUT_RESULT);
-		assertEquals(0, res.getDatabase().getEntries().size());
-	}
-
-}
\ No newline at end of file
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
new file mode 100644
index 00000000000..1049e7f666f
--- /dev/null
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -0,0 +1,93 @@
+package org.jabref.logic.importer.fileformat;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+
+import java.util.function.Predicate;
+import java.util.Collection;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.jabref.logic.importer.fileformat.WorldcatImporter;
+import org.jabref.logic.importer.ParserResult;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+public class WorldcatImporterTest {
+	private final String XML_WITH_RESULT_PATH = "";
+	private final String XML_WITHOUT_RESULT_PATH = "";
+	
+	WorldcatImporter importer;
+
+	private String getFilePath(String filename) throws IOException{
+		Predicate<String> filePredicate = name -> {
+			return name.startsWith(filename) && name.endsWith(".xml");
+		};
+		Collection<String> paths = ImporterTestEngine.getTestFiles(filePredicate);
+		if(paths.size() > 1 || paths.size() == 0){
+			throw new IllegalArgumentException("Filename returned 0 or more than 1 result: " + filename);
+		}
+		return paths.iterator().next();
+	}
+
+	private String getFileContent(String filename) throws IOException{
+		String path = getFilePath(filename);
+		String content = Files.readString(getPath(path));
+		return content;
+	}
+
+	private static Path getPath(String fileName) throws IOException {
+        try {
+            return Paths.get(ImporterTestEngine.class.getResource(fileName).toURI());
+        } catch (URISyntaxException e) {
+            throw new IOException(e);
+        }
+    }
+
+	@BeforeEach
+	public void setUp(){
+		importer = new WorldcatImporter();
+		
+	}
+	
+	@Test
+	public void withResultIsRecognizedFormat() throws IOException{
+		ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithResult"));
+	}
+
+	@Test
+	public void withoutResultIsRecognizedFormat() throws IOException{
+		ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithoutResult"));
+	}
+
+	@Test
+	public void badXMLIsNotRecognizedFormat() throws IOException{
+		boolean isReq = importer.isRecognizedFormat("Nah bruh");
+		assertFalse(isReq);
+	}
+
+	@Disabled("Will not work without API key")
+	@Test
+	public void withResultReturnsNonEmptyResult() throws IOException{
+		String withResultXML = getFileContent("WorldcatImporterTestWithResult");
+		ParserResult res = importer.importDatabase(withResultXML);
+		assertTrue(res.getDatabase().getEntries().size() > 0);
+	}
+
+	@Disabled("Will not work without API key")
+	@Test
+	public void withoutResultReturnsEmptyResult() throws IOException{
+		String withoutResultXML = getFileContent("WorldcatImporterTestWithResult");
+		ParserResult res = importer.importDatabase(withoutResultXML);
+		assertEquals(0, res.getDatabase().getEntries().size());
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
new file mode 100644
index 00000000000..d9a3f926db5
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:diag="http://www.loc.gov/zing/srw/diagnostic/" xmlns:oclcterms="http://purl.org/oclc/terms/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <title>OCLC Worldcat Search: srw.ti all "The very best of Glenn"</title>
+   <id>http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}</id>
+   <updated>2020-02-25T06:16:25-05:00</updated>
+   <subtitle>Search results for srw.ti all "The very best of Glenn" at http://worldcat.org/webservices/catalog</subtitle>
+   <opensearch:totalResults>89</opensearch:totalResults>
+   <opensearch:startIndex>1</opensearch:startIndex>
+   <opensearch:itemsPerPage>10</opensearch:itemsPerPage>
+   <opensearch:Query role="request" searchTerms="srw.ti all &quot;The very best of Glenn&quot;" startPage="1" />
+   <link rel="alternate" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;wskey={built-in-api-key}" type="text/html" />
+   <link rel="self" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
+   <link rel="first" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
+   <link rel="next" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=11&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
+   <link rel="last" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=89&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
+   <link rel="search" type="application/opensearchdescription+xml" href="http://worldcat.org/webservices/catalog/opensearch.description.xml" />
+   <entry>
+      <author>
+         <name>Miller, Glenn.</name>
+      </author>
+      <title>The very best of Glenn Miller</title>
+      <link href="http://worldcat.org/oclc/754508587" />
+      <id>http://worldcat.org/oclc/754508587</id>
+      <updated>2017-06-29T19:46:28Z</updated>
+      <summary>Remastered versions of Glenn Miller's original recordings which bring a freshness to his beloved classics. The album also features a version of 'In the mood' with Jodie Prenger, winner of the BBC's 'I'll do anything'.</summary>
+      <oclcterms:recordIdentifier>754508587</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Brennan, Walter, 1894-1974.</name>
+      </author>
+      <title>The very best of Walter Brennan.</title>
+      <link href="http://worldcat.org/oclc/17009787" />
+      <id>http://worldcat.org/oclc/17009787</id>
+      <updated>2018-07-02T10:57:48Z</updated>
+      <dc:identifier>urn:LCCN:95789751</dc:identifier>
+      <oclcterms:recordIdentifier>17009787</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Frey, Glenn, composer, performer.</name>
+      </author>
+      <title>Above the clouds : the very best of Glenn Frey</title>
+      <link href="http://worldcat.org/oclc/1040990604" />
+      <id>http://worldcat.org/oclc/1040990604</id>
+      <updated>2019-05-06T02:09:58Z</updated>
+      <oclcterms:recordIdentifier>1040990604</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Miller, Glenn, 1954- performer.</name>
+      </author>
+      <title>The very best of Glenn Miller.</title>
+      <link href="http://worldcat.org/oclc/1140416403" />
+      <id>http://worldcat.org/oclc/1140416403</id>
+      <updated>2020-02-13T17:01:04Z</updated>
+      <oclcterms:recordIdentifier>1140416403</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Miller, Glenn.</name>
+      </author>
+      <title>Very Best of Glenn Miller.</title>
+      <link href="http://worldcat.org/oclc/630547816" />
+      <id>http://worldcat.org/oclc/630547816</id>
+      <updated>2018-11-28T18:44:17Z</updated>
+      <oclcterms:recordIdentifier>630547816</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Yarbrough, Glenn.</name>
+      </author>
+      <title>Glenn yarbrough - his very best</title>
+      <link href="http://worldcat.org/oclc/1098394025" />
+      <id>http://worldcat.org/oclc/1098394025</id>
+      <updated>2019-04-25T11:56:52Z</updated>
+      <oclcterms:recordIdentifier>1098394025</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Miller, Glenn.</name>
+      </author>
+      <title>The very best of Glenn Miller : hits &amp; rarities</title>
+      <link href="http://worldcat.org/oclc/809462816" />
+      <id>http://worldcat.org/oclc/809462816</id>
+      <updated>2020-01-23T10:02:43Z</updated>
+      <oclcterms:recordIdentifier>809462816</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Miller, Glenn, 1904-1944, performer.</name>
+      </author>
+      <title>The very best of Glenn Miller &amp; his orchestra.</title>
+      <link href="http://worldcat.org/oclc/1123215070" />
+      <id>http://worldcat.org/oclc/1123215070</id>
+      <updated>2019-11-07T01:19:22Z</updated>
+      <oclcterms:recordIdentifier>1123215070</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Miller, Glenn, 1904-1944.</name>
+      </author>
+      <title>The very best of Glenn Miller : in the mood.</title>
+      <link href="http://worldcat.org/oclc/55688833" />
+      <id>http://worldcat.org/oclc/55688833</id>
+      <updated>2016-11-17T00:02:35Z</updated>
+      <oclcterms:recordIdentifier>55688833</oclcterms:recordIdentifier>
+   </entry>
+   <entry>
+      <author>
+         <name>Miller, Glenn.</name>
+      </author>
+      <title>Glenn Miller story : the very best of</title>
+      <link href="http://worldcat.org/oclc/421718747" />
+      <id>http://worldcat.org/oclc/421718747</id>
+      <updated>2018-10-08T09:50:51Z</updated>
+      <oclcterms:recordIdentifier>421718747</oclcterms:recordIdentifier>
+   </entry>
+</feed>
\ No newline at end of file
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
new file mode 100644
index 00000000000..56106ec2148
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:diag="http://www.loc.gov/zing/srw/diagnostic/" xmlns:oclcterms="http://purl.org/oclc/terms/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
\ No newline at end of file

From c6b3e262d5691085f99605503365673cc3eceaab Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 21:39:54 +0200
Subject: [PATCH 10/48] Add preferences field

---
 .../jabref/gui/entryeditor/EntryEditor.java   |  4 ++--
 .../entryeditor/EntryEditorPreferences.java   | 15 +++++++++----
 .../org/jabref/gui/preferences/ImportTab.fxml | 16 ++++++++++++++
 .../jabref/gui/preferences/ImportTabView.java |  8 +++++--
 .../gui/preferences/ImportTabViewModel.java   | 10 +++++++--
 .../logic/importer/APIKeyPreferences.java     | 11 ++++++++++
 .../jabref/logic/importer/WebFetchers.java    |  4 ++--
 .../importer/fetcher/WorldcatFetcher.java     |  8 ++++++-
 .../jabref/preferences/JabRefPreferences.java | 21 +++++++++++++------
 .../fileformat/WorldcatImporterTest.java      |  2 --
 10 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/importer/APIKeyPreferences.java

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index f6cbfb7b996..e98943a7f6a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -97,7 +97,7 @@ public EntryEditor(BasePanel panel, ExternalFileTypes externalFileTypes) {
                   .root(this)
                   .load();
 
-        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
+		this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
         this.fileLinker = new ExternalFilesEntryLinker(externalFileTypes, preferencesService.getFilePreferences(),
                 databaseContext);
 
@@ -335,7 +335,7 @@ private void setupToolBar() {
 
         // Add menu for fetching bibliographic information
         ContextMenu fetcherMenu = new ContextMenu();
-        for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(entryEditorPreferences.getImportFormatPreferences())) {
+        for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(entryEditorPreferences.getImportFormatPreferences(), entryEditorPreferences.getAPIApiKeyPreferences())) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
             fetcherMenuItem.setOnAction(event -> fetchAndMerge(fetcher));
             fetcherMenu.getItems().add(fetcherMenuItem);
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index 26c4b48ef2a..fa040184937 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -7,6 +7,7 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.bibtex.FieldWriterPreferences;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyPatternPreferences;
+import org.jabref.logic.importer.APIKeyPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.field.Field;
 
@@ -15,7 +16,8 @@ public class EntryEditorPreferences {
     private final Map<String, Set<Field>> entryEditorTabList;
     private final FieldWriterPreferences fieldWriterPreferences;
     private final ImportFormatPreferences importFormatPreferences;
-    private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
+	private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
+	private final APIKeyPreferences apiKeyPreferences;
     private final List<Field> customTabFieldNames;
     private final boolean shouldShowRecommendationsTab;
     private final boolean isMrdlibAccepted;
@@ -24,7 +26,7 @@ public class EntryEditorPreferences {
     private boolean avoidOverwritingCiteKey;
     private final boolean shouldShowLatexCitationsTab;
 
-    public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList, FieldWriterPreferences fieldWriterPreferences, ImportFormatPreferences importFormatPreferences, List<Field> customTabFieldNames, boolean shouldShowRecommendationsTab, boolean isMrdlibAccepted, boolean shouldShowLatexCitationsTab, boolean showSourceTabByDefault, BibtexKeyPatternPreferences bibtexKeyPatternPreferences, KeyBindingRepository keyBindings, boolean avoidOverwritingCiteKey) {
+    public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList, FieldWriterPreferences fieldWriterPreferences, ImportFormatPreferences importFormatPreferences, List<Field> customTabFieldNames, boolean shouldShowRecommendationsTab, boolean isMrdlibAccepted, boolean shouldShowLatexCitationsTab, boolean showSourceTabByDefault, BibtexKeyPatternPreferences bibtexKeyPatternPreferences, KeyBindingRepository keyBindings, boolean avoidOverwritingCiteKey, APIKeyPreferences apiKeyPreferences) {
         this.entryEditorTabList = entryEditorTabList;
         this.fieldWriterPreferences = fieldWriterPreferences;
         this.importFormatPreferences = importFormatPreferences;
@@ -35,7 +37,8 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList, FieldW
         this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
         this.keyBindings = keyBindings;
         this.avoidOverwritingCiteKey = avoidOverwritingCiteKey;
-        this.shouldShowLatexCitationsTab = shouldShowLatexCitationsTab;
+		this.shouldShowLatexCitationsTab = shouldShowLatexCitationsTab;
+		this.apiKeyPreferences = apiKeyPreferences;
     }
 
     public Map<String, Set<Field>> getEntryEditorTabList() {
@@ -48,7 +51,11 @@ public FieldWriterPreferences getFieldWriterPreferences() {
 
     public ImportFormatPreferences getImportFormatPreferences() {
         return importFormatPreferences;
-    }
+	}
+	
+	public APIKeyPreferences getAPIApiKeyPreferences() {
+		return apiKeyPreferences;
+	}
 
     public List<Field> getCustomTabFieldNames() {
         return customTabFieldNames;
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
index 8cb14943e5d..ee7523edf09 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
@@ -31,4 +31,20 @@
         <TextField fx:id="fileDirPattern" GridPane.columnIndex="1" GridPane.rowIndex="1"
                    prefWidth="300" minWidth="300" maxWidth="300"/>
     </GridPane>
+
+	<Label styleClass="sectionHeader" text="%API keys"/>
+    <GridPane hgap="4.0" vgap="4.0">
+        <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES"/>
+            <ColumnConstraints hgrow="SOMETIMES"/>
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints vgrow="SOMETIMES"/>
+            <RowConstraints vgrow="SOMETIMES"/>
+        </rowConstraints>
+        <Label text="%Worldcat Fetcher Key" GridPane.rowIndex="1"/>
+        <TextField fx:id="worldcatKey" GridPane.columnIndex="1" GridPane.rowIndex="1"
+                   prefWidth="300" minWidth="300" maxWidth="300"/>
+    </GridPane>
+
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabView.java b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
index ae93a5470b6..00700748bbe 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
@@ -12,7 +12,9 @@
 public class ImportTabView extends AbstractPreferenceTabView<ImportTabViewModel> implements PreferencesTab {
 
     @FXML private ComboBox<String> fileNamePattern;
-    @FXML private TextField fileDirPattern;
+	@FXML private TextField fileDirPattern;
+	
+	@FXML private TextField worldcatKey;
 
     public ImportTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
@@ -27,7 +29,9 @@ public void initialize () {
 
         fileNamePattern.valueProperty().bindBidirectional(viewModel.fileNamePatternProperty());
         fileNamePattern.itemsProperty().bind(viewModel.defaultFileNamePatternsProperty());
-        fileDirPattern.textProperty().bindBidirectional(viewModel.fileDirPatternProperty());
+		fileDirPattern.textProperty().bindBidirectional(viewModel.fileDirPatternProperty());
+		
+		worldcatKey.textProperty().bindBidirectional(viewModel.apiKeyPatternProperty());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
index f94016147cc..f847da176ce 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
@@ -20,6 +20,8 @@ public class ImportTabViewModel implements PreferenceTabViewModel {
     private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
     private final StringProperty fileDirPatternProperty = new SimpleStringProperty();
 
+	private final StringProperty apiKeyPatternProperty = new SimpleStringProperty();
+
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
 
@@ -32,12 +34,14 @@ public ImportTabViewModel(DialogService dialogService, JabRefPreferences prefere
     public void setValues() {
         fileNamePatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
         fileDirPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILEDIRPATTERN));
-    }
+	    apiKeyPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_API_WORLDCAT));
+	}
 
     @Override
     public void storeSettings() {
         preferences.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, fileNamePatternProperty.getValue());
         preferences.put(JabRefPreferences.IMPORT_FILEDIRPATTERN, fileDirPatternProperty.getValue());
+        preferences.put(JabRefPreferences.IMPORT_API_WORLDCAT, apiKeyPatternProperty.getValue());
     }
 
     @Override
@@ -54,5 +58,7 @@ public List<String> getRestartWarnings() {
 
     public StringProperty fileNamePatternProperty() { return fileNamePatternProperty; }
 
-    public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
+	public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
+	
+	public StringProperty apiKeyPatternProperty() { return apiKeyPatternProperty; }
 }
diff --git a/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java b/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
new file mode 100644
index 00000000000..d121b731e05
--- /dev/null
+++ b/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
@@ -0,0 +1,11 @@
+package org.jabref.logic.importer;
+
+public class APIKeyPreferences {
+	private final String worldcatKey;
+	
+	public APIKeyPreferences(String worldcatKey) {
+		this.worldcatKey = worldcatKey;
+	}
+
+	public String getWorldcatKey() { return worldcatKey; }
+}
\ No newline at end of file
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 342a9d56770..d2b138764d5 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -128,14 +128,14 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
     /**
      * @return sorted set containing entry based fetchers
      */
-    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPreferences importFormatPreferences) {
+    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPreferences importFormatPreferences, APIKeyPreferences apiKeyPreferences) {
         SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new AstrophysicsDataSystem(importFormatPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
-        set.add(new WorldcatFetcher());
+        set.add(new WorldcatFetcher(apiKeyPreferences));
         return set;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index a82ff0d1c75..42a00268269 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -14,6 +14,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
+import org.jabref.logic.importer.APIKeyPreferences;
+
 import java.net.URL;
 import java.net.MalformedURLException;
 
@@ -25,10 +27,14 @@
 public class WorldcatFetcher implements EntryBasedFetcher {
 
 	private final static String NAME = "Worldcat Fetcher";
-	public final static String API_KEY = "API-KEY-GOES-HERE";
+	public static String API_KEY;
 
 	private final static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
 
+	public WorldcatFetcher(APIKeyPreferences apiKeyPreferences){
+		API_KEY = apiKeyPreferences.getWorldcatKey();
+	}
+
 	@Override
 	public String getName() {
 		return NAME;
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 82f8ca3dd1e..cd2508d12f3 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -65,6 +65,7 @@
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.importer.APIKeyPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -247,7 +248,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String CLEANUP = "CleanUp";
     public static final String CLEANUP_FORMATTERS = "CleanUpFormatters";
     public static final String IMPORT_FILENAMEPATTERN = "importFileNamePattern";
-    public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
+	public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
+	public static final String IMPORT_API_WORLDCAT = "importAPIWorldcat";
     public static final String NAME_FORMATTER_VALUE = "nameFormatterFormats";
     public static final String NAME_FORMATER_KEY = "nameFormatterNames";
     public static final String PUSH_TO_APPLICATION = "pushToApplication";
@@ -627,7 +629,9 @@ private JabRefPreferences() {
         // use BibTeX key appended with filename as default pattern
         defaults.put(IMPORT_FILENAMEPATTERN, ImportTabViewModel.DEFAULT_FILENAME_PATTERNS[1]);
         //Default empty String to be backwards compatible
-        defaults.put(IMPORT_FILEDIRPATTERN, "");
+		defaults.put(IMPORT_FILEDIRPATTERN, "");
+		
+		defaults.put(IMPORT_API_WORLDCAT, "");
 
         customImports = new CustomImportList(this);
 
@@ -775,8 +779,9 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getBoolean(DEFAULT_SHOW_SOURCE),
                 getBibtexKeyPatternPreferences(),
                 Globals.getKeyPrefs(),
-                getBoolean(AVOID_OVERWRITING_KEY));
-    }
+				getBoolean(AVOID_OVERWRITING_KEY),
+				getApiKeyPreferences());
+	}
 
     public Map<SidePaneType, Integer> getSidePanePreferredPositions() {
         Map<SidePaneType, Integer> preferredPositions = new HashMap<>();
@@ -812,7 +817,7 @@ public String getUser() {
     @Override
     public String getTheme() {
         return get(FX_THEME);
-    }
+	}
 
     /**
      * Get a Map of default tab names to deafult tab fields.
@@ -1285,7 +1290,11 @@ public FilePreferences getFilePreferences() {
                 getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
                 get(IMPORT_FILENAMEPATTERN),
                 get(IMPORT_FILEDIRPATTERN));
-    }
+	}
+		
+	public APIKeyPreferences getApiKeyPreferences() {
+		return new APIKeyPreferences(get(IMPORT_API_WORLDCAT));
+	}
 
     public FieldWriterPreferences getFieldWriterPreferences() {
         return new FieldWriterPreferences(
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index 1049e7f666f..6091181d461 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -22,8 +22,6 @@
 import org.junit.jupiter.api.Test;
 
 public class WorldcatImporterTest {
-	private final String XML_WITH_RESULT_PATH = "";
-	private final String XML_WITHOUT_RESULT_PATH = "";
 	
 	WorldcatImporter importer;
 

From 2e631c3d70f8643c47bbbd81303db1e8afd7d774 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 21:59:41 +0200
Subject: [PATCH 11/48] Fick checkstyle for main

---
 .../importer/fetcher/WorldcatFetcher.java     |  64 +++++----
 .../importer/fileformat/WorldcatImporter.java | 124 +++++++++---------
 2 files changed, 93 insertions(+), 95 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 42a00268269..8465ed3e11b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -1,10 +1,13 @@
 package org.jabref.logic.importer.fetcher;
 
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import org.jabref.logic.importer.APIKeyPreferences;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
@@ -14,11 +17,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.jabref.logic.importer.APIKeyPreferences;
-
-import java.net.URL;
-import java.net.MalformedURLException;
-
 /**
  * EntryBasedFetcher that searches the Worldcat database
  * 
@@ -26,17 +24,17 @@
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
-	private final static String NAME = "Worldcat Fetcher";
 	public static String API_KEY;
+	private static final String NAME = "Worldcat Fetcher";
 
-	private final static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
+	private static final String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
 
-	public WorldcatFetcher(APIKeyPreferences apiKeyPreferences){
-		API_KEY = apiKeyPreferences.getWorldcatKey();
+	public WorldcatFetcher (APIKeyPreferences apiKeyPreferences) {
+		API_KEY = apiKeyPreferences.getWorldcatKey ();
 	}
 
 	@Override
-	public String getName() {
+	public String getName () {
 		return NAME;
 	}
 
@@ -45,10 +43,10 @@ public String getName() {
 	 * @param title the title to include in the query
 	 * @return the earch query for the api
 	 */
-	private String getOpenSearchURL(String title) throws MalformedURLException{
+	private String getOpenSearchURL (String title) throws MalformedURLException { 
 		String query = "&q=srw.ti+all+\"" + title + "\"";
-		URL url = new URL(WORLDCAT_OPEN_SEARCH_URL + query);
-		return url.toString();
+		URL url = new URL (WORLDCAT_OPEN_SEARCH_URL + query);
+		return url.toString ();
 	}
 
 	/**
@@ -56,39 +54,39 @@ private String getOpenSearchURL(String title) throws MalformedURLException{
 	 * @param title the title of the search
 	 * @return the body of the HTTP response
 	 */
-	private String makeOpenSearchRequest(String title) throws FetcherException{
+	private String makeOpenSearchRequest (String title) throws FetcherException { 
 		try {
-			URLDownload urlDownload = new URLDownload(getOpenSearchURL(title));
-			URLDownload.bypassSSLVerification();
-			String resp = urlDownload.asString();
+			URLDownload urlDownload = new URLDownload (getOpenSearchURL (title));
+			URLDownload.bypassSSLVerification ();
+			String resp = urlDownload.asString ();
 
 			return resp;
 		} catch (MalformedURLException e) {
-			throw new FetcherException("Bad url", e);
+			throw new FetcherException ("Bad url", e);
 		} catch (IOException e) {
-			throw new FetcherException("Error with Open Search Request (Worldcat)", e);
+			throw new FetcherException ("Error with Open Search Request (Worldcat)", e);
 		} 
 	}
 
 	@Override
-	public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
-		Optional<String> entryTitle = entry.getLatexFreeField(StandardField.TITLE);
-		if(entryTitle.isPresent()){
-			String xmlResponse = makeOpenSearchRequest(entryTitle.get());
-			WorldcatImporter importer = new WorldcatImporter(); 
+	public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
+		Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
+		if (entryTitle.isPresent ()) {
+			String xmlResponse = makeOpenSearchRequest (entryTitle.get ());
+			WorldcatImporter importer = new WorldcatImporter (); 
 			ParserResult parserResult;
-			try{
-				if(importer.isRecognizedFormat(xmlResponse)){
-					parserResult = importer.importDatabase(xmlResponse);
-				} else{
+			try { 
+				if (importer.isRecognizedFormat (xmlResponse)) {
+					parserResult = importer.importDatabase (xmlResponse);
+				} else { 
 					// For displaying An ErrorMessage
-					BibDatabase errorBibDataBase = new BibDatabase();
-					parserResult = new ParserResult(errorBibDataBase);
+					BibDatabase errorBibDataBase = new BibDatabase ();
+					parserResult = new ParserResult (errorBibDataBase);
 				}
-				return parserResult.getDatabase().getEntries();
+				return parserResult.getDatabase ().getEntries ();
 			}
-			catch(IOException e){
-				throw new FetcherException("Could not perform search (Worldcat) ", e);
+			catch (IOException e) {
+				throw new FetcherException ("Could not perform search (Worldcat) ", e);
 			}
 		} else {
 			return new ArrayList<>();
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index e162a8379bc..faafb7def20 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -18,6 +18,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -26,12 +27,12 @@
 
 public class WorldcatImporter extends Importer {
 
-	private String WORLDCAT_READ_URL;
-
-	private final static String NAME = "WorldcatImporter";
-	private final static String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
+	private static final String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
+	private static final String NAME = "WorldcatImporter";
 
-	public WorldcatImporter(){
+	private String WORLDCAT_READ_URL;
+	
+	public WorldcatImporter () {
 		//Used the same key as Worldcat fether
 		this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + WorldcatFetcher.API_KEY;
 	}
@@ -42,18 +43,18 @@ public WorldcatImporter(){
 	 * @return XML document representing the content of s
 	 * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
 	 */
-	private Document parse(BufferedReader s){
-		try{
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			DocumentBuilder builder = factory.newDocumentBuilder();
-
-			return builder.parse(new InputSource(s));
-		} catch(ParserConfigurationException e){
-			throw new IllegalArgumentException("Parser Config Exception: " + e.getMessage(), e);
-		} catch(SAXException e){
-			throw new IllegalArgumentException("SAX Exception: " + e.getMessage(), e);
-		} catch(IOException e){
-			throw new IllegalArgumentException("IO Exception: " + e.getMessage(), e);
+	private Document parse (BufferedReader s) {
+		try { 
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
+			DocumentBuilder builder = factory.newDocumentBuilder ();
+
+			return builder.parse (new InputSource (s));
+		} catch (ParserConfigurationException e) {
+			throw new IllegalArgumentException ("Parser Config Exception: " + e.getMessage (), e);
+		} catch (SAXException e) {
+			throw new IllegalArgumentException ("SAX Exception: " + e.getMessage (), e);
+		} catch (IOException e) {
+			throw new IllegalArgumentException ("IO Exception: " + e.getMessage (), e);
 		}
 	}
 
@@ -63,23 +64,22 @@ private Document parse(BufferedReader s){
 	 * @param id the oclc id
 	 * @return the XML element that contains all tags
 	 */
-	private Element getSpecificInfoOnOCLC(String id) throws IOException {
-		URLDownload urlDownload = new URLDownload(WORLDCAT_READ_URL.replace("{OCLC-NUMBER}", id));
-		URLDownload.bypassSSLVerification();
-		String resp = urlDownload.asString();	
+	private Element getSpecificInfoOnOCLC (String id) throws IOException {
+		URLDownload urlDownload = new URLDownload (WORLDCAT_READ_URL.replace ("{OCLC-NUMBER}", id));
+		URLDownload.bypassSSLVerification ();
+		String resp = urlDownload.asString ();	
 
-		Document mainDoc = parse(new BufferedReader(new StringReader(resp)));
-		NodeList parentElemOfTags = mainDoc.getElementsByTagName("oclcdcs");
+		Document mainDoc = parse (new BufferedReader (new StringReader (resp)));
+		NodeList parentElemOfTags = mainDoc.getElementsByTagName ("oclcdcs");
 
-		return (Element) parentElemOfTags.item(0);
+		return (Element) parentElemOfTags.item (0);
 	}
 
-
 	@Override
-	public boolean isRecognizedFormat(BufferedReader input) throws IOException {
+	public boolean isRecognizedFormat (BufferedReader input) throws IOException {
 		try {
-			Document doc = parse(input);
-			return doc.getElementsByTagName("feed") != null;
+			Document doc = parse (input);
+			return doc.getElementsByTagName ("feed") != null;
 		} catch (IllegalArgumentException e) {
 			return false;
 		}
@@ -93,9 +93,9 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
 	 * @return the tag element
 	 * @throws NullPointerException if there is no element by this tag
 	 */
-	private Element getElementByTag(Element xml, String tag) throws NullPointerException{
-		NodeList nl = xml.getElementsByTagName(tag);
-		return (Element) nl.item(0);
+	private Element getElementByTag (Element xml, String tag) throws NullPointerException { 
+		NodeList nl = xml.getElementsByTagName (tag);
+		return (Element) nl.item (0);
 	}
 
 	/**
@@ -104,28 +104,28 @@ private Element getElementByTag(Element xml, String tag) throws NullPointerExcep
 	 * @return the correspoinding bibentry
 	 * @throws IOException if we cannot search Worldcat with the OCLC of the entry
 	 */
-	private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException{
-		Element authorsElem = getElementByTag(xmlEntry, "author");
-		String authors = getElementByTag(authorsElem, "name").getTextContent();
+	private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException { 
+		Element authorsElem = getElementByTag (xmlEntry, "author");
+		String authors = getElementByTag (authorsElem, "name").getTextContent ();
 
-		String title = getElementByTag(xmlEntry, "title").getTextContent();
+		String title = getElementByTag (xmlEntry, "title").getTextContent ();
 
-		String url = getElementByTag(xmlEntry, "link").getAttribute("href");
+		String url = getElementByTag (xmlEntry, "link").getAttribute ("href");
 
-		String oclc = xmlEntry.getElementsByTagName("oclcterms:recordIdentifier").item(0).getTextContent();
-		Element detailedInfo = getSpecificInfoOnOCLC(oclc);
+		String oclc = xmlEntry.getElementsByTagName ("oclcterms:recordIdentifier").item (0).getTextContent ();
+		Element detailedInfo = getSpecificInfoOnOCLC (oclc);
 
-		String date = detailedInfo.getElementsByTagName("dc:date").item(0).getTextContent();
+		String date = detailedInfo.getElementsByTagName ("dc:date").item (0).getTextContent ();
 
-		String publisher = detailedInfo.getElementsByTagName("dc:publisher").item(0).getTextContent();
+		String publisher = detailedInfo.getElementsByTagName ("dc:publisher").item (0).getTextContent ();
 
-		BibEntry entry = new BibEntry();
+		BibEntry entry = new BibEntry ();
 
-		entry.setField(StandardField.AUTHOR, authors);
-		entry.setField(StandardField.TITLE, title);
-		entry.setField(StandardField.URL, url);
-		entry.setField(StandardField.YEAR, date);
-		entry.setField(StandardField.JOURNAL, publisher);
+		entry.setField (StandardField.AUTHOR, authors);
+		entry.setField (StandardField.TITLE, title);
+		entry.setField (StandardField.URL, url);
+		entry.setField (StandardField.YEAR, date);
+		entry.setField (StandardField.JOURNAL, publisher);
 
 		return entry;
 	}
@@ -137,38 +137,38 @@ private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException{
 	 * @return the ParserResult containing the BibEntries collection
 	 * @throws IOException if {@link xmlEntryToBibEntry} throws 
 	 */
-	private ParserResult docToParserRes(Document doc) throws IOException{
-		Element feed = (Element) doc.getElementsByTagName("feed").item(0);
-		NodeList entryXMLList = feed.getElementsByTagName("entry");
-
-		List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength());
-		for(int i = 0; i < entryXMLList.getLength(); i++){
-			Element xmlEntry = (Element) entryXMLList.item(i);
-			BibEntry bibEntry = xmlEntryToBibEntry(xmlEntry);
-			bibList.add(bibEntry);		
+	private ParserResult docToParserRes (Document doc) throws IOException { 
+		Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
+		NodeList entryXMLList = feed.getElementsByTagName ("entry");
+
+		List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength ());
+		for (int i = 0; i < entryXMLList.getLength (); i++) {
+			Element xmlEntry = (Element) entryXMLList.item (i);
+			BibEntry bibEntry = xmlEntryToBibEntry (xmlEntry);
+			bibList.add (bibEntry);		
 		}
 
-		return new ParserResult(bibList);
+		return new ParserResult (bibList);
 	}
 
 	@Override
-	public ParserResult importDatabase(BufferedReader input) throws IOException {
-		Document parsedDoc = parse(input);
-		return docToParserRes(parsedDoc);
+	public ParserResult importDatabase (BufferedReader input) throws IOException {
+		Document parsedDoc = parse (input);
+		return docToParserRes (parsedDoc);
 	}
 
 	@Override
-	public String getName() {
+	public String getName () {
 		return NAME;
 	}
 
 	@Override
-	public FileType getFileType() {
+	public FileType getFileType () {
 		return StandardFileType.XML;
 	}
 
 	@Override
-	public String getDescription() {
+	public String getDescription () {
 		return DESCRIPTION;
 	}
 

From 6a5db507ac37e838833c27620c059166ae681854 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 22:20:35 +0200
Subject: [PATCH 12/48] Fix checkstyle test

---
 .../logic/importer/WebFetchersTest.java       | 10 +++---
 .../importer/fetcher/WorldcatFetcherTest.java | 21 +++++++-----
 .../fileformat/WorldcatImporterTest.java      | 33 +++++++++----------
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index dcd7fc97775..6f025e2901d 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -9,7 +9,6 @@
 import org.jabref.logic.importer.fetcher.IsbnViaEbookDeFetcher;
 import org.jabref.logic.importer.fetcher.IsbnViaOttoBibFetcher;
 import org.jabref.logic.importer.fetcher.MrDLibFetcher;
-import org.jabref.logic.importer.fetcher.WorldcatFetcher;
 
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ClassInfoList;
@@ -22,12 +21,15 @@
 
 class WebFetchersTest {
 
-    private ImportFormatPreferences importFormatPreferences;
+	private APIKeyPreferences apiKeyPreferences;
+	private ImportFormatPreferences importFormatPreferences;
+	
     private ClassGraph classGraph = new ClassGraph().enableAllInfo().whitelistPackages("org.jabref");
 
     @BeforeEach
     void setUp() throws Exception {
-        importFormatPreferences = mock(ImportFormatPreferences.class);
+		importFormatPreferences = mock(ImportFormatPreferences.class);
+		apiKeyPreferences = mock(APIKeyPreferences.class);
     }
 
     @Test
@@ -55,7 +57,7 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
 
     @Test
     void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throws Exception {
-        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(importFormatPreferences);
+        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(importFormatPreferences, apiKeyPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(EntryBasedFetcher.class.getCanonicalName());
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index 6f093214e69..6f2592f643f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -1,29 +1,32 @@
 package org.jabref.logic.importer.fetcher;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.util.List;
 
+import org.jabref.logic.importer.APIKeyPreferences;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.testutils.category.FetcherTest;
-import org.junit.jupiter.api.Test;
+
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 @FetcherTest
-public class WorldcatFetcherTest{
+public class WorldcatFetcherTest {
 
 	private WorldcatFetcher fetcher;
 
 	@BeforeEach
 	public void setUp() {
-		fetcher = new WorldcatFetcher();
+		fetcher = new WorldcatFetcher(mock(APIKeyPreferences.class));
 	}
 
 	@Test
-	public void testPerformSearchForBadTitle() throws FetcherException{
+	public void testPerformSearchForBadTitle() throws FetcherException {
 		BibEntry entry = new BibEntry();
 		//Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
 		entry.setField(StandardField.TITLE, "ASDhbsd fnm");
@@ -32,7 +35,7 @@ public void testPerformSearchForBadTitle() throws FetcherException{
 	}
 
 	@Test
-	public void testPerformSearchForExistingTitle() throws FetcherException{
+	public void testPerformSearchForExistingTitle() throws FetcherException {
 		BibEntry entry = new BibEntry();
 		//Example "The very best of Glenn Miller". Verified on same link as above
 		entry.setField(StandardField.TITLE, "The very best of Glenn");
@@ -41,7 +44,7 @@ public void testPerformSearchForExistingTitle() throws FetcherException{
 	}
 
 	@Test
-	public void testPerformSearchForNullTitle() throws FetcherException{
+	public void testPerformSearchForNullTitle() throws FetcherException {
 		BibEntry entry = new BibEntry();
 		entry.setField(StandardField.TITLE, null);
 		List<BibEntry> list = fetcher.performSearch(entry);
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index 6091181d461..8dbe5c89409 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -1,42 +1,39 @@
 package org.jabref.logic.importer.fileformat;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
-
-import java.util.function.Predicate;
-import java.util.Collection;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.function.Predicate;
 
-import org.jabref.logic.importer.fileformat.WorldcatImporter;
 import org.jabref.logic.importer.ParserResult;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class WorldcatImporterTest {
 	
 	WorldcatImporter importer;
 
-	private String getFilePath(String filename) throws IOException{
+	private String getFilePath(String filename) throws IOException {
 		Predicate<String> filePredicate = name -> {
 			return name.startsWith(filename) && name.endsWith(".xml");
 		};
 		Collection<String> paths = ImporterTestEngine.getTestFiles(filePredicate);
-		if(paths.size() > 1 || paths.size() == 0){
+		if (paths.size() > 1 || paths.size() == 0) {
 			throw new IllegalArgumentException("Filename returned 0 or more than 1 result: " + filename);
 		}
 		return paths.iterator().next();
 	}
 
-	private String getFileContent(String filename) throws IOException{
+	private String getFileContent(String filename) throws IOException {
 		String path = getFilePath(filename);
 		String content = Files.readString(getPath(path));
 		return content;
@@ -51,30 +48,30 @@ private static Path getPath(String fileName) throws IOException {
     }
 
 	@BeforeEach
-	public void setUp(){
+	public void setUp() {
 		importer = new WorldcatImporter();
 		
 	}
 	
 	@Test
-	public void withResultIsRecognizedFormat() throws IOException{
+	public void withResultIsRecognizedFormat() throws IOException {
 		ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithResult"));
 	}
 
 	@Test
-	public void withoutResultIsRecognizedFormat() throws IOException{
+	public void withoutResultIsRecognizedFormat() throws IOException {
 		ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithoutResult"));
 	}
 
 	@Test
-	public void badXMLIsNotRecognizedFormat() throws IOException{
+	public void badXMLIsNotRecognizedFormat() throws IOException {
 		boolean isReq = importer.isRecognizedFormat("Nah bruh");
 		assertFalse(isReq);
 	}
 
 	@Disabled("Will not work without API key")
 	@Test
-	public void withResultReturnsNonEmptyResult() throws IOException{
+	public void withResultReturnsNonEmptyResult() throws IOException {
 		String withResultXML = getFileContent("WorldcatImporterTestWithResult");
 		ParserResult res = importer.importDatabase(withResultXML);
 		assertTrue(res.getDatabase().getEntries().size() > 0);
@@ -82,7 +79,7 @@ public void withResultReturnsNonEmptyResult() throws IOException{
 
 	@Disabled("Will not work without API key")
 	@Test
-	public void withoutResultReturnsEmptyResult() throws IOException{
+	public void withoutResultReturnsEmptyResult() throws IOException {
 		String withoutResultXML = getFileContent("WorldcatImporterTestWithResult");
 		ParserResult res = importer.importDatabase(withoutResultXML);
 		assertEquals(0, res.getDatabase().getEntries().size());

From 6db97d71249ac32dd5578b0c6bf6e52f82713d10 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 22:35:00 +0200
Subject: [PATCH 13/48] Add to eng. language file

---
 src/main/resources/l10n/JabRef_en.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 125b07a0806..8529c1ccc8a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1044,6 +1044,8 @@ No\ search\ matches.=No search matches.
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=The output option depends on a valid input option.
 Linked\ file\ name\ conventions=Linked file name conventions
 Filename\ format\ pattern=Filename format pattern
+API\ keys=API keys
+Worldcat\ Fetcher\ Key=Worldcat Fetcher Key
 Additional\ parameters=Additional parameters
 Cite\ selected\ entries\ between\ parenthesis=Cite selected entries between parenthesis
 Cite\ selected\ entries\ with\ in-text\ citation=Cite selected entries with in-text citation

From f80f2fc94a9e1d6388b3578383ca75a4e789a5a9 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 29 Mar 2020 19:04:42 +0200
Subject: [PATCH 14/48] Update CHANGELOG.md

Co-Authored-By: Christoph <cschwentker@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5bcdb72f62..8412d2b6fb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
 - Filenames of external files can no longer contain curly braces. [#5926](https://github.com/JabRef/jabref/pull/5926)
 - We made the filters more easily accessible in the integrity check dialog. [#5955](https://github.com/JabRef/jabref/pull/5955)
+- We added a WorldCcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [WorldCat](http://www.worldcat.org/webservices/catalog/)
 - We reimplemented and improved the dialog "Customize entry types". [#4719](https://github.com/JabRef/jabref/issues/4719)
 - We added an [American Physical Society](https://journals.aps.org/) fetcher. [#818](https://github.com/JabRef/jabref/issues/818)
 - We reimplemented and improved the dialog "Customize entry types" [#4719](https://github.com/JabRef/jabref/issues/4719)

From b78b38773e4bf280f01f0054f4cd7357b7b5172b Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 31 Mar 2020 20:06:48 +0200
Subject: [PATCH 15/48] Update
 src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java

Co-Authored-By: Christoph <cschwentker@gmail.com>
---
 .../jabref/logic/importer/fileformat/WorldcatImporter.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index faafb7def20..a00a1f612aa 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -27,7 +27,7 @@
 
 public class WorldcatImporter extends Importer {
 
-	private static final String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
+	private static final String DESCRIPTION = "Importer for Worldcat Open Search XML format";
 	private static final String NAME = "WorldcatImporter";
 
 	private String WORLDCAT_READ_URL;
@@ -172,4 +172,4 @@ public String getDescription () {
 		return DESCRIPTION;
 	}
 
-}
\ No newline at end of file
+}

From bf6cb11fb2839a2d399c03233d0e30a9f67734bb Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 31 Mar 2020 20:14:08 +0200
Subject: [PATCH 16/48] Update style and pass worldcat key directly

---
 .../jabref/gui/entryeditor/EntryEditor.java   |   2 +-
 .../entryeditor/EntryEditorPreferences.java   |  18 +-
 .../org/jabref/gui/preferences/ImportTab.fxml |   2 +-
 .../jabref/gui/preferences/ImportTabView.java |  12 +-
 .../gui/preferences/ImportTabViewModel.java   |  12 +-
 .../logic/importer/APIKeyPreferences.java     |  12 +-
 .../jabref/logic/importer/WebFetchers.java    |   2 +-
 .../importer/fetcher/WorldcatFetcher.java     | 123 ++++----
 .../importer/fileformat/WorldcatImporter.java | 288 +++++++++---------
 .../jabref/preferences/JabRefPreferences.java |  28 +-
 .../logic/importer/WebFetchersTest.java       |  12 +-
 .../importer/fetcher/WorldcatFetcherTest.java |  65 ++--
 .../fileformat/WorldcatImporterTest.java      | 102 +++----
 13 files changed, 338 insertions(+), 340 deletions(-)

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index e98943a7f6a..2051cc898c2 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -97,7 +97,7 @@ public EntryEditor(BasePanel panel, ExternalFileTypes externalFileTypes) {
                   .root(this)
                   .load();
 
-		this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
+        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
         this.fileLinker = new ExternalFilesEntryLinker(externalFileTypes, preferencesService.getFilePreferences(),
                 databaseContext);
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index fa040184937..45995d3e65a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -16,8 +16,8 @@ public class EntryEditorPreferences {
     private final Map<String, Set<Field>> entryEditorTabList;
     private final FieldWriterPreferences fieldWriterPreferences;
     private final ImportFormatPreferences importFormatPreferences;
-	private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
-	private final APIKeyPreferences apiKeyPreferences;
+    private final BibtexKeyPatternPreferences bibtexKeyPatternPreferences;
+    private final APIKeyPreferences apiKeyPreferences;
     private final List<Field> customTabFieldNames;
     private final boolean shouldShowRecommendationsTab;
     private final boolean isMrdlibAccepted;
@@ -37,8 +37,8 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList, FieldW
         this.bibtexKeyPatternPreferences = bibtexKeyPatternPreferences;
         this.keyBindings = keyBindings;
         this.avoidOverwritingCiteKey = avoidOverwritingCiteKey;
-		this.shouldShowLatexCitationsTab = shouldShowLatexCitationsTab;
-		this.apiKeyPreferences = apiKeyPreferences;
+        this.shouldShowLatexCitationsTab = shouldShowLatexCitationsTab;
+        this.apiKeyPreferences = apiKeyPreferences;
     }
 
     public Map<String, Set<Field>> getEntryEditorTabList() {
@@ -51,11 +51,11 @@ public FieldWriterPreferences getFieldWriterPreferences() {
 
     public ImportFormatPreferences getImportFormatPreferences() {
         return importFormatPreferences;
-	}
-	
-	public APIKeyPreferences getAPIApiKeyPreferences() {
-		return apiKeyPreferences;
-	}
+    }
+    
+    public APIKeyPreferences getAPIApiKeyPreferences() {
+        return apiKeyPreferences;
+    }
 
     public List<Field> getCustomTabFieldNames() {
         return customTabFieldNames;
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
index ee7523edf09..81395f1769e 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
@@ -32,7 +32,7 @@
                    prefWidth="300" minWidth="300" maxWidth="300"/>
     </GridPane>
 
-	<Label styleClass="sectionHeader" text="%API keys"/>
+    <Label styleClass="sectionHeader" text="%API keys"/>
     <GridPane hgap="4.0" vgap="4.0">
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES"/>
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabView.java b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
index 00700748bbe..566987970af 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
@@ -12,9 +12,9 @@
 public class ImportTabView extends AbstractPreferenceTabView<ImportTabViewModel> implements PreferencesTab {
 
     @FXML private ComboBox<String> fileNamePattern;
-	@FXML private TextField fileDirPattern;
-	
-	@FXML private TextField worldcatKey;
+    @FXML private TextField fileDirPattern;
+    
+    @FXML private TextField worldcatKey;
 
     public ImportTabView(JabRefPreferences preferences) {
         this.preferences = preferences;
@@ -29,9 +29,9 @@ public void initialize () {
 
         fileNamePattern.valueProperty().bindBidirectional(viewModel.fileNamePatternProperty());
         fileNamePattern.itemsProperty().bind(viewModel.defaultFileNamePatternsProperty());
-		fileDirPattern.textProperty().bindBidirectional(viewModel.fileDirPatternProperty());
-		
-		worldcatKey.textProperty().bindBidirectional(viewModel.apiKeyPatternProperty());
+        fileDirPattern.textProperty().bindBidirectional(viewModel.fileDirPatternProperty());
+        
+        worldcatKey.textProperty().bindBidirectional(viewModel.apiKeyPatternProperty());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
index f847da176ce..df50d8e2623 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
@@ -20,7 +20,7 @@ public class ImportTabViewModel implements PreferenceTabViewModel {
     private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
     private final StringProperty fileDirPatternProperty = new SimpleStringProperty();
 
-	private final StringProperty apiKeyPatternProperty = new SimpleStringProperty();
+    private final StringProperty apiKeyPatternProperty = new SimpleStringProperty();
 
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
@@ -34,8 +34,8 @@ public ImportTabViewModel(DialogService dialogService, JabRefPreferences prefere
     public void setValues() {
         fileNamePatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
         fileDirPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILEDIRPATTERN));
-	    apiKeyPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_API_WORLDCAT));
-	}
+        apiKeyPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_API_WORLDCAT));
+    }
 
     @Override
     public void storeSettings() {
@@ -58,7 +58,7 @@ public List<String> getRestartWarnings() {
 
     public StringProperty fileNamePatternProperty() { return fileNamePatternProperty; }
 
-	public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
-	
-	public StringProperty apiKeyPatternProperty() { return apiKeyPatternProperty; }
+    public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
+    
+    public StringProperty apiKeyPatternProperty() { return apiKeyPatternProperty; }
 }
diff --git a/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java b/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
index d121b731e05..e6bdd4c719d 100644
--- a/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.importer;
 
 public class APIKeyPreferences {
-	private final String worldcatKey;
-	
-	public APIKeyPreferences(String worldcatKey) {
-		this.worldcatKey = worldcatKey;
-	}
+    private final String worldcatKey;
+    
+    public APIKeyPreferences(String worldcatKey) {
+        this.worldcatKey = worldcatKey;
+    }
 
-	public String getWorldcatKey() { return worldcatKey; }
+    public String getWorldcatKey() { return worldcatKey; }
 }
\ No newline at end of file
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index d2b138764d5..2ef785fb6b2 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -135,7 +135,7 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPre
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
-        set.add(new WorldcatFetcher(apiKeyPreferences));
+        set.add(new WorldcatFetcher(apiKeyPreferences.getWorldcatKey()));
         return set;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 8465ed3e11b..857c6ee390a 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import org.jabref.logic.importer.APIKeyPreferences;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
@@ -24,73 +23,73 @@
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
-	public static String API_KEY;
-	private static final String NAME = "Worldcat Fetcher";
+    public static String API_KEY;
+    private static final String NAME = "Worldcat Fetcher";
 
-	private static final String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
+    private static final String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
 
-	public WorldcatFetcher (APIKeyPreferences apiKeyPreferences) {
-		API_KEY = apiKeyPreferences.getWorldcatKey ();
-	}
+    public WorldcatFetcher (String worldcatKey) {
+        API_KEY = worldcatKey;
+    }
 
-	@Override
-	public String getName () {
-		return NAME;
-	}
+    @Override
+    public String getName () {
+        return NAME;
+    }
 
-	/**
-	 * Create a open search query with specified title
-	 * @param title the title to include in the query
-	 * @return the earch query for the api
-	 */
-	private String getOpenSearchURL (String title) throws MalformedURLException { 
-		String query = "&q=srw.ti+all+\"" + title + "\"";
-		URL url = new URL (WORLDCAT_OPEN_SEARCH_URL + query);
-		return url.toString ();
-	}
+    /**
+     * Create a open search query with specified title
+     * @param title the title to include in the query
+     * @return the earch query for the api
+     */
+    private String getOpenSearchURL (String title) throws MalformedURLException { 
+        String query = "&q=srw.ti+all+\"" + title + "\"";
+        URL url = new URL (WORLDCAT_OPEN_SEARCH_URL + query);
+        return url.toString ();
+    }
 
-	/**
-	 * Make request to open search API of Worldcat, with specified title
-	 * @param title the title of the search
-	 * @return the body of the HTTP response
-	 */
-	private String makeOpenSearchRequest (String title) throws FetcherException { 
-		try {
-			URLDownload urlDownload = new URLDownload (getOpenSearchURL (title));
-			URLDownload.bypassSSLVerification ();
-			String resp = urlDownload.asString ();
+    /**
+     * Make request to open search API of Worldcat, with specified title
+     * @param title the title of the search
+     * @return the body of the HTTP response
+     */
+    private String makeOpenSearchRequest (String title) throws FetcherException { 
+        try {
+            URLDownload urlDownload = new URLDownload (getOpenSearchURL (title));
+            URLDownload.bypassSSLVerification ();
+            String resp = urlDownload.asString ();
 
-			return resp;
-		} catch (MalformedURLException e) {
-			throw new FetcherException ("Bad url", e);
-		} catch (IOException e) {
-			throw new FetcherException ("Error with Open Search Request (Worldcat)", e);
-		} 
-	}
+            return resp;
+        } catch (MalformedURLException e) {
+            throw new FetcherException ("Bad url", e);
+        } catch (IOException e) {
+            throw new FetcherException ("Error with Open Search Request (Worldcat)", e);
+        } 
+    }
 
-	@Override
-	public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
-		Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
-		if (entryTitle.isPresent ()) {
-			String xmlResponse = makeOpenSearchRequest (entryTitle.get ());
-			WorldcatImporter importer = new WorldcatImporter (); 
-			ParserResult parserResult;
-			try { 
-				if (importer.isRecognizedFormat (xmlResponse)) {
-					parserResult = importer.importDatabase (xmlResponse);
-				} else { 
-					// For displaying An ErrorMessage
-					BibDatabase errorBibDataBase = new BibDatabase ();
-					parserResult = new ParserResult (errorBibDataBase);
-				}
-				return parserResult.getDatabase ().getEntries ();
-			}
-			catch (IOException e) {
-				throw new FetcherException ("Could not perform search (Worldcat) ", e);
-			}
-		} else {
-			return new ArrayList<>();
-		}
-	}
+    @Override
+    public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
+        Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
+        if (entryTitle.isPresent ()) {
+            String xmlResponse = makeOpenSearchRequest (entryTitle.get ());
+            WorldcatImporter importer = new WorldcatImporter (); 
+            ParserResult parserResult;
+            try { 
+                if (importer.isRecognizedFormat (xmlResponse)) {
+                    parserResult = importer.importDatabase (xmlResponse);
+                } else { 
+                    // For displaying An ErrorMessage
+                    BibDatabase errorBibDataBase = new BibDatabase ();
+                    parserResult = new ParserResult (errorBibDataBase);
+                }
+                return parserResult.getDatabase ().getEntries ();
+            }
+            catch (IOException e) {
+                throw new FetcherException ("Could not perform search (Worldcat) ", e);
+            }
+        } else {
+            return new ArrayList<>();
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index faafb7def20..9c2278bdfd2 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -27,149 +27,149 @@
 
 public class WorldcatImporter extends Importer {
 
-	private static final String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
-	private static final String NAME = "WorldcatImporter";
-
-	private String WORLDCAT_READ_URL;
-	
-	public WorldcatImporter () {
-		//Used the same key as Worldcat fether
-		this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + WorldcatFetcher.API_KEY;
-	}
-
-	/**
-	 * Parse the reader to an xml document
-	 * @param s the reader to be parsed
-	 * @return XML document representing the content of s
-	 * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
-	 */
-	private Document parse (BufferedReader s) {
-		try { 
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
-			DocumentBuilder builder = factory.newDocumentBuilder ();
-
-			return builder.parse (new InputSource (s));
-		} catch (ParserConfigurationException e) {
-			throw new IllegalArgumentException ("Parser Config Exception: " + e.getMessage (), e);
-		} catch (SAXException e) {
-			throw new IllegalArgumentException ("SAX Exception: " + e.getMessage (), e);
-		} catch (IOException e) {
-			throw new IllegalArgumentException ("IO Exception: " + e.getMessage (), e);
-		}
-	}
-
-	/**
-	 * Get more information about a article through its OCLC id. Picks the first 
-	 * element with this tag
-	 * @param id the oclc id
-	 * @return the XML element that contains all tags
-	 */
-	private Element getSpecificInfoOnOCLC (String id) throws IOException {
-		URLDownload urlDownload = new URLDownload (WORLDCAT_READ_URL.replace ("{OCLC-NUMBER}", id));
-		URLDownload.bypassSSLVerification ();
-		String resp = urlDownload.asString ();	
-
-		Document mainDoc = parse (new BufferedReader (new StringReader (resp)));
-		NodeList parentElemOfTags = mainDoc.getElementsByTagName ("oclcdcs");
-
-		return (Element) parentElemOfTags.item (0);
-	}
-
-	@Override
-	public boolean isRecognizedFormat (BufferedReader input) throws IOException {
-		try {
-			Document doc = parse (input);
-			return doc.getElementsByTagName ("feed") != null;
-		} catch (IllegalArgumentException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Get the element of a tag in an XML element. Picks the first element
-	 * with this tag
-	 * @param xml the element do search trough
-	 * @param tag the tag to find
-	 * @return the tag element
-	 * @throws NullPointerException if there is no element by this tag
-	 */
-	private Element getElementByTag (Element xml, String tag) throws NullPointerException { 
-		NodeList nl = xml.getElementsByTagName (tag);
-		return (Element) nl.item (0);
-	}
-
-	/**
-	 * Parse the xml entry to a bib entry
-	 * @param xmlEntry the XML element from open search
-	 * @return the correspoinding bibentry
-	 * @throws IOException if we cannot search Worldcat with the OCLC of the entry
-	 */
-	private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException { 
-		Element authorsElem = getElementByTag (xmlEntry, "author");
-		String authors = getElementByTag (authorsElem, "name").getTextContent ();
-
-		String title = getElementByTag (xmlEntry, "title").getTextContent ();
-
-		String url = getElementByTag (xmlEntry, "link").getAttribute ("href");
-
-		String oclc = xmlEntry.getElementsByTagName ("oclcterms:recordIdentifier").item (0).getTextContent ();
-		Element detailedInfo = getSpecificInfoOnOCLC (oclc);
-
-		String date = detailedInfo.getElementsByTagName ("dc:date").item (0).getTextContent ();
-
-		String publisher = detailedInfo.getElementsByTagName ("dc:publisher").item (0).getTextContent ();
-
-		BibEntry entry = new BibEntry ();
-
-		entry.setField (StandardField.AUTHOR, authors);
-		entry.setField (StandardField.TITLE, title);
-		entry.setField (StandardField.URL, url);
-		entry.setField (StandardField.YEAR, date);
-		entry.setField (StandardField.JOURNAL, publisher);
-
-		return entry;
-	}
-
-	/**
-	 * Parse an XML documents with open search entries to a parserResult of 
-	 * the bibentries
-	 * @param doc the main XML document from open search
-	 * @return the ParserResult containing the BibEntries collection
-	 * @throws IOException if {@link xmlEntryToBibEntry} throws 
-	 */
-	private ParserResult docToParserRes (Document doc) throws IOException { 
-		Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
-		NodeList entryXMLList = feed.getElementsByTagName ("entry");
-
-		List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength ());
-		for (int i = 0; i < entryXMLList.getLength (); i++) {
-			Element xmlEntry = (Element) entryXMLList.item (i);
-			BibEntry bibEntry = xmlEntryToBibEntry (xmlEntry);
-			bibList.add (bibEntry);		
-		}
-
-		return new ParserResult (bibList);
-	}
-
-	@Override
-	public ParserResult importDatabase (BufferedReader input) throws IOException {
-		Document parsedDoc = parse (input);
-		return docToParserRes (parsedDoc);
-	}
-
-	@Override
-	public String getName () {
-		return NAME;
-	}
-
-	@Override
-	public FileType getFileType () {
-		return StandardFileType.XML;
-	}
-
-	@Override
-	public String getDescription () {
-		return DESCRIPTION;
-	}
+    private static final String DESCRIPTION = "Takes valid XML from Worldcat Open Search and parses them to BibEntry";
+    private static final String NAME = "WorldcatImporter";
+
+    private String WORLDCAT_READ_URL;
+    
+    public WorldcatImporter () {
+        //Used the same key as Worldcat fether
+        this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + WorldcatFetcher.API_KEY;
+    }
+
+    /**
+     * Parse the reader to an xml document
+     * @param s the reader to be parsed
+     * @return XML document representing the content of s
+     * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
+     */
+    private Document parse (BufferedReader s) {
+        try { 
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
+            DocumentBuilder builder = factory.newDocumentBuilder ();
+
+            return builder.parse (new InputSource (s));
+        } catch (ParserConfigurationException e) {
+            throw new IllegalArgumentException ("Parser Config Exception: " + e.getMessage (), e);
+        } catch (SAXException e) {
+            throw new IllegalArgumentException ("SAX Exception: " + e.getMessage (), e);
+        } catch (IOException e) {
+            throw new IllegalArgumentException ("IO Exception: " + e.getMessage (), e);
+        }
+    }
+
+    /**
+     * Get more information about a article through its OCLC id. Picks the first 
+     * element with this tag
+     * @param id the oclc id
+     * @return the XML element that contains all tags
+     */
+    private Element getSpecificInfoOnOCLC (String id) throws IOException {
+        URLDownload urlDownload = new URLDownload (WORLDCAT_READ_URL.replace ("{OCLC-NUMBER}", id));
+        URLDownload.bypassSSLVerification ();
+        String resp = urlDownload.asString ();	
+
+        Document mainDoc = parse (new BufferedReader (new StringReader (resp)));
+        NodeList parentElemOfTags = mainDoc.getElementsByTagName ("oclcdcs");
+
+        return (Element) parentElemOfTags.item (0);
+    }
+
+    @Override
+    public boolean isRecognizedFormat (BufferedReader input) throws IOException {
+        try {
+            Document doc = parse (input);
+            return doc.getElementsByTagName ("feed") != null;
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Get the element of a tag in an XML element. Picks the first element
+     * with this tag
+     * @param xml the element do search trough
+     * @param tag the tag to find
+     * @return the tag element
+     * @throws NullPointerException if there is no element by this tag
+     */
+    private Element getElementByTag (Element xml, String tag) throws NullPointerException { 
+        NodeList nl = xml.getElementsByTagName (tag);
+        return (Element) nl.item (0);
+    }
+
+    /**
+     * Parse the xml entry to a bib entry
+     * @param xmlEntry the XML element from open search
+     * @return the correspoinding bibentry
+     * @throws IOException if we cannot search Worldcat with the OCLC of the entry
+     */
+    private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException { 
+        Element authorsElem = getElementByTag (xmlEntry, "author");
+        String authors = getElementByTag (authorsElem, "name").getTextContent ();
+
+        String title = getElementByTag (xmlEntry, "title").getTextContent ();
+
+        String url = getElementByTag (xmlEntry, "link").getAttribute ("href");
+
+        String oclc = xmlEntry.getElementsByTagName ("oclcterms:recordIdentifier").item (0).getTextContent ();
+        Element detailedInfo = getSpecificInfoOnOCLC (oclc);
+
+        String date = detailedInfo.getElementsByTagName ("dc:date").item (0).getTextContent ();
+
+        String publisher = detailedInfo.getElementsByTagName ("dc:publisher").item (0).getTextContent ();
+
+        BibEntry entry = new BibEntry ();
+
+        entry.setField (StandardField.AUTHOR, authors);
+        entry.setField (StandardField.TITLE, title);
+        entry.setField (StandardField.URL, url);
+        entry.setField (StandardField.YEAR, date);
+        entry.setField (StandardField.JOURNAL, publisher);
+
+        return entry;
+    }
+
+    /**
+     * Parse an XML documents with open search entries to a parserResult of 
+     * the bibentries
+     * @param doc the main XML document from open search
+     * @return the ParserResult containing the BibEntries collection
+     * @throws IOException if {@link xmlEntryToBibEntry} throws 
+     */
+    private ParserResult docToParserRes (Document doc) throws IOException { 
+        Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
+        NodeList entryXMLList = feed.getElementsByTagName ("entry");
+
+        List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength ());
+        for (int i = 0; i < entryXMLList.getLength (); i++) {
+            Element xmlEntry = (Element) entryXMLList.item (i);
+            BibEntry bibEntry = xmlEntryToBibEntry (xmlEntry);
+            bibList.add (bibEntry);		
+        }
+
+        return new ParserResult (bibList);
+    }
+
+    @Override
+    public ParserResult importDatabase (BufferedReader input) throws IOException {
+        Document parsedDoc = parse (input);
+        return docToParserRes (parsedDoc);
+    }
+
+    @Override
+    public String getName () {
+        return NAME;
+    }
+
+    @Override
+    public FileType getFileType () {
+        return StandardFileType.XML;
+    }
+
+    @Override
+    public String getDescription () {
+        return DESCRIPTION;
+    }
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index cd2508d12f3..e48c34a5b8b 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -248,8 +248,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String CLEANUP = "CleanUp";
     public static final String CLEANUP_FORMATTERS = "CleanUpFormatters";
     public static final String IMPORT_FILENAMEPATTERN = "importFileNamePattern";
-	public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
-	public static final String IMPORT_API_WORLDCAT = "importAPIWorldcat";
+    public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
+    public static final String IMPORT_API_WORLDCAT = "importAPIWorldcat";
     public static final String NAME_FORMATTER_VALUE = "nameFormatterFormats";
     public static final String NAME_FORMATER_KEY = "nameFormatterNames";
     public static final String PUSH_TO_APPLICATION = "pushToApplication";
@@ -629,9 +629,9 @@ private JabRefPreferences() {
         // use BibTeX key appended with filename as default pattern
         defaults.put(IMPORT_FILENAMEPATTERN, ImportTabViewModel.DEFAULT_FILENAME_PATTERNS[1]);
         //Default empty String to be backwards compatible
-		defaults.put(IMPORT_FILEDIRPATTERN, "");
-		
-		defaults.put(IMPORT_API_WORLDCAT, "");
+        defaults.put(IMPORT_FILEDIRPATTERN, "");
+        
+        defaults.put(IMPORT_API_WORLDCAT, "");
 
         customImports = new CustomImportList(this);
 
@@ -779,9 +779,9 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getBoolean(DEFAULT_SHOW_SOURCE),
                 getBibtexKeyPatternPreferences(),
                 Globals.getKeyPrefs(),
-				getBoolean(AVOID_OVERWRITING_KEY),
-				getApiKeyPreferences());
-	}
+                getBoolean(AVOID_OVERWRITING_KEY),
+                getApiKeyPreferences());
+    }
 
     public Map<SidePaneType, Integer> getSidePanePreferredPositions() {
         Map<SidePaneType, Integer> preferredPositions = new HashMap<>();
@@ -817,7 +817,7 @@ public String getUser() {
     @Override
     public String getTheme() {
         return get(FX_THEME);
-	}
+    }
 
     /**
      * Get a Map of default tab names to deafult tab fields.
@@ -1290,11 +1290,11 @@ public FilePreferences getFilePreferences() {
                 getBoolean(JabRefPreferences.BIB_LOC_AS_PRIMARY_DIR),
                 get(IMPORT_FILENAMEPATTERN),
                 get(IMPORT_FILEDIRPATTERN));
-	}
-		
-	public APIKeyPreferences getApiKeyPreferences() {
-		return new APIKeyPreferences(get(IMPORT_API_WORLDCAT));
-	}
+    }
+        
+    public APIKeyPreferences getApiKeyPreferences() {
+        return new APIKeyPreferences(get(IMPORT_API_WORLDCAT));
+    }
 
     public FieldWriterPreferences getFieldWriterPreferences() {
         return new FieldWriterPreferences(
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index 6f025e2901d..c7612d64a99 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -21,15 +21,15 @@
 
 class WebFetchersTest {
 
-	private APIKeyPreferences apiKeyPreferences;
-	private ImportFormatPreferences importFormatPreferences;
-	
+    private APIKeyPreferences apiKeyPreferences;
+    private ImportFormatPreferences importFormatPreferences;
+    
     private ClassGraph classGraph = new ClassGraph().enableAllInfo().whitelistPackages("org.jabref");
 
     @BeforeEach
     void setUp() throws Exception {
-		importFormatPreferences = mock(ImportFormatPreferences.class);
-		apiKeyPreferences = mock(APIKeyPreferences.class);
+        importFormatPreferences = mock(ImportFormatPreferences.class);
+        apiKeyPreferences = mock(APIKeyPreferences.class);
     }
 
     @Test
@@ -64,7 +64,7 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throw
             Set<Class<?>> expected = controlClasses.loadClasses().stream().collect(Collectors.toSet());
 
             expected.remove(EntryBasedParserFetcher.class);
-			expected.remove(MrDLibFetcher.class);
+            expected.remove(MrDLibFetcher.class);
 
             assertEquals(expected, getClasses(idFetchers));
         }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index 6f2592f643f..449bbb88f31 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import org.jabref.logic.importer.APIKeyPreferences;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -18,37 +17,37 @@
 @FetcherTest
 public class WorldcatFetcherTest {
 
-	private WorldcatFetcher fetcher;
-
-	@BeforeEach
-	public void setUp() {
-		fetcher = new WorldcatFetcher(mock(APIKeyPreferences.class));
-	}
-
-	@Test
-	public void testPerformSearchForBadTitle() throws FetcherException {
-		BibEntry entry = new BibEntry();
-		//Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
-		entry.setField(StandardField.TITLE, "ASDhbsd fnm");
-		List<BibEntry> list = fetcher.performSearch(entry);
-		assertTrue(list.isEmpty());
-	}
-
-	@Test
-	public void testPerformSearchForExistingTitle() throws FetcherException {
-		BibEntry entry = new BibEntry();
-		//Example "The very best of Glenn Miller". Verified on same link as above
-		entry.setField(StandardField.TITLE, "The very best of Glenn");
-		List<BibEntry> list = fetcher.performSearch(entry);
-		assertFalse(list.isEmpty());
-	}
-
-	@Test
-	public void testPerformSearchForNullTitle() throws FetcherException {
-		BibEntry entry = new BibEntry();
-		entry.setField(StandardField.TITLE, null);
-		List<BibEntry> list = fetcher.performSearch(entry);
-		assertTrue(list.isEmpty());
-	}
+    private WorldcatFetcher fetcher;
+
+    @BeforeEach
+    public void setUp() {
+        fetcher = new WorldcatFetcher(mock(String.class));
+    }
+
+    @Test
+    public void testPerformSearchForBadTitle() throws FetcherException {
+        BibEntry entry = new BibEntry();
+        //Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
+        entry.setField(StandardField.TITLE, "ASDhbsd fnm");
+        List<BibEntry> list = fetcher.performSearch(entry);
+        assertTrue(list.isEmpty());
+    }
+
+    @Test
+    public void testPerformSearchForExistingTitle() throws FetcherException {
+        BibEntry entry = new BibEntry();
+        //Example "The very best of Glenn Miller". Verified on same link as above
+        entry.setField(StandardField.TITLE, "The very best of Glenn");
+        List<BibEntry> list = fetcher.performSearch(entry);
+        assertFalse(list.isEmpty());
+    }
+
+    @Test
+    public void testPerformSearchForNullTitle() throws FetcherException {
+        BibEntry entry = new BibEntry();
+        entry.setField(StandardField.TITLE, null);
+        List<BibEntry> list = fetcher.performSearch(entry);
+        assertTrue(list.isEmpty());
+    }
 
 }
\ No newline at end of file
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index 8dbe5c89409..70b1f71d377 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -19,27 +19,27 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class WorldcatImporterTest {
-	
-	WorldcatImporter importer;
+    
+    WorldcatImporter importer;
 
-	private String getFilePath(String filename) throws IOException {
-		Predicate<String> filePredicate = name -> {
-			return name.startsWith(filename) && name.endsWith(".xml");
-		};
-		Collection<String> paths = ImporterTestEngine.getTestFiles(filePredicate);
-		if (paths.size() > 1 || paths.size() == 0) {
-			throw new IllegalArgumentException("Filename returned 0 or more than 1 result: " + filename);
-		}
-		return paths.iterator().next();
-	}
+    private String getFilePath(String filename) throws IOException {
+        Predicate<String> filePredicate = name -> {
+            return name.startsWith(filename) && name.endsWith(".xml");
+        };
+        Collection<String> paths = ImporterTestEngine.getTestFiles(filePredicate);
+        if (paths.size() > 1 || paths.size() == 0) {
+            throw new IllegalArgumentException("Filename returned 0 or more than 1 result: " + filename);
+        }
+        return paths.iterator().next();
+    }
 
-	private String getFileContent(String filename) throws IOException {
-		String path = getFilePath(filename);
-		String content = Files.readString(getPath(path));
-		return content;
-	}
+    private String getFileContent(String filename) throws IOException {
+        String path = getFilePath(filename);
+        String content = Files.readString(getPath(path));
+        return content;
+    }
 
-	private static Path getPath(String fileName) throws IOException {
+    private static Path getPath(String fileName) throws IOException {
         try {
             return Paths.get(ImporterTestEngine.class.getResource(fileName).toURI());
         } catch (URISyntaxException e) {
@@ -47,42 +47,42 @@ private static Path getPath(String fileName) throws IOException {
         }
     }
 
-	@BeforeEach
-	public void setUp() {
-		importer = new WorldcatImporter();
-		
-	}
-	
-	@Test
-	public void withResultIsRecognizedFormat() throws IOException {
-		ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithResult"));
-	}
+    @BeforeEach
+    public void setUp() {
+        importer = new WorldcatImporter();
+        
+    }
+    
+    @Test
+    public void withResultIsRecognizedFormat() throws IOException {
+        ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithResult"));
+    }
 
-	@Test
-	public void withoutResultIsRecognizedFormat() throws IOException {
-		ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithoutResult"));
-	}
+    @Test
+    public void withoutResultIsRecognizedFormat() throws IOException {
+        ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithoutResult"));
+    }
 
-	@Test
-	public void badXMLIsNotRecognizedFormat() throws IOException {
-		boolean isReq = importer.isRecognizedFormat("Nah bruh");
-		assertFalse(isReq);
-	}
+    @Test
+    public void badXMLIsNotRecognizedFormat() throws IOException {
+        boolean isReq = importer.isRecognizedFormat("Nah bruh");
+        assertFalse(isReq);
+    }
 
-	@Disabled("Will not work without API key")
-	@Test
-	public void withResultReturnsNonEmptyResult() throws IOException {
-		String withResultXML = getFileContent("WorldcatImporterTestWithResult");
-		ParserResult res = importer.importDatabase(withResultXML);
-		assertTrue(res.getDatabase().getEntries().size() > 0);
-	}
+    @Disabled("Will not work without API key")
+    @Test
+    public void withResultReturnsNonEmptyResult() throws IOException {
+        String withResultXML = getFileContent("WorldcatImporterTestWithResult");
+        ParserResult res = importer.importDatabase(withResultXML);
+        assertTrue(res.getDatabase().getEntries().size() > 0);
+    }
 
-	@Disabled("Will not work without API key")
-	@Test
-	public void withoutResultReturnsEmptyResult() throws IOException {
-		String withoutResultXML = getFileContent("WorldcatImporterTestWithResult");
-		ParserResult res = importer.importDatabase(withoutResultXML);
-		assertEquals(0, res.getDatabase().getEntries().size());
-	}
+    @Disabled("Will not work without API key")
+    @Test
+    public void withoutResultReturnsEmptyResult() throws IOException {
+        String withoutResultXML = getFileContent("WorldcatImporterTestWithResult");
+        ParserResult res = importer.importDatabase(withoutResultXML);
+        assertEquals(0, res.getDatabase().getEntries().size());
+    }
 
 }
\ No newline at end of file

From 676f8e438d843a9711b124ccc7100d75acfc3d95 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 31 Mar 2020 23:18:05 +0200
Subject: [PATCH 17/48] Update to non-static

---
 .../jabref/logic/importer/fetcher/WorldcatFetcher.java   | 9 +++++----
 .../logic/importer/fileformat/WorldcatImporter.java      | 4 ++--
 .../logic/importer/fetcher/WorldcatFetcherTest.java      | 2 +-
 .../logic/importer/fileformat/WorldcatImporterTest.java  | 7 ++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 857c6ee390a..3695412596b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -23,13 +23,14 @@
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
-    public static String API_KEY;
+    private String API_KEY;
     private static final String NAME = "Worldcat Fetcher";
 
-    private static final String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=" + API_KEY;
+    private static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
 
     public WorldcatFetcher (String worldcatKey) {
-        API_KEY = worldcatKey;
+		this.API_KEY = worldcatKey;
+		WORLDCAT_OPEN_SEARCH_URL += API_KEY;
     }
 
     @Override
@@ -72,7 +73,7 @@ public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
         Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
         if (entryTitle.isPresent ()) {
             String xmlResponse = makeOpenSearchRequest (entryTitle.get ());
-            WorldcatImporter importer = new WorldcatImporter (); 
+            WorldcatImporter importer = new WorldcatImporter (this.API_KEY); 
             ParserResult parserResult;
             try { 
                 if (importer.isRecognizedFormat (xmlResponse)) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 116cb930dd6..59a364dc009 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -32,9 +32,9 @@ public class WorldcatImporter extends Importer {
 
     private String WORLDCAT_READ_URL;
     
-    public WorldcatImporter () {
+    public WorldcatImporter (String worldcatKey) {
         //Used the same key as Worldcat fether
-        this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + WorldcatFetcher.API_KEY;
+        this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + worldcatKey;
     }
 
     /**
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index 449bbb88f31..b7a2fe70514 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -21,7 +21,7 @@ public class WorldcatFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new WorldcatFetcher(mock(String.class));
+        fetcher = new WorldcatFetcher("API_KEY");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index 70b1f71d377..5221204e1a8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -17,6 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 
 public class WorldcatImporterTest {
     
@@ -49,18 +50,18 @@ private static Path getPath(String fileName) throws IOException {
 
     @BeforeEach
     public void setUp() {
-        importer = new WorldcatImporter();
+        importer = new WorldcatImporter("API_KEY");
         
     }
     
     @Test
     public void withResultIsRecognizedFormat() throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithResult"));
+        ImporterTestEngine.testIsRecognizedFormat(importer, getFilePath("WorldcatImporterTestWithResult"));
     }
 
     @Test
     public void withoutResultIsRecognizedFormat() throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new WorldcatImporter(), getFilePath("WorldcatImporterTestWithoutResult"));
+        ImporterTestEngine.testIsRecognizedFormat(importer, getFilePath("WorldcatImporterTestWithoutResult"));
     }
 
     @Test

From c6e2ea497703ac98bbe24ceb0f5cc503449b275a Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 13:04:17 +0200
Subject: [PATCH 18/48] Update
 src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java

Co-Authored-By: Christoph <cschwentker@gmail.com>
---
 .../org/jabref/logic/importer/fetcher/WorldcatFetcher.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 3695412596b..d9d3a28363d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -23,7 +23,7 @@
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
-    private String API_KEY;
+    private final String apiKey;
     private static final String NAME = "Worldcat Fetcher";
 
     private static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
@@ -93,4 +93,4 @@ public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
         }
     }
 
-}
\ No newline at end of file
+}

From c7ef5f28abdb4b3dd87cb1660b61acf8274c1d76 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 13:04:26 +0200
Subject: [PATCH 19/48] Update
 src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java

Co-Authored-By: Christoph <cschwentker@gmail.com>
---
 .../java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index d9d3a28363d..61cc8b5461b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -26,7 +26,7 @@ public class WorldcatFetcher implements EntryBasedFetcher {
     private final String apiKey;
     private static final String NAME = "Worldcat Fetcher";
 
-    private static String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
+    private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
 
     public WorldcatFetcher (String worldcatKey) {
 		this.API_KEY = worldcatKey;

From a6ed4e75b22826fb1589cdff0142f1e3cdfa4f53 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 13:04:37 +0200
Subject: [PATCH 20/48] Update
 src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java

Co-Authored-By: Christoph <cschwentker@gmail.com>
---
 .../java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 61cc8b5461b..d3ad6913236 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -24,7 +24,6 @@
 public class WorldcatFetcher implements EntryBasedFetcher {
 
     private final String apiKey;
-    private static final String NAME = "Worldcat Fetcher";
 
     private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
 

From b8b91a471da9e9f3c7ad5d103e8f4aa510c174d6 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 13:04:48 +0200
Subject: [PATCH 21/48] Update
 src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java

Co-Authored-By: Christoph <cschwentker@gmail.com>
---
 .../java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index d3ad6913236..b025753372d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -34,7 +34,7 @@ public WorldcatFetcher (String worldcatKey) {
 
     @Override
     public String getName () {
-        return NAME;
+        return "Worldcat Fetcher";
     }
 
     /**

From f9fd6b7673cfed6ee23e5425bb43c99149ec3e8b Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 13:16:56 +0200
Subject: [PATCH 22/48] Change name of apiKey

---
 .../org/jabref/logic/importer/fetcher/WorldcatFetcher.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index b025753372d..302dc5c21d8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -28,8 +28,8 @@ public class WorldcatFetcher implements EntryBasedFetcher {
     private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
 
     public WorldcatFetcher (String worldcatKey) {
-		this.API_KEY = worldcatKey;
-		WORLDCAT_OPEN_SEARCH_URL += API_KEY;
+		this.apiKey = worldcatKey;
+		WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
     }
 
     @Override
@@ -72,7 +72,7 @@ public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
         Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
         if (entryTitle.isPresent ()) {
             String xmlResponse = makeOpenSearchRequest (entryTitle.get ());
-            WorldcatImporter importer = new WorldcatImporter (this.API_KEY); 
+            WorldcatImporter importer = new WorldcatImporter (this.apiKey); 
             ParserResult parserResult;
             try { 
                 if (importer.isRecognizedFormat (xmlResponse)) {

From ca3fd6e650413b1e91193daf9e45885f0b520673 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 13:25:38 +0200
Subject: [PATCH 23/48] Fix checkstyle

---
 .../org/jabref/logic/importer/fileformat/WorldcatImporter.java   | 1 -
 .../org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java   | 1 -
 .../jabref/logic/importer/fileformat/WorldcatImporterTest.java   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 59a364dc009..d27a0938987 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -12,7 +12,6 @@
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fetcher.WorldcatFetcher;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.StandardFileType;
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index b7a2fe70514..8b0666cf14b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -12,7 +12,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
 
 @FetcherTest
 public class WorldcatFetcherTest {
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index 5221204e1a8..2dc62041ec8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -17,7 +17,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
 
 public class WorldcatImporterTest {
     

From 8056dec57825ae7a9be1d32c28d408c2138c78ad Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Wed, 1 Apr 2020 14:30:25 +0200
Subject: [PATCH 24/48] Fix changelog duplicate

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8412d2b6fb9..ca577132967 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added a WorldCcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [WorldCat](http://www.worldcat.org/webservices/catalog/)
 - We reimplemented and improved the dialog "Customize entry types". [#4719](https://github.com/JabRef/jabref/issues/4719)
 - We added an [American Physical Society](https://journals.aps.org/) fetcher. [#818](https://github.com/JabRef/jabref/issues/818)
-- We reimplemented and improved the dialog "Customize entry types" [#4719](https://github.com/JabRef/jabref/issues/4719)
 - We added an Worldcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [Worldcat](http://www.worldcat.org/webservices/catalog/)
 
 ### Fixed

From c1ed7cdd9544ee144f23ceb2e540ee215f769317 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 7 Apr 2020 14:24:31 +0200
Subject: [PATCH 25/48] Parse XML in fetcher and send new XML to importer

---
 .../importer/fetcher/WorldcatFetcher.java     | 136 +++++++++++++++++-
 .../importer/fileformat/WorldcatImporter.java |  49 ++-----
 .../fileformat/WorldcatImporterTest.java      |   2 +-
 3 files changed, 142 insertions(+), 45 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 302dc5c21d8..d674882e3e5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -1,12 +1,25 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
@@ -15,6 +28,11 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 
 /**
  * EntryBasedFetcher that searches the Worldcat database
@@ -26,10 +44,13 @@ public class WorldcatFetcher implements EntryBasedFetcher {
     private final String apiKey;
 
     private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
+    private String WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
+   
 
     public WorldcatFetcher (String worldcatKey) {
-		this.apiKey = worldcatKey;
-		WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
+        this.apiKey = worldcatKey;
+        WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
+        WORLDCAT_READ_URL += worldcatKey;
     }
 
     @Override
@@ -67,16 +88,119 @@ private String makeOpenSearchRequest (String title) throws FetcherException {
         } 
     }
 
+     /**
+     * Get more information about a article through its OCLC id. Picks the first 
+     * element with this tag
+     * @param id the oclc id
+     * @return the XML element that contains all tags
+     */
+    private Element getSpecificInfoOnOCLC (String id) throws IOException {
+        URLDownload urlDownload = new URLDownload (WORLDCAT_READ_URL.replace ("{OCLC-NUMBER}", id));
+        URLDownload.bypassSSLVerification ();
+        String resp = urlDownload.asString ();	
+
+        Document mainDoc = parse (resp);
+        NodeList parentElemOfTags = mainDoc.getElementsByTagName ("oclcdcs");
+
+        return (Element) parentElemOfTags.item (0);
+    }
+    
+     /**
+     * Parse a string to an xml document
+     * @param s the string to be parsed
+     * @return XML document representing the content of s
+     * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
+     */
+    private Document parse (String s) {
+        try { 
+            BufferedReader r = new BufferedReader (new StringReader(s));
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
+            DocumentBuilder builder = factory.newDocumentBuilder ();
+
+            return builder.parse (new InputSource (r));
+        } catch (ParserConfigurationException e) {
+            throw new IllegalArgumentException ("Parser Config Exception: " + e.getMessage (), e);
+        } catch (SAXException e) {
+            throw new IllegalArgumentException ("SAX Exception: " + e.getMessage (), e);
+        } catch (IOException e) {
+            throw new IllegalArgumentException ("IO Exception: " + e.getMessage (), e);
+        }
+    }
+    
+    /**
+     * Parse OpenSearch XML to retrieve OCLC-ids and fetch details about those. 
+     * Returns new XML doc in the form
+     * <pre>
+     * {@literal <entries>}
+     *      {@literal <entry>}
+     *          OCLC DETAIL
+     *      {@literal </entry>}
+     *      ...
+     * {@literal </entries>}
+     * </pre>
+     * @param doc the open search result
+     * @return  the new xml document
+     * @throws FetcherException
+     */
+    private Document parseOpenSearchXML(Document doc) throws FetcherException{
+        try {
+            Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
+            NodeList entryXMLList = feed.getElementsByTagName ("entry");
+
+            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance ();
+            DocumentBuilder docBuilder = docFactory.newDocumentBuilder ();
+            
+            Document newDoc = docBuilder.newDocument ();
+
+            Element root = newDoc.createElement ("entries");
+            newDoc.appendChild (root);
+            for (int i = 0; i < entryXMLList.getLength (); i++) {
+                Element xmlEntry = (Element) entryXMLList.item (i);
+                
+                String oclc = xmlEntry.getElementsByTagName ("oclcterms:recordIdentifier").item (0).getTextContent ();
+                Element detailedInfo = getSpecificInfoOnOCLC (oclc);
+
+                Element newEntry = newDoc.createElement ("entry");
+                newEntry.appendChild (detailedInfo);
+
+                root.appendChild (newEntry);
+            }
+            return newDoc;
+        } catch(ParserConfigurationException e) {
+            throw new FetcherException("Error with XML creation (Worldcat fetcher)", e);
+        } catch (IOException e) {
+            throw new FetcherException("Error with OCLC parsing (Worldcat fetcher)", e);
+        }
+    }
+
     @Override
     public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
         Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
         if (entryTitle.isPresent ()) {
-            String xmlResponse = makeOpenSearchRequest (entryTitle.get ());
-            WorldcatImporter importer = new WorldcatImporter (this.apiKey); 
+            String openSearchXMLResponse = makeOpenSearchRequest (entryTitle.get ());
+            Document openSearchDocument = parse (openSearchXMLResponse);
+
+            Document detailedXML = parseOpenSearchXML (openSearchDocument);
+            String detailedXMLString;
+            try {
+                //Transform XML to String
+                TransformerFactory tf = TransformerFactory.newInstance ();
+                Transformer t = tf.newTransformer ();
+                StringWriter sw = new StringWriter ();
+                t.transform(new DOMSource (detailedXML), new StreamResult (sw));
+                detailedXMLString = sw.toString ();
+            } catch (TransformerException e) {
+                throw new FetcherException ("Could not transform XML", e);
+            }
+
+            //TODO: - Send xml as string to Importer
+            //      - Parse the new kind of XML in importer
+
+            WorldcatImporter importer = new WorldcatImporter (); 
             ParserResult parserResult;
             try { 
-                if (importer.isRecognizedFormat (xmlResponse)) {
-                    parserResult = importer.importDatabase (xmlResponse);
+                if (importer.isRecognizedFormat (detailedXMLString)) {
+                    parserResult = importer.importDatabase (detailedXMLString);
                 } else { 
                     // For displaying An ErrorMessage
                     BibDatabase errorBibDataBase = new BibDatabase ();
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index d27a0938987..3e5aaf36118 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -29,13 +29,6 @@ public class WorldcatImporter extends Importer {
     private static final String DESCRIPTION = "Importer for Worldcat Open Search XML format";
     private static final String NAME = "WorldcatImporter";
 
-    private String WORLDCAT_READ_URL;
-    
-    public WorldcatImporter (String worldcatKey) {
-        //Used the same key as Worldcat fether
-        this.WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=" + worldcatKey;
-    }
-
     /**
      * Parse the reader to an xml document
      * @param s the reader to be parsed
@@ -49,31 +42,14 @@ private Document parse (BufferedReader s) {
 
             return builder.parse (new InputSource (s));
         } catch (ParserConfigurationException e) {
-            throw new IllegalArgumentException ("Parser Config Exception: " + e.getMessage (), e);
+            throw new IllegalArgumentException ("Parser Config Exception: ", e);
         } catch (SAXException e) {
-            throw new IllegalArgumentException ("SAX Exception: " + e.getMessage (), e);
+            throw new IllegalArgumentException ("SAX Exception: ", e);
         } catch (IOException e) {
-            throw new IllegalArgumentException ("IO Exception: " + e.getMessage (), e);
+            throw new IllegalArgumentException ("IO Exception: ", e);
         }
     }
 
-    /**
-     * Get more information about a article through its OCLC id. Picks the first 
-     * element with this tag
-     * @param id the oclc id
-     * @return the XML element that contains all tags
-     */
-    private Element getSpecificInfoOnOCLC (String id) throws IOException {
-        URLDownload urlDownload = new URLDownload (WORLDCAT_READ_URL.replace ("{OCLC-NUMBER}", id));
-        URLDownload.bypassSSLVerification ();
-        String resp = urlDownload.asString ();	
-
-        Document mainDoc = parse (new BufferedReader (new StringReader (resp)));
-        NodeList parentElemOfTags = mainDoc.getElementsByTagName ("oclcdcs");
-
-        return (Element) parentElemOfTags.item (0);
-    }
-
     @Override
     public boolean isRecognizedFormat (BufferedReader input) throws IOException {
         try {
@@ -104,19 +80,16 @@ private Element getElementByTag (Element xml, String tag) throws NullPointerExce
      * @throws IOException if we cannot search Worldcat with the OCLC of the entry
      */
     private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException { 
-        Element authorsElem = getElementByTag (xmlEntry, "author");
-        String authors = getElementByTag (authorsElem, "name").getTextContent ();
-
-        String title = getElementByTag (xmlEntry, "title").getTextContent ();
-
-        String url = getElementByTag (xmlEntry, "link").getAttribute ("href");
+        String authors = getElementByTag (xmlEntry, "dc:creator").getTextContent ();
 
-        String oclc = xmlEntry.getElementsByTagName ("oclcterms:recordIdentifier").item (0).getTextContent ();
-        Element detailedInfo = getSpecificInfoOnOCLC (oclc);
+        String title = getElementByTag (xmlEntry, "dc:title").getTextContent ();
 
-        String date = detailedInfo.getElementsByTagName ("dc:date").item (0).getTextContent ();
+		String oclcNr = getElementByTag (xmlEntry, "oclcterms:recordIdentifie").getTextContent();
+		String url = "http://worldcat.org/oclc/" + oclcNr;
+		
+        String date = getElementByTag (xmlEntry, "dc:date").getTextContent ();
 
-        String publisher = detailedInfo.getElementsByTagName ("dc:publisher").item (0).getTextContent ();
+        String publisher =  getElementByTag (xmlEntry, "dc:publisher").getTextContent ();
 
         BibEntry entry = new BibEntry ();
 
@@ -137,7 +110,7 @@ private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException {
      * @throws IOException if {@link xmlEntryToBibEntry} throws 
      */
     private ParserResult docToParserRes (Document doc) throws IOException { 
-        Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
+        Element feed = (Element) doc.getElementsByTagName ("entries").item (0);
         NodeList entryXMLList = feed.getElementsByTagName ("entry");
 
         List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength ());
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index 2dc62041ec8..e193a353bbb 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -49,7 +49,7 @@ private static Path getPath(String fileName) throws IOException {
 
     @BeforeEach
     public void setUp() {
-        importer = new WorldcatImporter("API_KEY");
+        importer = new WorldcatImporter();
         
     }
     

From a8cb706e76a84933abe3d055735506f57f66130c Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 7 Apr 2020 14:42:04 +0200
Subject: [PATCH 26/48] Change test-xml for importer

---
 .../WorldcatImporterTestWithResult.xml        | 157 +++++-------------
 .../WorldcatImporterTestWithoutResult.xml     |   4 +-
 2 files changed, 40 insertions(+), 121 deletions(-)

diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
index d9a3f926db5..d837a784d48 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
@@ -1,119 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:diag="http://www.loc.gov/zing/srw/diagnostic/" xmlns:oclcterms="http://purl.org/oclc/terms/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-   <title>OCLC Worldcat Search: srw.ti all "The very best of Glenn"</title>
-   <id>http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}</id>
-   <updated>2020-02-25T06:16:25-05:00</updated>
-   <subtitle>Search results for srw.ti all "The very best of Glenn" at http://worldcat.org/webservices/catalog</subtitle>
-   <opensearch:totalResults>89</opensearch:totalResults>
-   <opensearch:startIndex>1</opensearch:startIndex>
-   <opensearch:itemsPerPage>10</opensearch:itemsPerPage>
-   <opensearch:Query role="request" searchTerms="srw.ti all &quot;The very best of Glenn&quot;" startPage="1" />
-   <link rel="alternate" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;wskey={built-in-api-key}" type="text/html" />
-   <link rel="self" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
-   <link rel="first" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=1&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
-   <link rel="next" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=11&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
-   <link rel="last" href="http://worldcat.org/webservices/catalog/search/worldcat/opensearch?q=srw.ti+all+%22The+very+best+of+Glenn%22&amp;start=89&amp;count=10&amp;format=atom&amp;wskey={built-in-api-key}" type="application/atom+xml" />
-   <link rel="search" type="application/opensearchdescription+xml" href="http://worldcat.org/webservices/catalog/opensearch.description.xml" />
-   <entry>
-      <author>
-         <name>Miller, Glenn.</name>
-      </author>
-      <title>The very best of Glenn Miller</title>
-      <link href="http://worldcat.org/oclc/754508587" />
-      <id>http://worldcat.org/oclc/754508587</id>
-      <updated>2017-06-29T19:46:28Z</updated>
-      <summary>Remastered versions of Glenn Miller's original recordings which bring a freshness to his beloved classics. The album also features a version of 'In the mood' with Jodie Prenger, winner of the BBC's 'I'll do anything'.</summary>
-      <oclcterms:recordIdentifier>754508587</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Brennan, Walter, 1894-1974.</name>
-      </author>
-      <title>The very best of Walter Brennan.</title>
-      <link href="http://worldcat.org/oclc/17009787" />
-      <id>http://worldcat.org/oclc/17009787</id>
-      <updated>2018-07-02T10:57:48Z</updated>
-      <dc:identifier>urn:LCCN:95789751</dc:identifier>
-      <oclcterms:recordIdentifier>17009787</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Frey, Glenn, composer, performer.</name>
-      </author>
-      <title>Above the clouds : the very best of Glenn Frey</title>
-      <link href="http://worldcat.org/oclc/1040990604" />
-      <id>http://worldcat.org/oclc/1040990604</id>
-      <updated>2019-05-06T02:09:58Z</updated>
-      <oclcterms:recordIdentifier>1040990604</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Miller, Glenn, 1954- performer.</name>
-      </author>
-      <title>The very best of Glenn Miller.</title>
-      <link href="http://worldcat.org/oclc/1140416403" />
-      <id>http://worldcat.org/oclc/1140416403</id>
-      <updated>2020-02-13T17:01:04Z</updated>
-      <oclcterms:recordIdentifier>1140416403</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Miller, Glenn.</name>
-      </author>
-      <title>Very Best of Glenn Miller.</title>
-      <link href="http://worldcat.org/oclc/630547816" />
-      <id>http://worldcat.org/oclc/630547816</id>
-      <updated>2018-11-28T18:44:17Z</updated>
-      <oclcterms:recordIdentifier>630547816</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Yarbrough, Glenn.</name>
-      </author>
-      <title>Glenn yarbrough - his very best</title>
-      <link href="http://worldcat.org/oclc/1098394025" />
-      <id>http://worldcat.org/oclc/1098394025</id>
-      <updated>2019-04-25T11:56:52Z</updated>
-      <oclcterms:recordIdentifier>1098394025</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Miller, Glenn.</name>
-      </author>
-      <title>The very best of Glenn Miller : hits &amp; rarities</title>
-      <link href="http://worldcat.org/oclc/809462816" />
-      <id>http://worldcat.org/oclc/809462816</id>
-      <updated>2020-01-23T10:02:43Z</updated>
-      <oclcterms:recordIdentifier>809462816</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Miller, Glenn, 1904-1944, performer.</name>
-      </author>
-      <title>The very best of Glenn Miller &amp; his orchestra.</title>
-      <link href="http://worldcat.org/oclc/1123215070" />
-      <id>http://worldcat.org/oclc/1123215070</id>
-      <updated>2019-11-07T01:19:22Z</updated>
-      <oclcterms:recordIdentifier>1123215070</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Miller, Glenn, 1904-1944.</name>
-      </author>
-      <title>The very best of Glenn Miller : in the mood.</title>
-      <link href="http://worldcat.org/oclc/55688833" />
-      <id>http://worldcat.org/oclc/55688833</id>
-      <updated>2016-11-17T00:02:35Z</updated>
-      <oclcterms:recordIdentifier>55688833</oclcterms:recordIdentifier>
-   </entry>
-   <entry>
-      <author>
-         <name>Miller, Glenn.</name>
-      </author>
-      <title>Glenn Miller story : the very best of</title>
-      <link href="http://worldcat.org/oclc/421718747" />
-      <id>http://worldcat.org/oclc/421718747</id>
-      <updated>2018-10-08T09:50:51Z</updated>
-      <oclcterms:recordIdentifier>421718747</oclcterms:recordIdentifier>
-   </entry>
-</feed>
\ No newline at end of file
+<entries>
+    <entry>
+        <dc:date>1994</dc:date>
+        <dc:description>Reading between the texts : Benjamin Thomas's Abraham Lincoln and Stephen Oates's With malice towards none / Robert Bray--"A horse chestnut is not a chestnut horse" : a refutation of Bray, Davis, MacGregor, and Wollan--Stephen B. Oates.</dc:description>
+        <dc:format>2 volumes ; 23 cm.</dc:format>
+        <dc:language xsi:type="http://purl.org/dc/terms/ISO639-2">eng</dc:language>
+        <dc:publisher>McFarland</dc:publisher>
+        <dc:relation>Bray, Robert. Reading between the texts : Benjamin Thomas's Abraham Lincoln and Stephen Oates's With malice toward none.</dc:relation>
+        <dc:relation>Oates, Stephen B. Horse chestnut is not a chestnut horse : a refutation of Bray, Davis, MacGregor, and Wollan.</dc:relation>
+        <dc:relation>Journal of information ethics, v. 3 no. 1-2</dc:relation>
+        <dc:subject xsi:type="http://purl.org/dc/terms/LCSH">Oates, Stephen B. With malice toward none.</dc:subject>
+        <dc:subject xsi:type="http://purl.org/dc/terms/LCSH">Thomas, Benjamin Platt, 1902-1956. Abraham Lincoln.</dc:subject>
+        <dc:subject xsi:type="http://purl.org/dc/terms/LCSH">Plagiarism--United States.</dc:subject>
+        <dc:title>Plagiarism.</dc:title>
+        <dc:type>Text</dc:type>
+        <oclcterms:recordCreationDate xsi:type="http://purl.org/oclc/terms/marc008date">950303</oclcterms:recordCreationDate>
+        <oclcterms:recordIdentifier>32079910</oclcterms:recordIdentifier>
+    </entry>
+    <entry>
+        <dc:contributor>Virgin records international.</dc:contributor>
+        <dc:contributor>Virgin France.</dc:contributor>
+        <dc:contributor>Virgin Schallplatten Gmbh.</dc:contributor>
+        <dc:creator>Sparks.</dc:creator>
+        <dc:date>1997 (P)</dc:date>
+        <dc:description>Texte des chansons.</dc:description>
+        <dc:description>Munchen 40 : prod. Virgin Schallplatten GmbH, P 1997.</dc:description>
+        <dc:description>Notice en anglais / Keaton-Welles, Amelia.</dc:description>
+        <dc:format>1 disque compact + 1 brochure ([20] p.) : ill. en coul. ; 12 cm</dc:format>
+        <dc:language xsi:type="http://purl.org/dc/terms/ISO639-2">eng</dc:language>
+        <dc:publisher>Virgin records international </dc:publisher>
+        <dc:publisher>Distrib. Virgin France</dc:publisher>
+        <dc:relation xsi:type="http://purl.org/dc/terms/URI">http://catalogue.bnf.fr/ark:/12148/cb383781119</dc:relation>
+        <dc:title>Plagiarism</dc:title>
+        <dc:type>Sound</dc:type>
+        <oclcterms:recordCreationDate xsi:type="http://purl.org/oclc/terms/marc008date">971008</oclcterms:recordCreationDate>
+        <oclcterms:recordIdentifier>659047837</oclcterms:recordIdentifier>
+    </entry>
+</entries>
\ No newline at end of file
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
index 56106ec2148..b4f32714baf 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:diag="http://www.loc.gov/zing/srw/diagnostic/" xmlns:oclcterms="http://purl.org/oclc/terms/" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" />
\ No newline at end of file
+<entries>
+</entries>
\ No newline at end of file

From 55631701af56bc3427d2efc2cb4d2f503082991a Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 7 Apr 2020 14:47:35 +0200
Subject: [PATCH 27/48] Fix checkstyle

---
 .../jabref/logic/importer/fetcher/WorldcatFetcher.java   | 9 +++------
 .../logic/importer/fileformat/WorldcatImporter.java      | 8 +++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index d674882e3e5..84542501f3c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -1,6 +1,5 @@
 package org.jabref.logic.importer.fetcher;
 
-import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -28,6 +27,7 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -41,14 +41,11 @@
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
-    private final String apiKey;
-
     private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
     private String WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
    
 
     public WorldcatFetcher (String worldcatKey) {
-        this.apiKey = worldcatKey;
         WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
         WORLDCAT_READ_URL += worldcatKey;
     }
@@ -142,7 +139,7 @@ private Document parse (String s) {
      * @return  the new xml document
      * @throws FetcherException
      */
-    private Document parseOpenSearchXML(Document doc) throws FetcherException{
+    private Document parseOpenSearchXML(Document doc) throws FetcherException {
         try {
             Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
             NodeList entryXMLList = feed.getElementsByTagName ("entry");
@@ -166,7 +163,7 @@ private Document parseOpenSearchXML(Document doc) throws FetcherException{
                 root.appendChild (newEntry);
             }
             return newDoc;
-        } catch(ParserConfigurationException e) {
+        } catch (ParserConfigurationException e) {
             throw new FetcherException("Error with XML creation (Worldcat fetcher)", e);
         } catch (IOException e) {
             throw new FetcherException("Error with OCLC parsing (Worldcat fetcher)", e);
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 3e5aaf36118..5225f662876 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -2,7 +2,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,7 +11,6 @@
 
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
@@ -84,9 +82,9 @@ private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException {
 
         String title = getElementByTag (xmlEntry, "dc:title").getTextContent ();
 
-		String oclcNr = getElementByTag (xmlEntry, "oclcterms:recordIdentifie").getTextContent();
-		String url = "http://worldcat.org/oclc/" + oclcNr;
-		
+        String oclcNr = getElementByTag (xmlEntry, "oclcterms:recordIdentifie").getTextContent ();
+        String url = "http://worldcat.org/oclc/" + oclcNr;
+        
         String date = getElementByTag (xmlEntry, "dc:date").getTextContent ();
 
         String publisher =  getElementByTag (xmlEntry, "dc:publisher").getTextContent ();

From 40f7f16558fcc2342b1af93a038c6102c61ca330 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 7 Apr 2020 16:00:03 +0200
Subject: [PATCH 28/48] Fix duplication in CHANGELOG

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7caf967038..899506f9128 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added a WorldCcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [WorldCat](http://www.worldcat.org/webservices/catalog/)
 - We reimplemented and improved the dialog "Customize entry types". [#4719](https://github.com/JabRef/jabref/issues/4719)
 - We added an [American Physical Society](https://journals.aps.org/) fetcher. [#818](https://github.com/JabRef/jabref/issues/818)
-- We added an Worldcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [Worldcat](http://www.worldcat.org/webservices/catalog/)
 - We added possibility to enable/disable items quantity in groups. [#6042](https://github.com/JabRef/jabref/issues/6042)
 
 ### Fixed

From 6725481404c3687319b0a924f68d7e413d35b855 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Tue, 7 Apr 2020 16:04:06 +0200
Subject: [PATCH 29/48] Wrapp bufferedReader and Stringwriter, and remove TODO
 comment

---
 .../logic/importer/fetcher/WorldcatFetcher.java      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 84542501f3c..76feda2df28 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -44,7 +44,6 @@ public class WorldcatFetcher implements EntryBasedFetcher {
     private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
     private String WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
    
-
     public WorldcatFetcher (String worldcatKey) {
         WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
         WORLDCAT_READ_URL += worldcatKey;
@@ -109,8 +108,7 @@ private Element getSpecificInfoOnOCLC (String id) throws IOException {
      * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
      */
     private Document parse (String s) {
-        try { 
-            BufferedReader r = new BufferedReader (new StringReader(s));
+        try (BufferedReader r = new BufferedReader (new StringReader(s))){ 
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
             DocumentBuilder builder = factory.newDocumentBuilder ();
 
@@ -179,20 +177,18 @@ public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
 
             Document detailedXML = parseOpenSearchXML (openSearchDocument);
             String detailedXMLString;
-            try {
+            try (StringWriter sw = new StringWriter ()){
                 //Transform XML to String
                 TransformerFactory tf = TransformerFactory.newInstance ();
                 Transformer t = tf.newTransformer ();
-                StringWriter sw = new StringWriter ();
                 t.transform(new DOMSource (detailedXML), new StreamResult (sw));
                 detailedXMLString = sw.toString ();
             } catch (TransformerException e) {
                 throw new FetcherException ("Could not transform XML", e);
+            } catch (IOException e) {
+                throw new FetcherException("Could not close StringWriter", e);
             }
 
-            //TODO: - Send xml as string to Importer
-            //      - Parse the new kind of XML in importer
-
             WorldcatImporter importer = new WorldcatImporter (); 
             ParserResult parserResult;
             try { 

From 0e73f6423605630ed724ce25b305efd8d5de0b41 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Fri, 10 Apr 2020 20:31:33 +0200
Subject: [PATCH 30/48] Add descritpion to preferences

Rename from "pattern"
---
 src/main/java/org/jabref/gui/preferences/ImportTab.fxml   | 5 ++++-
 .../java/org/jabref/gui/preferences/ImportTabView.java    | 2 +-
 .../org/jabref/gui/preferences/ImportTabViewModel.java    | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
index 81395f1769e..29d27cd1e5e 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
@@ -42,7 +42,10 @@
             <RowConstraints vgrow="SOMETIMES"/>
             <RowConstraints vgrow="SOMETIMES"/>
         </rowConstraints>
-        <Label text="%Worldcat Fetcher Key" GridPane.rowIndex="1"/>
+        <Label text="%Worldcat" GridPane.rowIndex="1"/>
+		<Label fx:id="worldcatDescription"
+           text="%You can request a link at this link: https://platform.worldcat.org/wskey"
+           textOverrun="CLIP" wrapText="true"/>
         <TextField fx:id="worldcatKey" GridPane.columnIndex="1" GridPane.rowIndex="1"
                    prefWidth="300" minWidth="300" maxWidth="300"/>
     </GridPane>
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabView.java b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
index 566987970af..433ea3c4e1f 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
@@ -31,7 +31,7 @@ public void initialize () {
         fileNamePattern.itemsProperty().bind(viewModel.defaultFileNamePatternsProperty());
         fileDirPattern.textProperty().bindBidirectional(viewModel.fileDirPatternProperty());
         
-        worldcatKey.textProperty().bindBidirectional(viewModel.apiKeyPatternProperty());
+        worldcatKey.textProperty().bindBidirectional(viewModel.apiKeyProperty());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
index df50d8e2623..e84e3f2ae04 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
@@ -20,7 +20,7 @@ public class ImportTabViewModel implements PreferenceTabViewModel {
     private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
     private final StringProperty fileDirPatternProperty = new SimpleStringProperty();
 
-    private final StringProperty apiKeyPatternProperty = new SimpleStringProperty();
+    private final StringProperty apiKeyProperty = new SimpleStringProperty();
 
     private final DialogService dialogService;
     private final JabRefPreferences preferences;
@@ -34,14 +34,14 @@ public ImportTabViewModel(DialogService dialogService, JabRefPreferences prefere
     public void setValues() {
         fileNamePatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILENAMEPATTERN));
         fileDirPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_FILEDIRPATTERN));
-        apiKeyPatternProperty.setValue(preferences.get(JabRefPreferences.IMPORT_API_WORLDCAT));
+        apiKeyProperty.setValue(preferences.get(JabRefPreferences.IMPORT_API_WORLDCAT));
     }
 
     @Override
     public void storeSettings() {
         preferences.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, fileNamePatternProperty.getValue());
         preferences.put(JabRefPreferences.IMPORT_FILEDIRPATTERN, fileDirPatternProperty.getValue());
-        preferences.put(JabRefPreferences.IMPORT_API_WORLDCAT, apiKeyPatternProperty.getValue());
+        preferences.put(JabRefPreferences.IMPORT_API_WORLDCAT, apiKeyProperty.getValue());
     }
 
     @Override
@@ -60,5 +60,5 @@ public List<String> getRestartWarnings() {
 
     public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
     
-    public StringProperty apiKeyPatternProperty() { return apiKeyPatternProperty; }
+    public StringProperty apiKeyProperty() { return apiKeyProperty; }
 }

From 434a00e2df3c0583cd87f7876f2646d55c9e3a7c Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Fri, 10 Apr 2020 20:42:53 +0200
Subject: [PATCH 31/48] Fix traling spaces

---
 .../importer/fetcher/WorldcatFetcher.java     | 118 +++++++++---------
 .../importer/fileformat/WorldcatImporter.java |  82 ++++++------
 .../importer/fetcher/WorldcatFetcherTest.java |   2 +-
 3 files changed, 101 insertions(+), 101 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 76feda2df28..714711c7a24 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -44,13 +44,13 @@ public class WorldcatFetcher implements EntryBasedFetcher {
     private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
     private String WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
    
-    public WorldcatFetcher (String worldcatKey) {
+    public WorldcatFetcher(String worldcatKey) {
         WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
         WORLDCAT_READ_URL += worldcatKey;
     }
 
     @Override
-    public String getName () {
+    public String getName() {
         return "Worldcat Fetcher";
     }
 
@@ -59,10 +59,10 @@ public String getName () {
      * @param title the title to include in the query
      * @return the earch query for the api
      */
-    private String getOpenSearchURL (String title) throws MalformedURLException { 
+    private String getOpenSearchURL(String title) throws MalformedURLException { 
         String query = "&q=srw.ti+all+\"" + title + "\"";
-        URL url = new URL (WORLDCAT_OPEN_SEARCH_URL + query);
-        return url.toString ();
+        URL url = new URL(WORLDCAT_OPEN_SEARCH_URL + query);
+        return url.toString();
     }
 
     /**
@@ -70,17 +70,17 @@ private String getOpenSearchURL (String title) throws MalformedURLException {
      * @param title the title of the search
      * @return the body of the HTTP response
      */
-    private String makeOpenSearchRequest (String title) throws FetcherException { 
+    private String makeOpenSearchRequest(String title) throws FetcherException {
         try {
-            URLDownload urlDownload = new URLDownload (getOpenSearchURL (title));
-            URLDownload.bypassSSLVerification ();
-            String resp = urlDownload.asString ();
+            URLDownload urlDownload = new URLDownload(getOpenSearchURL(title));
+            URLDownload.bypassSSLVerification();
+            String resp = urlDownload.asString();
 
             return resp;
         } catch (MalformedURLException e) {
-            throw new FetcherException ("Bad url", e);
+            throw new FetcherException("Bad url", e);
         } catch (IOException e) {
-            throw new FetcherException ("Error with Open Search Request (Worldcat)", e);
+            throw new FetcherException("Error with Open Search Request (Worldcat)", e);
         } 
     }
 
@@ -90,15 +90,15 @@ private String makeOpenSearchRequest (String title) throws FetcherException {
      * @param id the oclc id
      * @return the XML element that contains all tags
      */
-    private Element getSpecificInfoOnOCLC (String id) throws IOException {
-        URLDownload urlDownload = new URLDownload (WORLDCAT_READ_URL.replace ("{OCLC-NUMBER}", id));
-        URLDownload.bypassSSLVerification ();
-        String resp = urlDownload.asString ();	
+    private Element getSpecificInfoOnOCLC(String id) throws IOException {
+        URLDownload urlDownload = new URLDownload(WORLDCAT_READ_URL.replace("{OCLC-NUMBER}", id));
+        URLDownload.bypassSSLVerification();
+        String resp = urlDownload.asString();	
 
-        Document mainDoc = parse (resp);
-        NodeList parentElemOfTags = mainDoc.getElementsByTagName ("oclcdcs");
+        Document mainDoc = parse(resp);
+        NodeList parentElemOfTags = mainDoc.getElementsByTagName("oclcdcs");
 
-        return (Element) parentElemOfTags.item (0);
+        return (Element) parentElemOfTags.item(0);
     }
     
      /**
@@ -107,18 +107,18 @@ private Element getSpecificInfoOnOCLC (String id) throws IOException {
      * @return XML document representing the content of s
      * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
      */
-    private Document parse (String s) {
-        try (BufferedReader r = new BufferedReader (new StringReader(s))){ 
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
-            DocumentBuilder builder = factory.newDocumentBuilder ();
+    private Document parse(String s) {
+        try (BufferedReader r = new BufferedReader(new StringReader(s))) { 
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
 
-            return builder.parse (new InputSource (r));
+            return builder.parse(new InputSource(r));
         } catch (ParserConfigurationException e) {
-            throw new IllegalArgumentException ("Parser Config Exception: " + e.getMessage (), e);
+            throw new IllegalArgumentException("Parser Config Exception: " + e.getMessage(), e);
         } catch (SAXException e) {
-            throw new IllegalArgumentException ("SAX Exception: " + e.getMessage (), e);
+            throw new IllegalArgumentException("SAX Exception: " + e.getMessage(), e);
         } catch (IOException e) {
-            throw new IllegalArgumentException ("IO Exception: " + e.getMessage (), e);
+            throw new IllegalArgumentException("IO Exception: " + e.getMessage(), e);
         }
     }
     
@@ -139,26 +139,26 @@ private Document parse (String s) {
      */
     private Document parseOpenSearchXML(Document doc) throws FetcherException {
         try {
-            Element feed = (Element) doc.getElementsByTagName ("feed").item (0);
-            NodeList entryXMLList = feed.getElementsByTagName ("entry");
+            Element feed = (Element) doc.getElementsByTagName("feed").item(0);
+            NodeList entryXMLList = feed.getElementsByTagName("entry");
 
-            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance ();
-            DocumentBuilder docBuilder = docFactory.newDocumentBuilder ();
+            DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
             
-            Document newDoc = docBuilder.newDocument ();
+            Document newDoc = docBuilder.newDocument();
 
-            Element root = newDoc.createElement ("entries");
-            newDoc.appendChild (root);
-            for (int i = 0; i < entryXMLList.getLength (); i++) {
-                Element xmlEntry = (Element) entryXMLList.item (i);
+            Element root = newDoc.createElement("entries");
+            newDoc.appendChild(root);
+            for (int i = 0; i < entryXMLList.getLength(); i++) {
+                Element xmlEntry = (Element) entryXMLList.item(i);
                 
-                String oclc = xmlEntry.getElementsByTagName ("oclcterms:recordIdentifier").item (0).getTextContent ();
-                Element detailedInfo = getSpecificInfoOnOCLC (oclc);
+                String oclc = xmlEntry.getElementsByTagName("oclcterms:recordIdentifier").item(0).getTextContent();
+                Element detailedInfo = getSpecificInfoOnOCLC(oclc);
 
-                Element newEntry = newDoc.createElement ("entry");
-                newEntry.appendChild (detailedInfo);
+                Element newEntry = newDoc.createElement("entry");
+                newEntry.appendChild(detailedInfo);
 
-                root.appendChild (newEntry);
+                root.appendChild(newEntry);
             }
             return newDoc;
         } catch (ParserConfigurationException e) {
@@ -169,40 +169,40 @@ private Document parseOpenSearchXML(Document doc) throws FetcherException {
     }
 
     @Override
-    public List<BibEntry> performSearch (BibEntry entry) throws FetcherException {
-        Optional<String> entryTitle = entry.getLatexFreeField (StandardField.TITLE);
-        if (entryTitle.isPresent ()) {
-            String openSearchXMLResponse = makeOpenSearchRequest (entryTitle.get ());
-            Document openSearchDocument = parse (openSearchXMLResponse);
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+        Optional<String> entryTitle = entry.getLatexFreeField(StandardField.TITLE);
+        if (entryTitle.isPresent()) {
+            String openSearchXMLResponse = makeOpenSearchRequest(entryTitle.get());
+            Document openSearchDocument = parse(openSearchXMLResponse);
 
-            Document detailedXML = parseOpenSearchXML (openSearchDocument);
+            Document detailedXML = parseOpenSearchXML(openSearchDocument);
             String detailedXMLString;
-            try (StringWriter sw = new StringWriter ()){
+            try (StringWriter sw = new StringWriter()) {
                 //Transform XML to String
-                TransformerFactory tf = TransformerFactory.newInstance ();
-                Transformer t = tf.newTransformer ();
-                t.transform(new DOMSource (detailedXML), new StreamResult (sw));
-                detailedXMLString = sw.toString ();
+                TransformerFactory tf = TransformerFactory.newInstance();
+                Transformer t = tf.newTransformer();
+                t.transform(new DOMSource(detailedXML), new StreamResult(sw));
+                detailedXMLString = sw.toString();
             } catch (TransformerException e) {
-                throw new FetcherException ("Could not transform XML", e);
+                throw new FetcherException("Could not transform XML", e);
             } catch (IOException e) {
                 throw new FetcherException("Could not close StringWriter", e);
             }
 
-            WorldcatImporter importer = new WorldcatImporter (); 
+            WorldcatImporter importer = new WorldcatImporter(); 
             ParserResult parserResult;
             try { 
-                if (importer.isRecognizedFormat (detailedXMLString)) {
-                    parserResult = importer.importDatabase (detailedXMLString);
+                if (importer.isRecognizedFormat(detailedXMLString)) {
+                    parserResult = importer.importDatabase(detailedXMLString);
                 } else { 
                     // For displaying An ErrorMessage
-                    BibDatabase errorBibDataBase = new BibDatabase ();
-                    parserResult = new ParserResult (errorBibDataBase);
+                    BibDatabase errorBibDataBase = new BibDatabase();
+                    parserResult = new ParserResult(errorBibDataBase);
                 }
-                return parserResult.getDatabase ().getEntries ();
+                return parserResult.getDatabase().getEntries();
             }
             catch (IOException e) {
-                throw new FetcherException ("Could not perform search (Worldcat) ", e);
+                throw new FetcherException("Could not perform search (Worldcat) ", e);
             }
         } else {
             return new ArrayList<>();
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 5225f662876..d698c00fd46 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -33,26 +33,26 @@ public class WorldcatImporter extends Importer {
      * @return XML document representing the content of s
      * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
      */
-    private Document parse (BufferedReader s) {
+    private Document parse(BufferedReader s) {
         try { 
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance ();
-            DocumentBuilder builder = factory.newDocumentBuilder ();
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
 
-            return builder.parse (new InputSource (s));
+            return builder.parse(new InputSource(s));
         } catch (ParserConfigurationException e) {
-            throw new IllegalArgumentException ("Parser Config Exception: ", e);
+            throw new IllegalArgumentException("Parser Config Exception: ", e);
         } catch (SAXException e) {
-            throw new IllegalArgumentException ("SAX Exception: ", e);
+            throw new IllegalArgumentException("SAX Exception: ", e);
         } catch (IOException e) {
-            throw new IllegalArgumentException ("IO Exception: ", e);
+            throw new IllegalArgumentException("IO Exception: ", e);
         }
     }
 
     @Override
-    public boolean isRecognizedFormat (BufferedReader input) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader input) throws IOException {
         try {
-            Document doc = parse (input);
-            return doc.getElementsByTagName ("feed") != null;
+            Document doc = parse(input);
+            return doc.getElementsByTagName("feed") != null;
         } catch (IllegalArgumentException e) {
             return false;
         }
@@ -66,9 +66,9 @@ public boolean isRecognizedFormat (BufferedReader input) throws IOException {
      * @return the tag element
      * @throws NullPointerException if there is no element by this tag
      */
-    private Element getElementByTag (Element xml, String tag) throws NullPointerException { 
-        NodeList nl = xml.getElementsByTagName (tag);
-        return (Element) nl.item (0);
+    private Element getElementByTag(Element xml, String tag) throws NullPointerException { 
+        NodeList nl = xml.getElementsByTagName(tag);
+        return (Element) nl.item(0);
     }
 
     /**
@@ -77,25 +77,25 @@ private Element getElementByTag (Element xml, String tag) throws NullPointerExce
      * @return the correspoinding bibentry
      * @throws IOException if we cannot search Worldcat with the OCLC of the entry
      */
-    private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException { 
-        String authors = getElementByTag (xmlEntry, "dc:creator").getTextContent ();
+    private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException { 
+        String authors = getElementByTag(xmlEntry, "dc:creator").getTextContent();
 
-        String title = getElementByTag (xmlEntry, "dc:title").getTextContent ();
+        String title = getElementByTag(xmlEntry, "dc:title").getTextContent();
 
-        String oclcNr = getElementByTag (xmlEntry, "oclcterms:recordIdentifie").getTextContent ();
+        String oclcNr = getElementByTag(xmlEntry, "oclcterms:recordIdentifie").getTextContent();
         String url = "http://worldcat.org/oclc/" + oclcNr;
         
-        String date = getElementByTag (xmlEntry, "dc:date").getTextContent ();
+        String date = getElementByTag(xmlEntry, "dc:date").getTextContent();
 
-        String publisher =  getElementByTag (xmlEntry, "dc:publisher").getTextContent ();
+        String publisher =  getElementByTag(xmlEntry, "dc:publisher").getTextContent();
 
-        BibEntry entry = new BibEntry ();
+        BibEntry entry = new BibEntry();
 
-        entry.setField (StandardField.AUTHOR, authors);
-        entry.setField (StandardField.TITLE, title);
-        entry.setField (StandardField.URL, url);
-        entry.setField (StandardField.YEAR, date);
-        entry.setField (StandardField.JOURNAL, publisher);
+        entry.setField(StandardField.AUTHOR, authors);
+        entry.setField(StandardField.TITLE, title);
+        entry.setField(StandardField.URL, url);
+        entry.setField(StandardField.YEAR, date);
+        entry.setField(StandardField.JOURNAL, publisher);
 
         return entry;
     }
@@ -107,38 +107,38 @@ private BibEntry xmlEntryToBibEntry (Element xmlEntry) throws IOException {
      * @return the ParserResult containing the BibEntries collection
      * @throws IOException if {@link xmlEntryToBibEntry} throws 
      */
-    private ParserResult docToParserRes (Document doc) throws IOException { 
-        Element feed = (Element) doc.getElementsByTagName ("entries").item (0);
-        NodeList entryXMLList = feed.getElementsByTagName ("entry");
-
-        List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength ());
-        for (int i = 0; i < entryXMLList.getLength (); i++) {
-            Element xmlEntry = (Element) entryXMLList.item (i);
-            BibEntry bibEntry = xmlEntryToBibEntry (xmlEntry);
-            bibList.add (bibEntry);		
+    private ParserResult docToParserRes(Document doc) throws IOException { 
+        Element feed = (Element) doc.getElementsByTagName("entries").item(0);
+        NodeList entryXMLList = feed.getElementsByTagName("entry");
+
+        List<BibEntry> bibList = new ArrayList<>(entryXMLList.getLength());
+        for (int i = 0; i < entryXMLList.getLength(); i++) {
+            Element xmlEntry = (Element) entryXMLList.item(i);
+            BibEntry bibEntry = xmlEntryToBibEntry(xmlEntry);
+            bibList.add(bibEntry);		
         }
 
-        return new ParserResult (bibList);
+        return new ParserResult(bibList);
     }
 
     @Override
-    public ParserResult importDatabase (BufferedReader input) throws IOException {
-        Document parsedDoc = parse (input);
-        return docToParserRes (parsedDoc);
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
+        Document parsedDoc = parse(input);
+        return docToParserRes(parsedDoc);
     }
 
     @Override
-    public String getName () {
+    public String getName() {
         return NAME;
     }
 
     @Override
-    public FileType getFileType () {
+    public FileType getFileType() {
         return StandardFileType.XML;
     }
 
     @Override
-    public String getDescription () {
+    public String getDescription() {
         return DESCRIPTION;
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index 8b0666cf14b..5ebbacde9b6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -20,7 +20,7 @@ public class WorldcatFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new WorldcatFetcher("API_KEY");
+        fetcher = new WorldcatFetcher("aMHOf2rfzUt3fuKkb7DXX8pkBv1AmcBWwwoSfwpt8CMhdUdxXscB4ESOmBPs4NlmYJmFtcSZ3Q5kMxzb");
     }
 
     @Test

From 65f6de84d91897446c9932ab2503b9b21c41e395 Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Fri, 10 Apr 2020 21:21:00 +0200
Subject: [PATCH 32/48] Change to https

---
 .../org/jabref/logic/importer/fetcher/WorldcatFetcher.java    | 4 ++--
 .../jabref/logic/importer/fetcher/WorldcatFetcherTest.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 714711c7a24..8d440765284 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -41,8 +41,8 @@
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
-    private String WORLDCAT_OPEN_SEARCH_URL = "http://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
-    private String WORLDCAT_READ_URL = "http://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
+    private String WORLDCAT_OPEN_SEARCH_URL = "https://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
+    private String WORLDCAT_READ_URL = "https://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
    
     public WorldcatFetcher(String worldcatKey) {
         WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index 5ebbacde9b6..f7775efbefe 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -27,7 +27,7 @@ public void setUp() {
     public void testPerformSearchForBadTitle() throws FetcherException {
         BibEntry entry = new BibEntry();
         //Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
-        entry.setField(StandardField.TITLE, "ASDhbsd fnm");
+        entry.setField(StandardField.TITLE, "ASDhbsdfnm");
         List<BibEntry> list = fetcher.performSearch(entry);
         assertTrue(list.isEmpty());
     }

From 69da970fa8f7499e5f0d3d8573fd1c6cd664ab4b Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Fri, 10 Apr 2020 21:43:47 +0200
Subject: [PATCH 33/48] Remove null test

---
 .../logic/importer/fetcher/WorldcatFetcherTest.java      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index f7775efbefe..ae76f565455 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -40,13 +40,4 @@ public void testPerformSearchForExistingTitle() throws FetcherException {
         List<BibEntry> list = fetcher.performSearch(entry);
         assertFalse(list.isEmpty());
     }
-
-    @Test
-    public void testPerformSearchForNullTitle() throws FetcherException {
-        BibEntry entry = new BibEntry();
-        entry.setField(StandardField.TITLE, null);
-        List<BibEntry> list = fetcher.performSearch(entry);
-        assertTrue(list.isEmpty());
-    }
-
 }
\ No newline at end of file

From f8d989adbaf9d0b613cf08d54fa4b7ce969c793a Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Fri, 10 Apr 2020 22:05:10 +0200
Subject: [PATCH 34/48] Fix locality issue

---
 src/main/resources/l10n/JabRef_en.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 1087ce33bc2..73ad1db26ce 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1031,7 +1031,8 @@ The\ output\ option\ depends\ on\ a\ valid\ input\ option.=The output option dep
 Linked\ file\ name\ conventions=Linked file name conventions
 Filename\ format\ pattern=Filename format pattern
 API\ keys=API keys
-Worldcat\ Fetcher\ Key=Worldcat Fetcher Key
+Worldcat=Worldcat
+You\ can\ request\ a\ link\ at\ this\ link\:\ https\://platform.worldcat.org/wskey=You can request a link at this link: https://platform.worldcat.org/wskey
 Additional\ parameters=Additional parameters
 Cite\ selected\ entries\ between\ parenthesis=Cite selected entries between parenthesis
 Cite\ selected\ entries\ with\ in-text\ citation=Cite selected entries with in-text citation

From 959f64a092a04bb711d918d4ede86d787496866e Mon Sep 17 00:00:00 2001
From: Glenn Olsson <glennholsson@gmail.com>
Date: Sun, 12 Apr 2020 12:14:11 +0200
Subject: [PATCH 35/48] Add link to worldcat as hyperlink

---
 .../org/jabref/gui/preferences/ImportTab.fxml | 12 +++++++---
 .../jabref/gui/preferences/ImportTabView.java |  5 ++++
 .../gui/preferences/ImportTabViewModel.java   | 23 ++++++++++++++++---
 src/main/resources/l10n/JabRef_en.properties  |  3 ++-
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
index 29d27cd1e5e..b988c565315 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ImportTab.fxml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
 
@@ -43,9 +45,13 @@
             <RowConstraints vgrow="SOMETIMES"/>
         </rowConstraints>
         <Label text="%Worldcat" GridPane.rowIndex="1"/>
-		<Label fx:id="worldcatDescription"
-           text="%You can request a link at this link: https://platform.worldcat.org/wskey"
-           textOverrun="CLIP" wrapText="true"/>
+		<HBox alignment="CENTER_LEFT">
+			<Label fx:id="worldcatDescription"
+			text="%You can request a key at"
+			styleClass="space-after"
+			textOverrun="CLIP" wrapText="true"/>
+			<Hyperlink onAction="#openWorldcatKeyRequest" text="%the worlcat platform" />
+		</HBox>
         <TextField fx:id="worldcatKey" GridPane.columnIndex="1" GridPane.rowIndex="1"
                    prefWidth="300" minWidth="300" maxWidth="300"/>
     </GridPane>
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabView.java b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
index 433ea3c4e1f..1fb3fe808b3 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabView.java
@@ -34,6 +34,11 @@ public void initialize () {
         worldcatKey.textProperty().bindBidirectional(viewModel.apiKeyProperty());
     }
 
+	@FXML
+	public void openWorldcatKeyRequest() { 
+		viewModel.openWorldcatKeyRequest(); 
+	}
+
     @Override
     public String getTabName() { return Localization.lang("Import"); }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
index e84e3f2ae04..d03d37101a3 100644
--- a/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ImportTabViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.preferences;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,6 +11,8 @@
 import javafx.collections.FXCollections;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 
 public class ImportTabViewModel implements PreferenceTabViewModel {
@@ -23,7 +26,9 @@ public class ImportTabViewModel implements PreferenceTabViewModel {
     private final StringProperty apiKeyProperty = new SimpleStringProperty();
 
     private final DialogService dialogService;
-    private final JabRefPreferences preferences;
+	private final JabRefPreferences preferences;
+	
+	private final String WORLDCAT_REQUEST_URL = "https://platform.worldcat.org/wskey";
 
     public ImportTabViewModel(DialogService dialogService, JabRefPreferences preferences) {
         this.dialogService = dialogService;
@@ -52,7 +57,7 @@ public boolean validateSettings() {
     @Override
     public List<String> getRestartWarnings() {
         return new ArrayList<>();
-    }
+	}
 
     public ListProperty<String> defaultFileNamePatternsProperty() { return defaultFileNamePatternsProperty; }
 
@@ -60,5 +65,17 @@ public List<String> getRestartWarnings() {
 
     public StringProperty fileDirPatternProperty() { return fileDirPatternProperty; }
     
-    public StringProperty apiKeyProperty() { return apiKeyProperty; }
+	public StringProperty apiKeyProperty() { return apiKeyProperty; }
+	
+	public void openWorldcatKeyRequest() {
+		openWebsite(WORLDCAT_REQUEST_URL);
+	}
+
+	private void openWebsite(String url) {
+        try {
+            JabRefDesktop.openBrowser(url);
+        } catch (IOException e) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
+        }
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 73ad1db26ce..65471c01c45 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1032,7 +1032,8 @@ Linked\ file\ name\ conventions=Linked file name conventions
 Filename\ format\ pattern=Filename format pattern
 API\ keys=API keys
 Worldcat=Worldcat
-You\ can\ request\ a\ link\ at\ this\ link\:\ https\://platform.worldcat.org/wskey=You can request a link at this link: https://platform.worldcat.org/wskey
+You\ can\ request\ a\ key\ at=You can request a key at
+the\ worlcat\ platform=the worlcat platform
 Additional\ parameters=Additional parameters
 Cite\ selected\ entries\ between\ parenthesis=Cite selected entries between parenthesis
 Cite\ selected\ entries\ with\ in-text\ citation=Cite selected entries with in-text citation

From fbd3003cc7e8327beda4bf445b4f3c3e44018266 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 1 Feb 2021 09:57:41 +0100
Subject: [PATCH 36/48] Fixed merge errors and minor ide warnings

---
 CHANGELOG.md                                  |  1 +
 .../jabref/gui/entryeditor/EntryEditor.java   |  2 +-
 .../jabref/gui/preferences/FetcherTab.fxml    | 42 +++++++++++
 .../jabref/gui/preferences/FetcherTab.java    | 42 +++++++++++
 .../gui/preferences/FetcherTabViewModel.java  | 73 +++++++++++++++++++
 .../PreferencesDialogViewModel.java           |  1 +
 ...rences.java => FetcherApiPreferences.java} |  8 +-
 .../jabref/logic/importer/WebFetchers.java    |  4 +-
 .../importer/fetcher/WorldcatFetcher.java     | 38 +++++-----
 .../jabref/preferences/JabRefPreferences.java | 12 ++-
 .../preferences/PreferencesService.java       |  5 ++
 src/main/resources/l10n/JabRef_en.properties  |  9 ++-
 .../logic/importer/WebFetchersTest.java       | 20 ++---
 13 files changed, 215 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/preferences/FetcherTab.fxml
 create mode 100644 src/main/java/org/jabref/gui/preferences/FetcherTab.java
 create mode 100644 src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java
 rename src/main/java/org/jabref/logic/importer/{APIKeyPreferences.java => FetcherApiPreferences.java} (65%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 905b9c09d35..1bda62a1c44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added some symbols and keybindings to the context menu in the entry editor. [#7268](https://github.com/JabRef/jabref/pull/7268)
 - We added keybindings for setting and clearing the read status. [#7264](https://github.com/JabRef/jabref/issues/7264)
 - We added two new fields to track the creation and most recent modification date and time for each entry. [koppor#130](https://github.com/koppor/jabref/issues/130)
+- We added a WorldCcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581)
 
 ### Changed
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 5351a963270..54fbe521ad6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -352,7 +352,7 @@ private void setupToolBar() {
 
         // Add menu for fetching bibliographic information
         ContextMenu fetcherMenu = new ContextMenu();
-        for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(preferencesService.getImportFormatPreferences(), preferencesService.getAPIApiKeyPreferences())) {
+        for (EntryBasedFetcher fetcher : WebFetchers.getEntryBasedFetchers(preferencesService.getImportFormatPreferences(), preferencesService.getApiKeyPreferences())) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
             fetcherMenuItem.setOnAction(event -> fetchAndMerge(fetcher));
             fetcherMenu.getItems().add(fetcherMenuItem);
diff --git a/src/main/java/org/jabref/gui/preferences/FetcherTab.fxml b/src/main/java/org/jabref/gui/preferences/FetcherTab.fxml
new file mode 100644
index 00000000000..26dd30fd307
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/FetcherTab.fxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<fx:root spacing="10.0" type="VBox" prefWidth="650.0"
+         xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
+         fx:controller="org.jabref.gui.preferences.FetcherTab">
+
+    <Label styleClass="titleHeader" text="%Fetcher API keys"/>
+
+    <Label text="Use custom API keys"/>
+    <GridPane hgap="10.0" vgap="4.0">
+        <columnConstraints>
+            <ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0"/>
+            <ColumnConstraints hgrow="SOMETIMES"/>
+        </columnConstraints>
+        <rowConstraints>
+            <RowConstraints minHeight="10.0" />
+            <RowConstraints minHeight="10.0" />
+        </rowConstraints>
+        <CheckBox fx:id="useWorldcatKey" text="%WorldCat" GridPane.rowIndex="0" GridPane.columnIndex="0"/>
+        <TextField fx:id="worldcatKey" disable="${!useWorldcatKey.selected}"
+                   GridPane.rowIndex="0" GridPane.columnIndex="1"/>
+        <HBox alignment="BASELINE_LEFT" spacing="4.0" onMouseClicked="#openWorldcatWebpage"
+              GridPane.rowIndex="1" GridPane.columnIndex="1">
+            <Button styleClass="icon-button,narrow" onAction="#openWorldcatWebpage" text="%Request a key on the WorldCat platform."
+                    prefHeight="15.0" GridPane.columnIndex="2">
+                <graphic>
+                    <JabRefIconView glyph="LINK_VARIANT"/>
+                </graphic>
+            </Button>
+        </HBox>
+    </GridPane>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/FetcherTab.java b/src/main/java/org/jabref/gui/preferences/FetcherTab.java
new file mode 100644
index 00000000000..614c72e25d7
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/FetcherTab.java
@@ -0,0 +1,42 @@
+package org.jabref.gui.preferences;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.TextField;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class FetcherTab extends AbstractPreferenceTabView<FetcherTabViewModel> implements PreferencesTab {
+
+    @FXML private CheckBox useWorldcatKey;
+    @FXML private TextField worldcatKey;
+
+    public FetcherTab(PreferencesService preferences) {
+        this.preferences = preferences;
+
+        ViewLoader.view(this)
+                  .root(this)
+                  .load();
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new FetcherTabViewModel(preferences);
+
+        useWorldcatKey.selectedProperty().bindBidirectional(viewModel.getUseWorldcatKeyProperty());
+        worldcatKey.textProperty().bindBidirectional(viewModel.getWorldcatKeyProperty());
+    }
+
+    @Override
+    public String getTabName() {
+        return Localization.lang("Fetcher API keys");
+    }
+
+    @FXML
+    private void openWorldcatWebpage() {
+        viewModel.openWorldcatWebpage();
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java b/src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java
new file mode 100644
index 00000000000..97b3c2c0c51
--- /dev/null
+++ b/src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java
@@ -0,0 +1,73 @@
+package org.jabref.gui.preferences;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.logic.importer.FetcherApiPreferences;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.PreferencesService;
+
+public class FetcherTabViewModel implements PreferenceTabViewModel {
+
+    private final String WORLDCAT_REQUEST_URL = "https://platform.worldcat.org/wskey";
+
+    private final BooleanProperty useWorldcatKeyProperty = new SimpleBooleanProperty();
+    private final StringProperty worldcatKeyProperty = new SimpleStringProperty();
+
+    private final PreferencesService preferencesService;
+    private final FetcherApiPreferences initialFetcherApiPreferences;
+
+    public FetcherTabViewModel(PreferencesService preferencesService) {
+        this.preferencesService = preferencesService;
+        this.initialFetcherApiPreferences = preferencesService.getApiKeyPreferences();
+    }
+
+    @Override
+    public void setValues() {
+        if (StringUtil.isNotBlank(initialFetcherApiPreferences.getWorldcatKey())) {
+            useWorldcatKeyProperty.setValue(true);
+            worldcatKeyProperty.setValue(initialFetcherApiPreferences.getWorldcatKey());
+        }
+    }
+
+    @Override
+    public void storeSettings() {
+        Map<String, String> keys = new HashMap<>();
+
+        keys.put("worldcat", useWorldcatKeyProperty.getValue() ? worldcatKeyProperty.getValue() : "");
+
+        preferencesService.storeApiKeyPreferences(new FetcherApiPreferences(
+                keys.get("worldcat"))
+        );
+    }
+
+    public void openWorldcatWebpage() {
+        JabRefDesktop.openBrowserShowPopup(WORLDCAT_REQUEST_URL);
+    }
+
+    @Override
+    public boolean validateSettings() {
+        return true;
+    }
+
+    @Override
+    public List<String> getRestartWarnings() {
+        return Collections.emptyList();
+    }
+
+    public BooleanProperty getUseWorldcatKeyProperty() {
+        return useWorldcatKeyProperty;
+    }
+
+    public StringProperty getWorldcatKeyProperty() {
+        return worldcatKeyProperty;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index f563af54293..32969a8083d 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -52,6 +52,7 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
                 new ExternalTabView(preferences, frame.getPushToApplicationsManager()),
                 new GroupsTabView(preferences),
                 new EntryEditorTabView(preferences),
+                new FetcherTab(preferences),
                 new CitationKeyPatternTabView(preferences),
                 new LinkedFilesTabView(preferences),
                 new NameFormatterTabView(preferences),
diff --git a/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java b/src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java
similarity index 65%
rename from src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
rename to src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java
index e6bdd4c719d..c52352b62af 100644
--- a/src/main/java/org/jabref/logic/importer/APIKeyPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.importer;
 
-public class APIKeyPreferences {
+public class FetcherApiPreferences {
     private final String worldcatKey;
-    
-    public APIKeyPreferences(String worldcatKey) {
+
+    public FetcherApiPreferences(String worldcatKey) {
         this.worldcatKey = worldcatKey;
     }
 
     public String getWorldcatKey() { return worldcatKey; }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 2b4f094546c..99ecd3c03ca 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -134,14 +134,14 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
     /**
      * @return sorted set containing entry based fetchers
      */
-    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPreferences importFormatPreferences, APIKeyPreferences apiKeyPreferences) {
+    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPreferences importFormatPreferences, FetcherApiPreferences fetcherApiPreferences) {
         SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new AstrophysicsDataSystem(importFormatPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
-        set.add(new WorldcatFetcher(apiKeyPreferences.getWorldcatKey()));
+        set.add(new WorldcatFetcher(fetcherApiPreferences.getWorldcatKey()));
         return set;
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 8d440765284..155ab9b3ce3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -36,14 +36,14 @@
 
 /**
  * EntryBasedFetcher that searches the Worldcat database
- * 
- * @see https://www.oclc.org/developer/develop/web-services/worldcat-search-api/bibliographic-resource.en.html
+ *
+ * @see <a href="https://www.oclc.org/developer/develop/web-services/worldcat-search-api/bibliographic-resource.en.html">Worldcat API documentation</a>
  */
 public class WorldcatFetcher implements EntryBasedFetcher {
 
     private String WORLDCAT_OPEN_SEARCH_URL = "https://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
     private String WORLDCAT_READ_URL = "https://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
-   
+
     public WorldcatFetcher(String worldcatKey) {
         WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
         WORLDCAT_READ_URL += worldcatKey;
@@ -59,7 +59,7 @@ public String getName() {
      * @param title the title to include in the query
      * @return the earch query for the api
      */
-    private String getOpenSearchURL(String title) throws MalformedURLException { 
+    private String getOpenSearchURL(String title) throws MalformedURLException {
         String query = "&q=srw.ti+all+\"" + title + "\"";
         URL url = new URL(WORLDCAT_OPEN_SEARCH_URL + query);
         return url.toString();
@@ -74,18 +74,16 @@ private String makeOpenSearchRequest(String title) throws FetcherException {
         try {
             URLDownload urlDownload = new URLDownload(getOpenSearchURL(title));
             URLDownload.bypassSSLVerification();
-            String resp = urlDownload.asString();
-
-            return resp;
+            return urlDownload.asString();
         } catch (MalformedURLException e) {
             throw new FetcherException("Bad url", e);
         } catch (IOException e) {
             throw new FetcherException("Error with Open Search Request (Worldcat)", e);
-        } 
+        }
     }
 
      /**
-     * Get more information about a article through its OCLC id. Picks the first 
+     * Get more information about a article through its OCLC id. Picks the first
      * element with this tag
      * @param id the oclc id
      * @return the XML element that contains all tags
@@ -93,14 +91,14 @@ private String makeOpenSearchRequest(String title) throws FetcherException {
     private Element getSpecificInfoOnOCLC(String id) throws IOException {
         URLDownload urlDownload = new URLDownload(WORLDCAT_READ_URL.replace("{OCLC-NUMBER}", id));
         URLDownload.bypassSSLVerification();
-        String resp = urlDownload.asString();	
+        String resp = urlDownload.asString();
 
         Document mainDoc = parse(resp);
         NodeList parentElemOfTags = mainDoc.getElementsByTagName("oclcdcs");
 
         return (Element) parentElemOfTags.item(0);
     }
-    
+
      /**
      * Parse a string to an xml document
      * @param s the string to be parsed
@@ -108,7 +106,7 @@ private Element getSpecificInfoOnOCLC(String id) throws IOException {
      * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
      */
     private Document parse(String s) {
-        try (BufferedReader r = new BufferedReader(new StringReader(s))) { 
+        try (BufferedReader r = new BufferedReader(new StringReader(s))) {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
 
@@ -121,9 +119,9 @@ private Document parse(String s) {
             throw new IllegalArgumentException("IO Exception: " + e.getMessage(), e);
         }
     }
-    
+
     /**
-     * Parse OpenSearch XML to retrieve OCLC-ids and fetch details about those. 
+     * Parse OpenSearch XML to retrieve OCLC-ids and fetch details about those.
      * Returns new XML doc in the form
      * <pre>
      * {@literal <entries>}
@@ -135,7 +133,7 @@ private Document parse(String s) {
      * </pre>
      * @param doc the open search result
      * @return  the new xml document
-     * @throws FetcherException
+     * @throws FetcherException if the fetcher fails to parse the result
      */
     private Document parseOpenSearchXML(Document doc) throws FetcherException {
         try {
@@ -144,14 +142,14 @@ private Document parseOpenSearchXML(Document doc) throws FetcherException {
 
             DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
             DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
-            
+
             Document newDoc = docBuilder.newDocument();
 
             Element root = newDoc.createElement("entries");
             newDoc.appendChild(root);
             for (int i = 0; i < entryXMLList.getLength(); i++) {
                 Element xmlEntry = (Element) entryXMLList.item(i);
-                
+
                 String oclc = xmlEntry.getElementsByTagName("oclcterms:recordIdentifier").item(0).getTextContent();
                 Element detailedInfo = getSpecificInfoOnOCLC(oclc);
 
@@ -189,12 +187,12 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
                 throw new FetcherException("Could not close StringWriter", e);
             }
 
-            WorldcatImporter importer = new WorldcatImporter(); 
+            WorldcatImporter importer = new WorldcatImporter();
             ParserResult parserResult;
-            try { 
+            try {
                 if (importer.isRecognizedFormat(detailedXMLString)) {
                     parserResult = importer.importDatabase(detailedXMLString);
-                } else { 
+                } else {
                     // For displaying An ErrorMessage
                     BibDatabase errorBibDataBase = new BibDatabase();
                     parserResult = new ParserResult(errorBibDataBase);
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index a0245be602e..647ca739426 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -73,7 +73,7 @@
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
-import org.jabref.logic.importer.APIKeyPreferences;
+import org.jabref.logic.importer.FetcherApiPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.importer.fileformat.CustomImporter;
@@ -2304,6 +2304,16 @@ private void purgeCustomExportFormats(int from) {
         }
     }
 
+    @Override
+    public FetcherApiPreferences getApiKeyPreferences() {
+        return new FetcherApiPreferences(get(IMPORT_API_WORLDCAT));
+    }
+
+    @Override
+    public void storeApiKeyPreferences(FetcherApiPreferences preferences) {
+        put(IMPORT_API_WORLDCAT, preferences.getWorldcatKey());
+    }
+
     //*************************************************************************************************************
     // Preview preferences
     //*************************************************************************************************************
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 11b97e26f0c..6ed35c33338 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -27,6 +27,7 @@
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.exporter.TemplateExporter;
+import org.jabref.logic.importer.FetcherApiPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
@@ -288,6 +289,10 @@ public interface PreferencesService {
 
     void storeCustomImportFormats(Set<CustomImporter> customImporters);
 
+    FetcherApiPreferences getApiKeyPreferences();
+
+    void storeApiKeyPreferences(FetcherApiPreferences preferences);
+
     //*************************************************************************************************************
     // Preview preferences
     //*************************************************************************************************************
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a522396b8a4..8872a3137ce 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -1020,10 +1020,11 @@ No\ search\ matches.=No search matches.
 The\ output\ option\ depends\ on\ a\ valid\ input\ option.=The output option depends on a valid input option.
 Linked\ file\ name\ conventions=Linked file name conventions
 Filename\ format\ pattern=Filename format pattern
-API\ keys=API keys
-Worldcat=Worldcat
-You\ can\ request\ a\ key\ at=You can request a key at
-the\ worlcat\ platform=the worlcat platform
+
+Request\ a\ key\ on\ the\ WorldCat\ platform.=Request a key on the WorldCat platform.
+Fetcher\ API\ keys=Fetcher API keys
+WorldCat=WorldCat
+
 Additional\ parameters=Additional parameters
 Cite\ selected\ entries\ between\ parenthesis=Cite selected entries between parenthesis
 Cite\ selected\ entries\ with\ in-text\ citation=Cite selected entries with in-text citation
diff --git a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
index b0752363211..02d291cc423 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -27,20 +27,20 @@
 
 class WebFetchersTest {
 
-    private APIKeyPreferences apiKeyPreferences;
+    private FetcherApiPreferences fetcherApiPreferences;
     private ImportFormatPreferences importFormatPreferences;
-    private final ClassGraph classGraph = new ClassGraph().enableAllInfo().whitelistPackages("org.jabref");
+    private final ClassGraph classGraph = new ClassGraph().enableAllInfo().acceptPackages("org.jabref");
 
     @BeforeEach
-    void setUp() throws Exception {
+    void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class);
         FieldContentFormatterPreferences fieldContentFormatterPreferences = mock(FieldContentFormatterPreferences.class);
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(fieldContentFormatterPreferences);
-        apiKeyPreferences = mock(APIKeyPreferences.class);
+        fetcherApiPreferences = mock(FetcherApiPreferences.class);
     }
 
     @Test
-    void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exception {
+    void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
         Set<IdBasedFetcher> idFetchers = WebFetchers.getIdBasedFetchers(importFormatPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
@@ -65,8 +65,8 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
     }
 
     @Test
-    void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throws Exception {
-        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(importFormatPreferences, apiKeyPreferences);
+    void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() {
+        Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(importFormatPreferences, fetcherApiPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(EntryBasedFetcher.class.getCanonicalName());
@@ -79,7 +79,7 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() throw
     }
 
     @Test
-    void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() throws Exception {
+    void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
         Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences);
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(SearchBasedFetcher.class.getCanonicalName());
@@ -104,7 +104,7 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() thr
     }
 
     @Test
-    void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() throws Exception {
+    void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() {
         Set<FulltextFetcher> fullTextFetchers = WebFetchers.getFullTextFetchers(importFormatPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
@@ -121,7 +121,7 @@ void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() throws Ex
     }
 
     @Test
-    void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() throws Exception {
+    void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
         Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(importFormatPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {

From 35b03ce4e2379d98e9cad414fe9aa837b29d336e Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 1 Feb 2021 10:15:16 +0100
Subject: [PATCH 37/48] Fixed checkstyle errors and minor ide warnings

---
 .../logic/importer/FetcherApiPreferences.java  |  4 +++-
 .../importer/fetcher/WorldcatFetcher.java      |  5 ++---
 .../importer/fileformat/WorldcatImporter.java  | 18 ++++++++----------
 .../importer/fetcher/WorldcatFetcherTest.java  |  6 +++---
 .../fileformat/WorldcatImporterTest.java       | 17 +++++++----------
 .../WorldcatImporterTestWithResult.xml         |  2 +-
 .../WorldcatImporterTestWithoutResult.xml      |  2 +-
 7 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java b/src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java
index c52352b62af..0b022006b3a 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherApiPreferences.java
@@ -7,5 +7,7 @@ public FetcherApiPreferences(String worldcatKey) {
         this.worldcatKey = worldcatKey;
     }
 
-    public String getWorldcatKey() { return worldcatKey; }
+    public String getWorldcatKey() {
+        return worldcatKey;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 155ab9b3ce3..11e1a4062fb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -176,7 +176,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
             Document detailedXML = parseOpenSearchXML(openSearchDocument);
             String detailedXMLString;
             try (StringWriter sw = new StringWriter()) {
-                //Transform XML to String
+                // Transform XML to String
                 TransformerFactory tf = TransformerFactory.newInstance();
                 Transformer t = tf.newTransformer();
                 t.transform(new DOMSource(detailedXML), new StreamResult(sw));
@@ -198,8 +198,7 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
                     parserResult = new ParserResult(errorBibDataBase);
                 }
                 return parserResult.getDatabase().getEntries();
-            }
-            catch (IOException e) {
+            } catch (IOException e) {
                 throw new FetcherException("Could not perform search (Worldcat) ", e);
             }
         } else {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index d698c00fd46..6c28ec8a8fa 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -34,7 +34,7 @@ public class WorldcatImporter extends Importer {
      * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
      */
     private Document parse(BufferedReader s) {
-        try { 
+        try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
 
@@ -66,7 +66,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
      * @return the tag element
      * @throws NullPointerException if there is no element by this tag
      */
-    private Element getElementByTag(Element xml, String tag) throws NullPointerException { 
+    private Element getElementByTag(Element xml, String tag) throws NullPointerException {
         NodeList nl = xml.getElementsByTagName(tag);
         return (Element) nl.item(0);
     }
@@ -75,19 +75,18 @@ private Element getElementByTag(Element xml, String tag) throws NullPointerExcep
      * Parse the xml entry to a bib entry
      * @param xmlEntry the XML element from open search
      * @return the correspoinding bibentry
-     * @throws IOException if we cannot search Worldcat with the OCLC of the entry
      */
-    private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException { 
+    private BibEntry xmlEntryToBibEntry(Element xmlEntry) {
         String authors = getElementByTag(xmlEntry, "dc:creator").getTextContent();
 
         String title = getElementByTag(xmlEntry, "dc:title").getTextContent();
 
         String oclcNr = getElementByTag(xmlEntry, "oclcterms:recordIdentifie").getTextContent();
         String url = "http://worldcat.org/oclc/" + oclcNr;
-        
+
         String date = getElementByTag(xmlEntry, "dc:date").getTextContent();
 
-        String publisher =  getElementByTag(xmlEntry, "dc:publisher").getTextContent();
+        String publisher = getElementByTag(xmlEntry, "dc:publisher").getTextContent();
 
         BibEntry entry = new BibEntry();
 
@@ -101,13 +100,12 @@ private BibEntry xmlEntryToBibEntry(Element xmlEntry) throws IOException {
     }
 
     /**
-     * Parse an XML documents with open search entries to a parserResult of 
+     * Parse an XML documents with open search entries to a parserResult of
      * the bibentries
      * @param doc the main XML document from open search
      * @return the ParserResult containing the BibEntries collection
-     * @throws IOException if {@link xmlEntryToBibEntry} throws 
      */
-    private ParserResult docToParserRes(Document doc) throws IOException { 
+    private ParserResult docToParserRes(Document doc) {
         Element feed = (Element) doc.getElementsByTagName("entries").item(0);
         NodeList entryXMLList = feed.getElementsByTagName("entry");
 
@@ -115,7 +113,7 @@ private ParserResult docToParserRes(Document doc) throws IOException {
         for (int i = 0; i < entryXMLList.getLength(); i++) {
             Element xmlEntry = (Element) entryXMLList.item(i);
             BibEntry bibEntry = xmlEntryToBibEntry(xmlEntry);
-            bibList.add(bibEntry);		
+            bibList.add(bibEntry);
         }
 
         return new ParserResult(bibList);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index ae76f565455..085b8be9a2d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -26,7 +26,7 @@ public void setUp() {
     @Test
     public void testPerformSearchForBadTitle() throws FetcherException {
         BibEntry entry = new BibEntry();
-        //Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
+        // Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
         entry.setField(StandardField.TITLE, "ASDhbsdfnm");
         List<BibEntry> list = fetcher.performSearch(entry);
         assertTrue(list.isEmpty());
@@ -35,9 +35,9 @@ public void testPerformSearchForBadTitle() throws FetcherException {
     @Test
     public void testPerformSearchForExistingTitle() throws FetcherException {
         BibEntry entry = new BibEntry();
-        //Example "The very best of Glenn Miller". Verified on same link as above
+        // Example "The very best of Glenn Miller". Verified on same link as above
         entry.setField(StandardField.TITLE, "The very best of Glenn");
         List<BibEntry> list = fetcher.performSearch(entry);
         assertFalse(list.isEmpty());
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index e193a353bbb..f9dba830bff 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -19,15 +19,13 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class WorldcatImporterTest {
-    
+
     WorldcatImporter importer;
 
     private String getFilePath(String filename) throws IOException {
-        Predicate<String> filePredicate = name -> {
-            return name.startsWith(filename) && name.endsWith(".xml");
-        };
+        Predicate<String> filePredicate = name -> name.startsWith(filename) && name.endsWith(".xml");
         Collection<String> paths = ImporterTestEngine.getTestFiles(filePredicate);
-        if (paths.size() > 1 || paths.size() == 0) {
+        if (paths.size() != 1) {
             throw new IllegalArgumentException("Filename returned 0 or more than 1 result: " + filename);
         }
         return paths.iterator().next();
@@ -35,8 +33,7 @@ private String getFilePath(String filename) throws IOException {
 
     private String getFileContent(String filename) throws IOException {
         String path = getFilePath(filename);
-        String content = Files.readString(getPath(path));
-        return content;
+        return Files.readString(getPath(path));
     }
 
     private static Path getPath(String fileName) throws IOException {
@@ -50,9 +47,9 @@ private static Path getPath(String fileName) throws IOException {
     @BeforeEach
     public void setUp() {
         importer = new WorldcatImporter();
-        
+
     }
-    
+
     @Test
     public void withResultIsRecognizedFormat() throws IOException {
         ImporterTestEngine.testIsRecognizedFormat(importer, getFilePath("WorldcatImporterTestWithResult"));
@@ -85,4 +82,4 @@ public void withoutResultReturnsEmptyResult() throws IOException {
         assertEquals(0, res.getDatabase().getEntries().size());
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
index d837a784d48..7cac36c96ac 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithResult.xml
@@ -35,4 +35,4 @@
         <oclcterms:recordCreationDate xsi:type="http://purl.org/oclc/terms/marc008date">971008</oclcterms:recordCreationDate>
         <oclcterms:recordIdentifier>659047837</oclcterms:recordIdentifier>
     </entry>
-</entries>
\ No newline at end of file
+</entries>
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
index b4f32714baf..0dc66c5963d 100644
--- a/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/WorldcatImporterTestWithoutResult.xml
@@ -1,2 +1,2 @@
 <entries>
-</entries>
\ No newline at end of file
+</entries>

From f32931d21a031dad045b8cf944cd5fb1f808b514 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 1 Feb 2021 10:24:39 +0100
Subject: [PATCH 38/48] Fixed test

---
 .../jabref/logic/importer/fileformat/WorldcatImporterTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index f9dba830bff..a570853d17e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -4,7 +4,6 @@
 import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Collection;
 import java.util.function.Predicate;
 
@@ -38,7 +37,7 @@ private String getFileContent(String filename) throws IOException {
 
     private static Path getPath(String fileName) throws IOException {
         try {
-            return Paths.get(ImporterTestEngine.class.getResource(fileName).toURI());
+            return Path.of(ImporterTestEngine.class.getResource(fileName).toURI());
         } catch (URISyntaxException e) {
             throw new IOException(e);
         }

From 025350b1473e57b1ece031d17720b14dec3c1993 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 1 Feb 2021 21:07:37 +0100
Subject: [PATCH 39/48] Fix typo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bda62a1c44..f6adaca94d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added some symbols and keybindings to the context menu in the entry editor. [#7268](https://github.com/JabRef/jabref/pull/7268)
 - We added keybindings for setting and clearing the read status. [#7264](https://github.com/JabRef/jabref/issues/7264)
 - We added two new fields to track the creation and most recent modification date and time for each entry. [koppor#130](https://github.com/koppor/jabref/issues/130)
-- We added a WorldCcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581)
+- We added a fetcher for [WorldCat](https://www.worldcat.org/). [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581)
 
 ### Changed
 

From c0b5ab9c78ea2aa0251afd01638513bfdc33b991 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 1 Feb 2021 21:08:20 +0100
Subject: [PATCH 40/48] Fix changelog

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6adaca94d3..95ef920c8d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -249,7 +249,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We reintroduced the index column. [#5844](https://github.com/JabRef/jabref/pull/5844)
 - Filenames of external files can no longer contain curly braces. [#5926](https://github.com/JabRef/jabref/pull/5926)
 - We made the filters more easily accessible in the integrity check dialog. [#5955](https://github.com/JabRef/jabref/pull/5955)
-- We added a WorldCcat fetcher. [#1065](https://github.com/JabRef/jabref/issues/1065) [#2581](https://github.com/JabRef/jabref/issues/2581). [WorldCat](http://www.worldcat.org/webservices/catalog/)
 - We reimplemented and improved the dialog "Customize entry types". [#4719](https://github.com/JabRef/jabref/issues/4719)
 - We added an [American Physical Society](https://journals.aps.org/) fetcher. [#818](https://github.com/JabRef/jabref/issues/818)
 - We added possibility to enable/disable items quantity in groups. [#6042](https://github.com/JabRef/jabref/issues/6042)

From 1f31ca854383fc607a752c2b80b65341586d64c8 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Mon, 1 Feb 2021 23:17:40 +0100
Subject: [PATCH 41/48] Updated class packages

---
 .../gui/preferences/PreferencesDialogViewModel.java   |  3 ++-
 .../gui/preferences/{ => fetcher}/FetcherTab.fxml     |  2 +-
 .../gui/preferences/{ => fetcher}/FetcherTab.java     | 11 +++++------
 .../{ => fetcher}/FetcherTabViewModel.java            |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename src/main/java/org/jabref/gui/preferences/{ => fetcher}/FetcherTab.fxml (96%)
 rename src/main/java/org/jabref/gui/preferences/{ => fetcher}/FetcherTab.java (79%)
 rename src/main/java/org/jabref/gui/preferences/{ => fetcher}/FetcherTabViewModel.java (95%)

diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 1a8233462ac..304336fca56 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -18,6 +18,7 @@
 import org.jabref.gui.preferences.entryeditortabs.CustomEditorFieldsTab;
 import org.jabref.gui.preferences.exporter.ExportCustomizationTab;
 import org.jabref.gui.preferences.external.ExternalTab;
+import org.jabref.gui.preferences.fetcher.FetcherTab;
 import org.jabref.gui.preferences.file.FileTab;
 import org.jabref.gui.preferences.general.GeneralTab;
 import org.jabref.gui.preferences.groups.GroupsTab;
@@ -74,7 +75,7 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
                 new JournalAbbreviationsTab(),
                 new GroupsTab(),
                 new EntryEditorTab(),
-                new FetcherTab(preferences),
+                new FetcherTab(),
                 new CustomEditorFieldsTab(),
                 new CitationKeyPatternTab(),
                 new LinkedFilesTab(),
diff --git a/src/main/java/org/jabref/gui/preferences/FetcherTab.fxml b/src/main/java/org/jabref/gui/preferences/fetcher/FetcherTab.fxml
similarity index 96%
rename from src/main/java/org/jabref/gui/preferences/FetcherTab.fxml
rename to src/main/java/org/jabref/gui/preferences/fetcher/FetcherTab.fxml
index 26dd30fd307..c75d6cbc03e 100644
--- a/src/main/java/org/jabref/gui/preferences/FetcherTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/fetcher/FetcherTab.fxml
@@ -12,7 +12,7 @@
 <?import org.jabref.gui.icon.JabRefIconView?>
 <fx:root spacing="10.0" type="VBox" prefWidth="650.0"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-         fx:controller="org.jabref.gui.preferences.FetcherTab">
+         fx:controller="org.jabref.gui.preferences.fetcher.FetcherTab">
 
     <Label styleClass="titleHeader" text="%Fetcher API keys"/>
 
diff --git a/src/main/java/org/jabref/gui/preferences/FetcherTab.java b/src/main/java/org/jabref/gui/preferences/fetcher/FetcherTab.java
similarity index 79%
rename from src/main/java/org/jabref/gui/preferences/FetcherTab.java
rename to src/main/java/org/jabref/gui/preferences/fetcher/FetcherTab.java
index 614c72e25d7..97f90faaa24 100644
--- a/src/main/java/org/jabref/gui/preferences/FetcherTab.java
+++ b/src/main/java/org/jabref/gui/preferences/fetcher/FetcherTab.java
@@ -1,11 +1,12 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.fetcher;
 
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.preferences.AbstractPreferenceTabView;
+import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
@@ -14,9 +15,7 @@ public class FetcherTab extends AbstractPreferenceTabView<FetcherTabViewModel> i
     @FXML private CheckBox useWorldcatKey;
     @FXML private TextField worldcatKey;
 
-    public FetcherTab(PreferencesService preferences) {
-        this.preferences = preferences;
-
+    public FetcherTab() {
         ViewLoader.view(this)
                   .root(this)
                   .load();
@@ -24,7 +23,7 @@ public FetcherTab(PreferencesService preferences) {
 
     @FXML
     private void initialize() {
-        viewModel = new FetcherTabViewModel(preferences);
+        viewModel = new FetcherTabViewModel(preferencesService);
 
         useWorldcatKey.selectedProperty().bindBidirectional(viewModel.getUseWorldcatKeyProperty());
         worldcatKey.textProperty().bindBidirectional(viewModel.getWorldcatKeyProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java b/src/main/java/org/jabref/gui/preferences/fetcher/FetcherTabViewModel.java
similarity index 95%
rename from src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java
rename to src/main/java/org/jabref/gui/preferences/fetcher/FetcherTabViewModel.java
index 97b3c2c0c51..2d3d2e737b2 100644
--- a/src/main/java/org/jabref/gui/preferences/FetcherTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/fetcher/FetcherTabViewModel.java
@@ -1,4 +1,4 @@
-package org.jabref.gui.preferences;
+package org.jabref.gui.preferences.fetcher;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -11,6 +11,7 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.importer.FetcherApiPreferences;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;

From 3ff24fb084c8ae6f740b41f2ea7f0829eb5ad02e Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 10 Feb 2021 22:47:08 +0100
Subject: [PATCH 42/48] Added WorldCat key secret to BuildInfo and fixed some
 minor IDE suggestions

---
 .github/workflows/deployment.yml              |  1 +
 build.gradle                                  | 51 ++++++++++---------
 docs/advanced-reading/fetchers.md             |  1 +
 .../java/org/jabref/logic/util/BuildInfo.java |  2 +
 src/main/resources/build.properties           |  1 +
 5 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 99248cad847..13f4d864374 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -20,6 +20,7 @@ env:
   SpringerNatureAPIKey: ${{ secrets.SpringerNatureAPIKey }}
   AstrophysicsDataSystemAPIKey: ${{ secrets.AstrophysicsDataSystemAPIKey }}
   IEEEAPIKey: ${{ secrets.IEEEAPIKey }}
+  WorldCatAPIKey: ${{ secrets.WorldCatAPIKey }}
   OSXCERT: ${{ secrets.OSX_SIGNING_CERT }}
 
 jobs:
diff --git a/build.gradle b/build.gradle
index b3b3f16fd2c..29ae199f644 100644
--- a/build.gradle
+++ b/build.gradle
@@ -281,7 +281,8 @@ processResources {
                 "azureInstrumentationKey": System.getenv('AzureInstrumentationKey') ? System.getenv('AzureInstrumentationKey') : '',
                 "springerNatureAPIKey": System.getenv('SpringerNatureAPIKey') ? System.getenv('SpringerNatureAPIKey') : '',
                 "astrophysicsDataSystemAPIKey": System.getenv('AstrophysicsDataSystemAPIKey') ? System.getenv('AstrophysicsDataSystemAPIKey') : '',
-                "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : ''
+                "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : '',
+                "worldCatAPIKey": System.getenv('worldCatAPIKey') ? System.getenv('worldCatAPIKey') : ''
         )
         filteringCharset = 'UTF-8'
     }
@@ -570,30 +571,30 @@ jlink {
     // The module descriptor automatically generated by the plugin for the merged module contained some invalid entries.
     // Execute ./gradlew suggestMergedModuleInfo and include the suggested directives here.
     mergedModule {
-        requires 'java.compiler';
-        requires 'java.datatransfer';
-        requires 'java.desktop';
-        requires 'java.logging';
-        requires 'java.management';
-        requires 'java.naming';
-        requires 'java.net.http';
-        requires 'java.scripting';
-        requires 'java.security.jgss';
-        requires 'java.security.sasl';
-        requires 'java.sql';
-        requires 'java.sql.rowset';
-        requires 'java.transaction.xa';
-        requires 'java.rmi';
-        requires 'java.xml';
-        requires 'jdk.jfr';
-        requires 'jdk.jsobject';
-        requires 'jdk.unsupported';
-        requires 'jdk.unsupported.desktop';
-        requires 'jdk.security.jgss';
-        requires 'jdk.xml.dom';
-        requires 'com.google.gson';
-        requires 'com.sun.xml.fastinfoset';
-        requires 'com.sun.xml.txw2';
+        requires 'java.compiler'
+        requires 'java.datatransfer'
+        requires 'java.desktop'
+        requires 'java.logging'
+        requires 'java.management'
+        requires 'java.naming'
+        requires 'java.net.http'
+        requires 'java.scripting'
+        requires 'java.security.jgss'
+        requires 'java.security.sasl'
+        requires 'java.sql'
+        requires 'java.sql.rowset'
+        requires 'java.transaction.xa'
+        requires 'java.rmi'
+        requires 'java.xml'
+        requires 'jdk.jfr'
+        requires 'jdk.jsobject'
+        requires 'jdk.unsupported'
+        requires 'jdk.unsupported.desktop'
+        requires 'jdk.security.jgss'
+        requires 'jdk.xml.dom'
+        requires 'com.google.gson'
+        requires 'com.sun.xml.fastinfoset'
+        requires 'com.sun.xml.txw2'
         requires 'org.slf4j'
         uses 'org.apache.logging.log4j.util.PropertySource'
         uses 'org.apache.logging.log4j.core.util.WatchEventService'
diff --git a/docs/advanced-reading/fetchers.md b/docs/advanced-reading/fetchers.md
index 3903cb2d4e7..9ca3ee2d17e 100644
--- a/docs/advanced-reading/fetchers.md
+++ b/docs/advanced-reading/fetchers.md
@@ -9,6 +9,7 @@ Fetchers are the implementation of the [search using online services](https://do
 | [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database/ads) | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token) | `AstrophysicsDataSystemAPIKey` | 5000 calls/day |
 | [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database/springer) | [Springer Nature API Portal](https://dev.springernature.com/) | `SpringerNatureAPIKey` | 5000 calls/day |
 | [Zentralblatt Math](https://www.zbmath.org/) | \(none\) | \(none\) | Depending on the current network |
+| [WorldCat](https://www.worldcat.org/) | [OCLC Developer Network](https://authn.sd00.worldcat.org/wayf/metaauth-ui/cmnd/protocol/samlpost) | `worldCatAPIKey` | \(none\) | 
 
 "Depending on the current network" means that it depends whether your request is routed through a network having paid access. For instance, some universities have subscriptions to MathSciNet.
 
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 529772854b5..d8a85ae5f9c 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -26,6 +26,7 @@ public final class BuildInfo {
     public final String springerNatureAPIKey;
     public final String astrophysicsDataSystemAPIKey;
     public final String ieeeAPIKey;
+    public final String worldCatAPIKey;
     public final String minRequiredJavaVersion;
     public final boolean allowJava9;
 
@@ -53,6 +54,7 @@ public BuildInfo(String path) {
         springerNatureAPIKey = BuildInfo.getValue(properties, "springerNatureAPIKey", "118d90a519d0fc2a01ee9715400054d4");
         astrophysicsDataSystemAPIKey = BuildInfo.getValue(properties, "astrophysicsDataSystemAPIKey", "tAhPRKADc6cC26mZUnAoBt3MAjCvKbuCZsB4lI3c");
         ieeeAPIKey = BuildInfo.getValue(properties, "ieeeAPIKey", "5jv3wyt4tt2bwcwv7jjk7pc3");
+        worldCatAPIKey = BuildInfo.getValue(properties, "worldCatAPIKey", "");
         minRequiredJavaVersion = properties.getProperty("minRequiredJavaVersion", "1.8");
         allowJava9 = "true".equals(properties.getProperty("allowJava9", "true"));
     }
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
index ec86a4cab54..4a7b1d460fa 100644
--- a/src/main/resources/build.properties
+++ b/src/main/resources/build.properties
@@ -5,3 +5,4 @@ azureInstrumentationKey=${azureInstrumentationKey}
 springerNatureAPIKey=${springerNatureAPIKey}
 astrophysicsDataSystemAPIKey=${astrophysicsDataSystemAPIKey}
 ieeeAPIKey=${ieeeAPIKey}
+worldCatAPIKey=${worldCatAPIKey}

From 194e3a89b42646f2942e517334fa822745efa91c Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Thu, 11 Feb 2021 19:13:29 +0100
Subject: [PATCH 43/48] Fixed http 505 response from server

---
 .../org/jabref/logic/importer/fetcher/WorldcatFetcher.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 11e1a4062fb..e223233aa5d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -6,6 +6,8 @@
 import java.io.StringWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -60,7 +62,7 @@ public String getName() {
      * @return the earch query for the api
      */
     private String getOpenSearchURL(String title) throws MalformedURLException {
-        String query = "&q=srw.ti+all+\"" + title + "\"";
+        String query = "&q=srw.ti+all+" + URLEncoder.encode("\"" + title + "\"", StandardCharsets.UTF_8);
         URL url = new URL(WORLDCAT_OPEN_SEARCH_URL + query);
         return url.toString();
     }

From 6138fc6abe430f5d2a52f00e212401c7d7bd16dd Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Fri, 12 Feb 2021 21:50:20 +0100
Subject: [PATCH 44/48] Fixed dom import error

---
 .../jabref/logic/importer/fetcher/WorldcatFetcher.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index e223233aa5d..54f2cebec10 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -32,6 +32,7 @@
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -88,17 +89,16 @@ private String makeOpenSearchRequest(String title) throws FetcherException {
      * Get more information about a article through its OCLC id. Picks the first
      * element with this tag
      * @param id the oclc id
-     * @return the XML element that contains all tags
+     * @return the Node of the XML element that contains all tags
      */
-    private Element getSpecificInfoOnOCLC(String id) throws IOException {
+    private Node getSpecificInfoOnOCLC(String id) throws IOException {
         URLDownload urlDownload = new URLDownload(WORLDCAT_READ_URL.replace("{OCLC-NUMBER}", id));
         URLDownload.bypassSSLVerification();
         String resp = urlDownload.asString();
 
         Document mainDoc = parse(resp);
-        NodeList parentElemOfTags = mainDoc.getElementsByTagName("oclcdcs");
 
-        return (Element) parentElemOfTags.item(0);
+        return mainDoc.getElementsByTagName("oclcdcs").item(0);
     }
 
      /**
@@ -153,7 +153,7 @@ private Document parseOpenSearchXML(Document doc) throws FetcherException {
                 Element xmlEntry = (Element) entryXMLList.item(i);
 
                 String oclc = xmlEntry.getElementsByTagName("oclcterms:recordIdentifier").item(0).getTextContent();
-                Element detailedInfo = getSpecificInfoOnOCLC(oclc);
+                Element detailedInfo = (Element) newDoc.importNode(getSpecificInfoOnOCLC(oclc), true);
 
                 Element newEntry = newDoc.createElement("entry");
                 newEntry.appendChild(detailedInfo);

From 6503f8774e3ecc11fa206033732eee445f7e3ed6 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Sat, 13 Feb 2021 11:49:39 +0100
Subject: [PATCH 45/48] Changed to use secret api key as default

---
 .../org/jabref/logic/importer/fetcher/WorldcatFetcher.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
index 54f2cebec10..cc29203000c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
@@ -26,9 +26,11 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.WorldcatImporter;
 import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.strings.StringUtil;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -48,6 +50,10 @@ public class WorldcatFetcher implements EntryBasedFetcher {
     private String WORLDCAT_READ_URL = "https://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
 
     public WorldcatFetcher(String worldcatKey) {
+        if (StringUtil.isBlank(worldcatKey)) {
+            worldcatKey = new BuildInfo().worldCatAPIKey;
+        }
+
         WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
         WORLDCAT_READ_URL += worldcatKey;
     }

From 07d70d261d37a86d80370157199809518d10c660 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Tue, 22 Jun 2021 07:48:46 +0200
Subject: [PATCH 46/48] Fixed merge error

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 49d00e0c691..9e7b525853b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,7 +294,7 @@ processResources {
                 "springerNatureAPIKey": System.getenv('SpringerNatureAPIKey') ? System.getenv('SpringerNatureAPIKey') : '',
                 "astrophysicsDataSystemAPIKey": System.getenv('AstrophysicsDataSystemAPIKey') ? System.getenv('AstrophysicsDataSystemAPIKey') : '',
                 "ieeeAPIKey": System.getenv('IEEEAPIKey') ? System.getenv('IEEEAPIKey') : '',
-                "worldCatAPIKey": System.getenv('worldCatAPIKey') ? System.getenv('worldCatAPIKey') : ''
+                "worldCatAPIKey": System.getenv('worldCatAPIKey') ? System.getenv('worldCatAPIKey') : '',
                 "scienceDirectApiKey": System.getenv('SCIENCEDIRECTAPIKEY') ? System.getenv('SCIENCEDIRECTAPIKEY') : ''
         )
         filteringCharset = 'UTF-8'

From bb6257e85b9ebe80010bcd123c5512ac288991a0 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Wed, 7 Jul 2021 21:01:57 +0200
Subject: [PATCH 47/48] Work in progress

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
---
 docs/advanced-reading/fetchers.md             |  4 +-
 .../importer/fileformat/WorldcatImporter.java | 49 +++++++++----------
 .../importer/fetcher/WorldcatFetcherTest.java |  9 ++--
 3 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/docs/advanced-reading/fetchers.md b/docs/advanced-reading/fetchers.md
index 04c82ead33a..12776591794 100644
--- a/docs/advanced-reading/fetchers.md
+++ b/docs/advanced-reading/fetchers.md
@@ -9,10 +9,10 @@ Fetchers are the implementation of the [search using online services](https://do
 | [SAO/NASA Astrophysics Data System](https://docs.jabref.org/collect/import-using-online-bibliographic-database#sao-nasa-astrophysics-data-system) | [ADS UI](https://ui.adsabs.harvard.edu/user/settings/token) | `AstrophysicsDataSystemAPIKey` | 5000 calls/day |
 | [ScienceDirect](https://www.sciencedirect.com/) |  | `ScienceDirectApiKey` |  |
 | [Springer Nature](https://docs.jabref.org/collect/import-using-online-bibliographic-database#springer) | [Springer Nature API Portal](https://dev.springernature.com/) | `SpringerNatureAPIKey` | 5000 calls/day |
+| [WorldCat](https://www.worldcat.org/) | [OCLC Developer Network](https://www.oclc.org/developer/develop/authentication/how-to-request-a-wskey.en.html) | `worldCatAPIKey` | \(none\) | 
 | [Zentralblatt Math](https://www.zbmath.org/) | \(none\) | \(none\) | Depending on the current network |
-| [WorldCat](https://www.worldcat.org/) | [OCLC Developer Network](https://authn.sd00.worldcat.org/wayf/metaauth-ui/cmnd/protocol/samlpost) | `worldCatAPIKey` | \(none\) | 
 
-"Depending on the current network" means that it depends whether your request is routed through a network having paid access. For instance, some universities have subscriptions to MathSciNet.
+"Depending on the current network" means that it depends on whether your request is routed through a network having paid access. For instance, some universities have subscriptions to MathSciNet.
 
 On Windows, you have to log-off and log-on to let IntelliJ know about the environment variable change. Execute the gradle task "processResources" in the group "others" within IntelliJ to ensure the values have been correctly written. Now, the fetcher tests should run without issues.
 
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
index 6c28ec8a8fa..d324d1cf484 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -29,6 +30,7 @@ public class WorldcatImporter extends Importer {
 
     /**
      * Parse the reader to an xml document
+     *
      * @param s the reader to be parsed
      * @return XML document representing the content of s
      * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
@@ -59,49 +61,43 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     /**
-     * Get the element of a tag in an XML element. Picks the first element
-     * with this tag
+     * Gets the text content of the given element. If the element was not found, an empty Optional is returned;
+     *
      * @param xml the element do search trough
      * @param tag the tag to find
-     * @return the tag element
-     * @throws NullPointerException if there is no element by this tag
      */
-    private Element getElementByTag(Element xml, String tag) throws NullPointerException {
+    private Optional<String> getElementContent(Element xml, String tag) {
         NodeList nl = xml.getElementsByTagName(tag);
-        return (Element) nl.item(0);
+        if (nl == null) {
+            return Optional.empty();
+        }
+        if (nl.getLength() == 0) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(nl.item(0).getTextContent());
     }
 
     /**
      * Parse the xml entry to a bib entry
+     *
      * @param xmlEntry the XML element from open search
      * @return the correspoinding bibentry
      */
     private BibEntry xmlEntryToBibEntry(Element xmlEntry) {
-        String authors = getElementByTag(xmlEntry, "dc:creator").getTextContent();
-
-        String title = getElementByTag(xmlEntry, "dc:title").getTextContent();
-
-        String oclcNr = getElementByTag(xmlEntry, "oclcterms:recordIdentifie").getTextContent();
-        String url = "http://worldcat.org/oclc/" + oclcNr;
+        BibEntry result = new BibEntry();
 
-        String date = getElementByTag(xmlEntry, "dc:date").getTextContent();
+        getElementContent(xmlEntry, "dc:creator").ifPresent(content -> result.setField(StandardField.AUTHOR, content));
+        getElementContent(xmlEntry, "dc:title").ifPresent(content -> result.setField(StandardField.TITLE, content));
+        getElementContent(xmlEntry, "dc:date").ifPresent(content -> result.setField(StandardField.YEAR, content));
+        getElementContent(xmlEntry, "dc:publisher").ifPresent(content -> result.setField(StandardField.PUBLISHER, content));
+        getElementContent(xmlEntry, "dc:recordIdentifier").ifPresent(content -> result.setField(StandardField.URL, "http://worldcat.org/oclc/" + content));
 
-        String publisher = getElementByTag(xmlEntry, "dc:publisher").getTextContent();
-
-        BibEntry entry = new BibEntry();
-
-        entry.setField(StandardField.AUTHOR, authors);
-        entry.setField(StandardField.TITLE, title);
-        entry.setField(StandardField.URL, url);
-        entry.setField(StandardField.YEAR, date);
-        entry.setField(StandardField.JOURNAL, publisher);
-
-        return entry;
+        return result;
     }
 
     /**
-     * Parse an XML documents with open search entries to a parserResult of
-     * the bibentries
+     * Parse an XML documents with open search entries to a parserResult of the bibentries
+     *
      * @param doc the main XML document from open search
      * @return the ParserResult containing the BibEntries collection
      */
@@ -139,5 +135,4 @@ public FileType getFileType() {
     public String getDescription() {
         return DESCRIPTION;
     }
-
 }
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
index 085b8be9a2d..345495dbaaa 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.jabref.logic.importer.FetcherException;
@@ -10,8 +11,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @FetcherTest
 public class WorldcatFetcherTest {
@@ -29,14 +30,12 @@ public void testPerformSearchForBadTitle() throws FetcherException {
         // Mashing keyboard. Verified on https://platform.worldcat.org/api-explorer/apis/wcapi/Bib/OpenSearch
         entry.setField(StandardField.TITLE, "ASDhbsdfnm");
         List<BibEntry> list = fetcher.performSearch(entry);
-        assertTrue(list.isEmpty());
+        assertEquals(Collections.emptyList(), list);
     }
 
     @Test
     public void testPerformSearchForExistingTitle() throws FetcherException {
-        BibEntry entry = new BibEntry();
-        // Example "The very best of Glenn Miller". Verified on same link as above
-        entry.setField(StandardField.TITLE, "The very best of Glenn");
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "Markdown architectural decision records: Format and tool support");
         List<BibEntry> list = fetcher.performSearch(entry);
         assertFalse(list.isEmpty());
     }

From c59235d709330731cf5bbf125bb690fdcf1f6303 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <cc.snethlage@gmail.com>
Date: Thu, 8 Jul 2021 00:22:28 +0200
Subject: [PATCH 48/48] Work in Progress

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
---
 .../jabref/logic/importer/WebFetchers.java    |   4 +-
 ...ldcatFetcher.java => WorldCatFetcher.java} | 121 +++++++++---------
 ...catImporter.java => WorldCatImporter.java} |   6 +-
 ...cherTest.java => WorldCatFetcherTest.java} |   4 +-
 .../fileformat/WorldcatImporterTest.java      |   4 +-
 5 files changed, 70 insertions(+), 69 deletions(-)
 rename src/main/java/org/jabref/logic/importer/fetcher/{WorldcatFetcher.java => WorldCatFetcher.java} (68%)
 rename src/main/java/org/jabref/logic/importer/fileformat/{WorldcatImporter.java => WorldCatImporter.java} (97%)
 rename src/test/java/org/jabref/logic/importer/fetcher/{WorldcatFetcherTest.java => WorldCatFetcherTest.java} (95%)

diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 37b1391036e..b5c909428a4 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -36,7 +36,7 @@
 import org.jabref.logic.importer.fetcher.SpringerFetcher;
 import org.jabref.logic.importer.fetcher.SpringerLink;
 import org.jabref.logic.importer.fetcher.TitleFetcher;
-import org.jabref.logic.importer.fetcher.WorldcatFetcher;
+import org.jabref.logic.importer.fetcher.WorldCatFetcher;
 import org.jabref.logic.importer.fetcher.ZbMATH;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
@@ -141,7 +141,7 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImportFormatPre
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new CrossRef());
-        set.add(new WorldcatFetcher(fetcherApiPreferences.getWorldcatKey()));
+        set.add(new WorldCatFetcher(fetcherApiPreferences.getWorldcatKey()));
         set.add(new ZbMATH(importFormatPreferences));
         return set;
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java b/src/main/java/org/jabref/logic/importer/fetcher/WorldCatFetcher.java
similarity index 68%
rename from src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
rename to src/main/java/org/jabref/logic/importer/fetcher/WorldCatFetcher.java
index cc29203000c..a11063ef895 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/WorldcatFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/WorldCatFetcher.java
@@ -8,7 +8,7 @@
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
@@ -24,10 +24,9 @@
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
-import org.jabref.logic.importer.fileformat.WorldcatImporter;
+import org.jabref.logic.importer.fileformat.WorldCatImporter;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.util.BuildInfo;
-import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
@@ -40,22 +39,22 @@
 import org.xml.sax.SAXException;
 
 /**
- * EntryBasedFetcher that searches the Worldcat database
+ * EntryBasedFetcher that searches the WorldCat database
  *
- * @see <a href="https://www.oclc.org/developer/develop/web-services/worldcat-search-api/bibliographic-resource.en.html">Worldcat API documentation</a>
+ * @see <a href="https://www.oclc.org/developer/develop/web-services/worldcat-search-api/bibliographic-resource.en.html">Worldcat
+ * API documentation</a>
  */
-public class WorldcatFetcher implements EntryBasedFetcher {
+public class WorldCatFetcher implements EntryBasedFetcher {
 
     private String WORLDCAT_OPEN_SEARCH_URL = "https://www.worldcat.org/webservices/catalog/search/opensearch?wskey=";
     private String WORLDCAT_READ_URL = "https://www.worldcat.org/webservices/catalog/content/{OCLC-NUMBER}?recordSchema=info%3Asrw%2Fschema%2F1%2Fdc&wskey=";
 
-    public WorldcatFetcher(String worldcatKey) {
-        if (StringUtil.isBlank(worldcatKey)) {
-            worldcatKey = new BuildInfo().worldCatAPIKey;
+    public WorldCatFetcher(String worldCatKey) {
+        if (StringUtil.isBlank(worldCatKey)) {
+            worldCatKey = new BuildInfo().worldCatAPIKey;
         }
-
-        WORLDCAT_OPEN_SEARCH_URL += worldcatKey;
-        WORLDCAT_READ_URL += worldcatKey;
+        WORLDCAT_OPEN_SEARCH_URL += worldCatKey;
+        WORLDCAT_READ_URL += worldCatKey;
     }
 
     @Override
@@ -65,6 +64,7 @@ public String getName() {
 
     /**
      * Create a open search query with specified title
+     *
      * @param title the title to include in the query
      * @return the earch query for the api
      */
@@ -75,7 +75,8 @@ private String getOpenSearchURL(String title) throws MalformedURLException {
     }
 
     /**
-     * Make request to open search API of Worldcat, with specified title
+     * Make request to open search API of WorlCcat, with specified title
+     *
      * @param title the title of the search
      * @return the body of the HTTP response
      */
@@ -91,9 +92,9 @@ private String makeOpenSearchRequest(String title) throws FetcherException {
         }
     }
 
-     /**
-     * Get more information about a article through its OCLC id. Picks the first
-     * element with this tag
+    /**
+     * Get more information about a article through its OCLC id. Picks the first element with this tag
+     *
      * @param id the oclc id
      * @return the Node of the XML element that contains all tags
      */
@@ -107,30 +108,28 @@ private Node getSpecificInfoOnOCLC(String id) throws IOException {
         return mainDoc.getElementsByTagName("oclcdcs").item(0);
     }
 
-     /**
+    /**
      * Parse a string to an xml document
+     *
      * @param s the string to be parsed
      * @return XML document representing the content of s
-     * @throws IllegalArgumentException if s is badly formated or other exception occurs during parsing
+     * @throws IllegalArgumentException if s is badly formatted or other exception occurs during parsing
      */
-    private Document parse(String s) {
+    private Document parse(String s) throws IOException {
         try (BufferedReader r = new BufferedReader(new StringReader(s))) {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();
 
             return builder.parse(new InputSource(r));
         } catch (ParserConfigurationException e) {
-            throw new IllegalArgumentException("Parser Config Exception: " + e.getMessage(), e);
+            throw new IOException("Parser Config Exception", e);
         } catch (SAXException e) {
-            throw new IllegalArgumentException("SAX Exception: " + e.getMessage(), e);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("IO Exception: " + e.getMessage(), e);
+            throw new IOException("SAX Exception", e);
         }
     }
 
     /**
-     * Parse OpenSearch XML to retrieve OCLC-ids and fetch details about those.
-     * Returns new XML doc in the form
+     * Parse OpenSearch XML to retrieve OCLC-ids and fetch details about those. Returns new XML doc in the form
      * <pre>
      * {@literal <entries>}
      *      {@literal <entry>}
@@ -139,8 +138,9 @@ private Document parse(String s) {
      *      ...
      * {@literal </entries>}
      * </pre>
+     *
      * @param doc the open search result
-     * @return  the new xml document
+     * @return the new xml document
      * @throws FetcherException if the fetcher fails to parse the result
      */
     private Document parseOpenSearchXML(Document doc) throws FetcherException {
@@ -168,50 +168,51 @@ private Document parseOpenSearchXML(Document doc) throws FetcherException {
             }
             return newDoc;
         } catch (ParserConfigurationException e) {
-            throw new FetcherException("Error with XML creation (Worldcat fetcher)", e);
+            throw new FetcherException("Error with XML creation (WorldCat fetcher)", e);
         } catch (IOException e) {
-            throw new FetcherException("Error with OCLC parsing (Worldcat fetcher)", e);
+            throw new FetcherException("Error with OCLC parsing (WorldCat fetcher)", e);
         }
     }
 
     @Override
     public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> entryTitle = entry.getLatexFreeField(StandardField.TITLE);
-        if (entryTitle.isPresent()) {
-            String openSearchXMLResponse = makeOpenSearchRequest(entryTitle.get());
-            Document openSearchDocument = parse(openSearchXMLResponse);
-
-            Document detailedXML = parseOpenSearchXML(openSearchDocument);
-            String detailedXMLString;
-            try (StringWriter sw = new StringWriter()) {
-                // Transform XML to String
-                TransformerFactory tf = TransformerFactory.newInstance();
-                Transformer t = tf.newTransformer();
-                t.transform(new DOMSource(detailedXML), new StreamResult(sw));
-                detailedXMLString = sw.toString();
-            } catch (TransformerException e) {
-                throw new FetcherException("Could not transform XML", e);
-            } catch (IOException e) {
-                throw new FetcherException("Could not close StringWriter", e);
-            }
+        if (entryTitle.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        String openSearchXMLResponse = makeOpenSearchRequest(entryTitle.get());
+        Document openSearchDocument = null;
+        try {
+            openSearchDocument = parse(openSearchXMLResponse);
+        } catch (IOException e) {
+            throw new FetcherException("Could not parse response", e);
+        }
+
+        Document detailedXML = parseOpenSearchXML(openSearchDocument);
+        String detailedXMLString;
+        try (StringWriter sw = new StringWriter()) {
+            // Transform XML to String
+            TransformerFactory tf = TransformerFactory.newInstance();
+            Transformer t = tf.newTransformer();
+            t.transform(new DOMSource(detailedXML), new StreamResult(sw));
+            detailedXMLString = sw.toString();
+        } catch (TransformerException e) {
+            throw new FetcherException("Could not transform XML", e);
+        } catch (IOException e) {
+            throw new FetcherException("Could not close StringWriter", e);
+        }
 
-            WorldcatImporter importer = new WorldcatImporter();
-            ParserResult parserResult;
-            try {
-                if (importer.isRecognizedFormat(detailedXMLString)) {
-                    parserResult = importer.importDatabase(detailedXMLString);
-                } else {
-                    // For displaying An ErrorMessage
-                    BibDatabase errorBibDataBase = new BibDatabase();
-                    parserResult = new ParserResult(errorBibDataBase);
-                }
+        WorldCatImporter importer = new WorldCatImporter();
+        try {
+            if (importer.isRecognizedFormat(detailedXMLString)) {
+                ParserResult parserResult = importer.importDatabase(detailedXMLString);
                 return parserResult.getDatabase().getEntries();
-            } catch (IOException e) {
-                throw new FetcherException("Could not perform search (Worldcat) ", e);
+            } else {
+                return Collections.emptyList();
             }
-        } else {
-            return new ArrayList<>();
+        } catch (IOException e) {
+            throw new FetcherException("Could not perform search (WorldCat) ", e);
         }
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/WorldCatImporter.java
similarity index 97%
rename from src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
rename to src/main/java/org/jabref/logic/importer/fileformat/WorldCatImporter.java
index d324d1cf484..8c7a351654d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/WorldcatImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/WorldCatImporter.java
@@ -23,10 +23,10 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-public class WorldcatImporter extends Importer {
+public class WorldCatImporter extends Importer {
 
-    private static final String DESCRIPTION = "Importer for Worldcat Open Search XML format";
-    private static final String NAME = "WorldcatImporter";
+    private static final String DESCRIPTION = "Importer for WorldCat Open Search XML format";
+    private static final String NAME = "WorldCatImporter";
 
     /**
      * Parse the reader to an xml document
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/WorldCatFetcherTest.java
similarity index 95%
rename from src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
rename to src/test/java/org/jabref/logic/importer/fetcher/WorldCatFetcherTest.java
index 345495dbaaa..c6d353d4747 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/WorldcatFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/WorldCatFetcherTest.java
@@ -15,9 +15,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 @FetcherTest
-public class WorldcatFetcherTest {
+public class WorldCatFetcherTest {
 
-    private WorldcatFetcher fetcher;
+    private WorldCatFetcher fetcher;
 
     @BeforeEach
     public void setUp() {
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
index a570853d17e..b3964c2f506 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/WorldcatImporterTest.java
@@ -19,7 +19,7 @@
 
 public class WorldcatImporterTest {
 
-    WorldcatImporter importer;
+    WorldCatImporter importer;
 
     private String getFilePath(String filename) throws IOException {
         Predicate<String> filePredicate = name -> name.startsWith(filename) && name.endsWith(".xml");
@@ -45,7 +45,7 @@ private static Path getPath(String fileName) throws IOException {
 
     @BeforeEach
     public void setUp() {
-        importer = new WorldcatImporter();
+        importer = new WorldCatImporter();
 
     }