Fix MathSciNet fetcher (#3402)

Author: tobiasdiez

src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java

@@ -12,6 +12,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import org.jabref.logic.cleanup.DoiCleanup;
 import org.jabref.logic.cleanup.MoveFieldCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.importer.EntryBasedParserFetcher;
@@ -50,7 +51,7 @@ public String getName() {
      */
     @Override
     public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("http://www.ams.org/mrlookup");
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mrlookup");
         uriBuilder.addParameter("format", "bibtex");
 
         entry.getFieldOrAlias(FieldName.TITLE).ifPresent(title -> uriBuilder.addParameter("ti", title));
@@ -63,7 +64,7 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
 
     @Override
     public URL getURLForQuery(String query) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("http://www.ams.org/mathscinet/search/publications.html");
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/search/publications.html");
         uriBuilder.addParameter("pg7", "ALLF"); // search all fields
         uriBuilder.addParameter("s7", query); // query
         uriBuilder.addParameter("r", "1"); // start index
@@ -74,7 +75,7 @@ public URL getURLForQuery(String query) throws URISyntaxException, MalformedURLE
 
     @Override
     public URL getURLForID(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("http://www.ams.org/mathscinet/search/publications.html");
+        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/search/publications.html");
         uriBuilder.addParameter("pg1", "MR"); // search MR number
         uriBuilder.addParameter("s1", identifier); // identifier
         uriBuilder.addParameter("fmt", "bibtex"); // BibTeX format
@@ -107,6 +108,7 @@ public void doPostCleanup(BibEntry entry) {
         new MoveFieldCleanup("fjournal", FieldName.JOURNAL).cleanup(entry);
         new MoveFieldCleanup("mrclass", FieldName.KEYWORDS).cleanup(entry);
         new FieldFormatterCleanup("mrreviewer", new ClearFormatter()).cleanup(entry);
+        new DoiCleanup().cleanup(entry);
         new FieldFormatterCleanup(FieldName.URL, new ClearFormatter()).cleanup(entry);
 
         // Remove comments: MathSciNet prepends a <pre> html tag

src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java

@@ -63,17 +63,17 @@ public void searchByEntryFindsEntry() throws Exception {
 
     @Test
     public void searchByQueryFindsEntry() throws Exception {
-        // CI has no subscription to zbMath and thus gets 401 response
+        // CI has no subscription to MathSciNet and thus gets 401 response
         Assume.assumeFalse(DevEnvironment.isCIServer());
 
         List<BibEntry> fetchedEntries = fetcher.performSearch("Existence and uniqueness theorems Two-Dimensional Ericksen Leslie System");
         assertFalse(fetchedEntries.isEmpty());
-        assertEquals(ratiuEntry, fetchedEntries.get(0));
+        assertEquals(ratiuEntry, fetchedEntries.get(1));
     }
 
     @Test
     public void searchByIdFindsEntry() throws Exception {
-        // CI has no subscription to zbMath and thus gets 401 response
+        // CI has no subscription to MathSciNet and thus gets 401 response
         Assume.assumeFalse(DevEnvironment.isCIServer());
 
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3537908");