optimize CompositeIdFetcher.java

Author: colinhex

Diff for: src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java

@@ -8,11 +8,15 @@
 import org.jabref.logic.importer.fetcher.IacrEprintFetcher;
 import org.jabref.logic.importer.fetcher.IsbnFetcher;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.identifier.ArXivIdentifier;
+import org.jabref.model.entry.identifier.DOI;
+import org.jabref.model.entry.identifier.Eprint;
+import org.jabref.model.entry.identifier.ISBN;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CompositeIdFetcher implements IdBasedFetcher {
+public class CompositeIdFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CompositeIdFetcher.class);
 
@@ -22,51 +26,42 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    @Override
     public Optional<BibEntry> performSearchById(String identifier) {
-
-        Optional<BibEntry> fetchedEntry;
-
         try {
-            fetchedEntry = new ArXiv(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (ArXivIdentifier.parse(identifier).isPresent()) {
+                return new ArXiv(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (ISBN.parse(identifier).isPresent()) {
+                return new IsbnFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new DoiFetcher(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (DOI.parse(identifier).isPresent()) {
+                return new DoiFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (DOI.parse(identifier).isPresent()) {
+                return new CrossRef().performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
         }
 
         try {
-            fetchedEntry = new CrossRef().performSearchById(identifier);
-            if (fetchedEntry.isPresent()) {
-                return fetchedEntry;
+            if (Eprint.build(identifier).isPresent()) {
+                return new IacrEprintFetcher(importFormatPreferences).performSearchById(identifier);
             }
         } catch (FetcherException fetcherException) {
             LOGGER.debug(fetcherException.getMessage());
@@ -76,8 +71,4 @@ public Optional<BibEntry> performSearchById(String identifier) {
 
     }
 
-    @Override
-    public String getName() {
-        return "CompositeIdFetcher";
-    }
 }

Diff for: src/test/java/org/jabref/logic/importer/WebFetchersTest.java

@@ -59,9 +59,6 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() throws Exce
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
 
-            // Remove CompositeIdFetcher for now
-            expected.remove(CompositeIdFetcher.class);
-
             assertEquals(expected, getClasses(idFetchers));
         }
     }