Add testing interface, including a set of capabilities to tests for

config/checkstyle/checkstyle.xml

@@ -12,7 +12,9 @@
 
     <!-- BeforeExecutionFileFilters is required for sources that are based on java14 -->
     <module name="BeforeExecutionExclusionFileFilter">
-      <property name="fileNamePattern" value="AuthorAndsReplacer.java|EntryTypeView.java|MainTableFieldValueFormatter.java|Ordinal.java" />
+        <property
+                name="fileNamePattern"
+                value="AuthorAndsReplacer.java|EntryTypeView.java|IEEE.java|MainTableFieldValueFormatter.java|Ordinal.java"/>
     </module>
 
     <module name="SuppressionFilter">

src/main/java/org/jabref/logic/importer/AdvancedSearchBasedParserFetcher.java

@@ -0,0 +1,38 @@
+package org.jabref.logic.importer;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+
+import org.jabref.logic.importer.fetcher.ComplexSearchQuery;
+import org.jabref.model.entry.BibEntry;
+
+/**
+ * This interface allows SearchBasedParserFetcher fetchers to test their corresponding
+ * library APIs for their advanced search options, e.g. search in the "title" field.
+ */
+public interface AdvancedSearchBasedParserFetcher extends SearchBasedParserFetcher {
+
+    /**
+     * This method is used to send queries with advanced URL parameters.
+     * This method is necessary as the performSearch method does not support certain URL parameters that are used for
+     * fielded search, such as a title, author, or year parameter.
+     *
+     * @param complexSearchQuery the search query defining all fielded search parameters
+     */
+    default List<BibEntry> performComplexSearchQuery(ComplexSearchQuery complexSearchQuery) throws FetcherException {
+        try (InputStream stream = getUrlDownload(getComplexQueryURL(complexSearchQuery)).asInputStream()) {
+            List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
+            fetchedEntries.forEach(this::doPostCleanup);
+            return fetchedEntries;
+        } catch (IOException e) {
+            // TODO: Catch HTTP Response 401/403 errors and report that user has no rights to access resource
+            throw new FetcherException("A network error occurred", e);
+        } catch (ParseException e) {
+            throw new FetcherException("An internal parser error occurred", e);
+        }
+    }
+
+    URL getComplexQueryURL(ComplexSearchQuery complexSearchQuery);
+}

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

@@ -158,7 +158,7 @@ private List<ArXivEntry> searchForEntries(String searchQuery) throws FetcherExce
     }
 
     private List<ArXivEntry> queryApi(String searchQuery, List<ArXivIdentifier> ids, int start, int maxResults)
-        throws FetcherException {
+            throws FetcherException {
         Document result = callApi(searchQuery, ids, start, maxResults);
         List<Node> entries = XMLUtil.asList(result.getElementsByTagName("entry"));
 

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

@@ -0,0 +1,126 @@
+package org.jabref.logic.importer.fetcher;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.jabref.model.strings.StringUtil;
+
+public class ComplexSearchQuery {
+    // Field for non-fielded search
+    private final String defaultField;
+    private final String author;
+    private final String title;
+    private final Integer fromYear;
+    private final Integer toYear;
+    private final String journal;
+
+    private ComplexSearchQuery(String defaultField, String author, String title, Integer fromYear, Integer toYear, String journal) {
+        this.defaultField = defaultField;
+        this.author = author;
+        this.title = title;
+        this.fromYear = fromYear;
+        this.toYear = toYear;
+        this.journal = journal;
+    }
+
+    public Optional<String> getDefaultField() {
+        return Optional.ofNullable(defaultField);
+    }
+
+    public Optional<String> getAuthor() {
+        return Optional.ofNullable(author);
+    }
+
+    public Optional<String> getTitle() {
+        return Optional.ofNullable(title);
+    }
+
+    public Optional<Integer> getFromYear() {
+        return Optional.ofNullable(fromYear);
+    }
+
+    public Optional<Integer> getToYear() {
+        return Optional.ofNullable(toYear);
+    }
+
+    public Optional<String> getJournal() {
+        return Optional.ofNullable(journal);
+    }
+
+    public static AdvancedSearchConfigBuilder builder() {
+        return new AdvancedSearchConfigBuilder();
+    }
+
+    public static class AdvancedSearchConfigBuilder {
+        private String defaultField;
+        private String author;
+        private String title;
+        private String journal;
+        private Integer fromYear;
+        private Integer toYear;
+
+        public AdvancedSearchConfigBuilder() {
+        }
+
+        public AdvancedSearchConfigBuilder defaultField(String defaultField) {
+            if (Objects.requireNonNull(defaultField).isBlank()) {
+                throw new IllegalArgumentException("Parameter must not be blank");
+            }
+            this.defaultField = defaultField;
+            return this;
+        }
+
+        public AdvancedSearchConfigBuilder author(String author) {
+            if (Objects.requireNonNull(author).isBlank()) {
+                throw new IllegalArgumentException("Parameter must not be blank");
+            }
+            this.author = author;
+            return this;
+        }
+
+        public AdvancedSearchConfigBuilder title(String title) {
+            if (Objects.requireNonNull(title).isBlank()) {
+                throw new IllegalArgumentException("Parameter must not be blank");
+            }
+            this.title = title;
+            return this;
+        }
+
+        public AdvancedSearchConfigBuilder fromYear(Integer fromYear) {
+            this.fromYear = Objects.requireNonNull(fromYear);
+            return this;
+        }
+
+        public AdvancedSearchConfigBuilder toYear(Integer toYear) {
+            this.toYear = Objects.requireNonNull(toYear);
+            return this;
+        }
+
+        public AdvancedSearchConfigBuilder journal(String journal) {
+            if (Objects.requireNonNull(journal).isBlank()) {
+                throw new IllegalArgumentException("Parameter must not be blank");
+            }
+            this.journal = journal;
+            return this;
+        }
+
+        /**
+         * Instantiates the AdvancesSearchConfig from the provided Builder parameters
+         * If all text fields are empty an empty optional is returned
+         *
+         * @return AdvancedSearchConfig instance with the fields set to the values defined in the building instance.
+         * @throws IllegalStateException An IllegalStateException is thrown in case all text search fields are empty.
+         *                               See: https://softwareengineering.stackexchange.com/questions/241309/builder-pattern-when-to-fail/241320#241320
+         */
+        public ComplexSearchQuery build() throws IllegalStateException {
+            if (textSearchFieldsAreEmpty()) {
+                throw new IllegalStateException("At least one text field has to be set");
+            }
+            return new ComplexSearchQuery(defaultField, author, title, fromYear, toYear, journal);
+        }
+
+        private boolean textSearchFieldsAreEmpty() {
+            return StringUtil.isBlank(defaultField) && StringUtil.isBlank(title) && StringUtil.isBlank(author) && StringUtil.isBlank(journal);
+        }
+    }
+}

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

@@ -16,6 +16,7 @@
 import java.util.stream.Collectors;
 
 import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.importer.AdvancedSearchBasedParserFetcher;
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.Parser;
@@ -42,7 +43,7 @@
  *
  * @implNote <a href="https://developer.ieee.org/docs">API documentation</a>
  */
-public class IEEE implements FulltextFetcher, SearchBasedParserFetcher {
+public class IEEE implements FulltextFetcher, SearchBasedParserFetcher, AdvancedSearchBasedParserFetcher {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(IEEE.class);
     private static final String STAMP_BASE_STRING_DOCUMENT = "/stamp/stamp.jsp?tp=&arnumber=";
@@ -67,18 +68,10 @@ private static BibEntry parseJsonRespone(JSONObject jsonEntry, Character keyword
         BibEntry entry = new BibEntry();
 
         switch (jsonEntry.optString("content_type")) {
-            case "Books":
-                entry.setType(StandardEntryType.Book);
-                break;
-            case "Conferences":
-                entry.setType(StandardEntryType.InProceedings);
-                break;
-            case "Courses":
-                entry.setType(StandardEntryType.Misc);
-                break;
-            default:
-                entry.setType(StandardEntryType.Article);
-                break;
+            case "Books" -> entry.setType(StandardEntryType.Book);
+            case "Conferences" -> entry.setType(StandardEntryType.InProceedings);
+            case "Courses" -> entry.setType(StandardEntryType.Misc);
+            default -> entry.setType(StandardEntryType.Article);
         }
 
         entry.setField(StandardField.ABSTRACT, jsonEntry.optString("abstract"));
@@ -236,4 +229,24 @@ public String getName() {
     public Optional<HelpFile> getHelpPage() {
         return Optional.of(HelpFile.FETCHER_IEEEXPLORE);
     }
+
+    @Override
+    public URL getComplexQueryURL(ComplexSearchQuery complexSearchQuery) {
+        try {
+            URIBuilder uriBuilder = new URIBuilder("https://ieeexploreapi.ieee.org/api/v1/search/articles");
+            uriBuilder.addParameter("apikey", API_KEY);
+            complexSearchQuery.getDefaultField().ifPresent(defaultField -> uriBuilder.addParameter("querytext", defaultField));
+            complexSearchQuery.getAuthor().ifPresent(author -> uriBuilder.addParameter("author", author));
+            complexSearchQuery.getTitle().ifPresent(articleTitle -> uriBuilder.addParameter("article_title", articleTitle));
+            complexSearchQuery.getJournal().ifPresent(journalTitle -> uriBuilder.addParameter("publication_title", journalTitle));
+            complexSearchQuery.getFromYear().map(String::valueOf).ifPresent(year -> uriBuilder.addParameter("start_year", year));
+            complexSearchQuery.getToYear().map(String::valueOf).ifPresent(year -> uriBuilder.addParameter("end_year", year));
+
+            URLDownload.bypassSSLVerification();
+            return uriBuilder.build().toURL();
+        } catch (URISyntaxException | MalformedURLException ex) {
+            LOGGER.error("Error creating URL.", ex);
+            throw new IllegalStateException("Error during creation of URL.", ex);
+        }
+    }
 }

src/main/resources/csl-styles/aerosol-science-and-technology.csl

@@ -8,12 +8,11 @@
     <link href="http://www.tandfonline.com/action/authorSubmission?journalCode=uast20&amp;page=instructions" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
-      <email>obrienpat86@gmail.com</email>
     </author>
     <category citation-format="author-date"/>
     <category field="chemistry"/>
     <issn>0278-6826</issn>
-    <updated>2017-03-29T13:20:23+00:00</updated>
+    <updated>2020-07-09T20:19:32+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
@@ -88,7 +87,7 @@
         <text variable="container-title" form="short"/>
       </else-if>
       <else>
-        <group delimiter=", " prefix=" " suffix=",">
+        <group delimiter=", " prefix=" ">
           <text variable="container-title" form="short"/>
           <text variable="collection-title"/>
         </group>
@@ -97,7 +96,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage">
+      <if type="webpage post post-weblog" match="any">
         <group delimiter=" ">
           <text term="available at" text-case="capitalize-first"/>
           <text variable="URL"/>
@@ -111,6 +110,9 @@
           </group>
         </group>
       </if>
+      <else-if type="article-journal" match="any">
+        <text variable="DOI" prefix="doi:"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="publisher">
@@ -156,7 +158,7 @@
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=":" prefix=" ">
-          <group>
+          <group delimiter=" ">
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
@@ -205,7 +207,7 @@
       <key macro="author"/>
       <key macro="issued" sort="descending"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <group suffix=".">
         <text macro="author" suffix=""/>
         <text macro="issued" prefix=" (" suffix=")"/>

src/main/resources/csl-styles/apa-annotated-bibliography.csl

@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">

src/main/resources/csl-styles/apa-cv.csl

@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">

src/main/resources/csl-styles/apa-no-ampersand.csl

@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">

src/main/resources/csl-styles/apa-single-spaced.csl

@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">

src/main/resources/csl-styles/apa-with-abstract.csl

@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">