Skip to content

Commit

Permalink
Merge pull request #1500 from Fedict/issues/#1148-jdk11-javadoc
Browse files Browse the repository at this point in the history
Fixed javadoc errors/NPE in maven profile
  • Loading branch information
barthanssens authored Aug 13, 2019
2 parents 5a40478 + 0367313 commit 06385c1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@
</goals>
</execution>
</executions>
<configuration>
<source>8</source>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -161,6 +164,9 @@
</goals>
</execution>
</executions>
<configuration>
<source>8</source>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public interface GraphQueryResult extends QueryResult<Statement> {
* The contents of the Map may be modified after it is returned, as the initial return may be performed when the
* first RDF Statement is encountered.
*
* @return a Map<String, String> object containing (prefix, namespace) pairs.
* @return a Map&lt;String, String&gt; object containing (prefix, namespace) pairs.
* @throws QueryEvaluationException
*/
public Map<String, String> getNamespaces() throws QueryEvaluationException;
Expand Down
6 changes: 3 additions & 3 deletions query/src/main/java/org/eclipse/rdf4j/query/Operation.java
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ public interface Operation {
/**
* Specifies the maximum time that an operation is allowed to run. The operation will be interrupted when it exceeds
* the time limit. Any consecutive requests to fetch query results will result in {@link QueryInterruptedException}s
* or {@link UpdateInterruptedException}s (depending on whether the operation is a query or an update).
* or {@link UpdateExecutionException}s (depending on whether the operation is a query or an update).
*
* @param maxQueryTime The maximum query time, measured in seconds. A negative or zero value indicates an unlimited
* execution time (which is the default).
* @param maxExecTime The maximum query time, measured in seconds. A negative or zero value indicates an unlimited
* execution time (which is the default).
*/
public void setMaxExecutionTime(int maxExecTime);

Expand Down
4 changes: 2 additions & 2 deletions query/src/main/java/org/eclipse/rdf4j/query/QueryResults.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public class QueryResults extends Iterations {
* Get a {@link Model} containing all elements obtained from the specified query result.
*
* @param iteration the source iteration to get the statements from. This can be a {@link GraphQueryResult}, a
* {@link RepositoryResult<Statement>}, or any other instance of {@link CloseableIteration
* <Statement>}
* {@link RepositoryResult&lt;Statement&gt;}, or any other instance of {@link CloseableIteration
* &lt;Statement&gt;}
* @return a {@link Model} containing all statements obtained from the specified source iteration.
*/
public static Model asModel(CloseableIteration<? extends Statement, ? extends RDF4JException> iteration)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ public String toString() {
* @param mimeType A MIME type, e.g. "text/plain".
* @param fileFormats The file formats to match the MIME type against.
* @return A FileFormat object if the MIME type was recognized, or {@link Optional#empty()} otherwise.
* @see #matchMIMEType(String, Iterable, FileFormat)
*/
public static <FF extends FileFormat> Optional<FF> matchMIMEType(String mimeType, Iterable<FF> fileFormats) {
// First try to match with the default MIME type
Expand All @@ -325,7 +324,6 @@ public static <FF extends FileFormat> Optional<FF> matchMIMEType(String mimeType
* @param fileName A file name.
* @param fileFormats The file formats to match the file name extension against.
* @return A FileFormat that matches the file name extension, or {@link Optional#empty()} otherwise.
* @see #matchFileName(String, Iterable, FileFormat)
*/
public static <FF extends FileFormat> Optional<FF> matchFileName(String fileName, Iterable<FF> fileFormats) {
// Strip any directory info from the file name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ protected FileFormatServiceRegistry(Class<S> serviceClass) {
*
* @param mimeType A MIME type, e.g. "text/plain".
* @return The matching {@link FileFormat}, or {@link Optional#empty()} if no match was found.
* @see #getFileFormatForMIMEType(String, FileFormat)
*/
public Optional<FF> getFileFormatForMIMEType(String mimeType) {
return FileFormat.matchMIMEType(mimeType, this.getKeys());
Expand All @@ -39,7 +38,6 @@ public Optional<FF> getFileFormatForMIMEType(String mimeType) {
*
* @param fileName A file name.
* @return The matching {@link FileFormat}, or {@link Optional#empty()} if no match was found.
* @see #getFileFormatForFileName(String, FileFormat)
*/
public Optional<FF> getFileFormatForFileName(String fileName) {
return FileFormat.matchFileName(fileName, this.getKeys());
Expand Down

0 comments on commit 06385c1

Please sign in to comment.