Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -593,16 +593,19 @@ Do **not** modify existing headers’ years.
* `mvn -o verify` (long; only when appropriate)
* Slow tests (entire repo):

* `mvn -o verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
* `mvn -o verify -PslowTestsOnly,-skipSlowTests | tail -500`
* Slow tests (by module):

* `mvn -o -pl <module> verify -PslowTestsOnly,-skipSlowTests,-formatting -Dmaven.javadoc.skip -Djapicmp.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
* `mvn -o -pl <module> verify -PslowTestsOnly,-skipSlowTests | tail -500`
* Slow tests (specific test):

* `mvn -o -pl core/sail/shacl -PslowTestsOnly,-skipSlowTests -Dtest=ClassName#method verify | tail -500`
* Integration tests (entire repo):

* `mvn -o verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
* `mvn -o verify -PskipUnitTests | tail -500`
* Integration tests (by module):

* `mvn -o -pl <module> verify -PskipUnitTests,-formatting -Dmaven.javadoc.skip -Denforcer.skip -Danimal.sniffer.skip | tail -500`
* `mvn -o -pl <module> verify -PskipUnitTests | tail -500`
* Useful flags:

* `-Dtest=ClassName`
Expand Down
2 changes: 1 addition & 1 deletion assembly-descriptors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-assembly-descriptors</artifactId>
<name>RDF4J: Assembly Descriptors</name>
Expand Down
2 changes: 1 addition & 1 deletion assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-assembly</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-bom</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion compliance/elasticsearch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-elasticsearch-compliance</artifactId>
<name>RDF4J: Elasticsearch Sail Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion compliance/geosparql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-geosparql-compliance</artifactId>
<name>RDF4J: GeoSPARQL compliance tests</name>
Expand Down
2 changes: 1 addition & 1 deletion compliance/lucene/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-lucene-compliance</artifactId>
<name>RDF4J: Lucene Sail Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion compliance/model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>rdf4j-compliance</artifactId>
<groupId>org.eclipse.rdf4j</groupId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rdf4j-model-compliance</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion compliance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-compliance</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion compliance/repository/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-repository-compliance</artifactId>
<packaging>war</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,4 +524,12 @@ public void testRemoveStatementsFromContextSingleTransaction(IsolationLevel leve
public void testClearStatementsFromContextSingleTransaction(IsolationLevel level) throws Exception {
super.testClearStatementsFromContextSingleTransaction(level);
}

@ParameterizedTest
@MethodSource("parameters")
@Disabled("relies on pending updates being visible in own connection")
@Override
public void testRollbackAfterInterrupt(IsolationLevel level) {
super.testRollbackAfterInterrupt(level);
}
}
2 changes: 1 addition & 1 deletion compliance/rio/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-rio-compliance</artifactId>
<name>RDF4J: Rio compliance tests</name>
Expand Down
2 changes: 1 addition & 1 deletion compliance/solr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-solr-compliance</artifactId>
<name>RDF4J: Solr Sail Tests</name>
Expand Down
2 changes: 1 addition & 1 deletion compliance/sparql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-compliance</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-sparql-compliance</artifactId>
<packaging>war</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-client</artifactId>
<name>RDF4J: Client Libraries</name>
Expand Down
2 changes: 1 addition & 1 deletion core/collection-factory/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-collection-factory</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-collection-factory-api</artifactId>
<name>RDF4J: Collection Factory - API</name>
Expand Down
2 changes: 1 addition & 1 deletion core/collection-factory/mapdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-collection-factory</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-collection-factory-mapdb</artifactId>
<name>RDF4J: Collection Factory - Map DB backed</name>
Expand Down
2 changes: 1 addition & 1 deletion core/collection-factory/mapdb3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-collection-factory</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-collection-factory-mapdb3</artifactId>
<name>RDF4J: Collection Factory - Map DB v3 backed</name>
Expand Down
2 changes: 1 addition & 1 deletion core/collection-factory/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-collection-factory</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/common/annotation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-annotation</artifactId>
<name>RDF4J: common annotation</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/exception/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-exception</artifactId>
<name>RDF4J: common exception</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/io/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-io</artifactId>
<name>RDF4J: common IO</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/iterator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-iterator</artifactId>
<name>RDF4J: common iterators</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,18 @@ private void findNextElement() {
}
}

// We know that nextElement has to be null and that wrappedIter.hasNext() must be true, based on the code
// above. To be sure that these invariants don't change we also assert them below.
assert nextElement == null && wrappedIter.hasNext();

do {
E result;
if (Thread.currentThread().isInterrupted()) {
close();
return;
}
try {
// We know that nextElement has to be null and that wrappedIter.hasNext() must be true, based on the
// code
// above. To be sure that these invariants don't change we also assert them below.
assert nextElement == null && wrappedIter.hasNext();

result = wrappedIter.next();
} catch (NoSuchElementException e) {
close();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@

import java.util.NoSuchElementException;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* An Iteration that looks one element ahead, if necessary, to handle calls to {@link #hasNext}. This is a convenient
* super class for Iterations that have no easy way to tell if there are any more results, but still should implement
* the <var>java.util.Iteration</var> interface.
*/
public abstract class LookAheadIteration<E> extends AbstractCloseableIteration<E> {
private static final Logger log = LoggerFactory.getLogger(LookAheadIteration.class);

/*-----------*
* Variables *
Expand Down Expand Up @@ -50,7 +54,14 @@ public final boolean hasNext() {
return false;
}

return lookAhead() != null;
try {
return lookAhead() != null;
} catch (NoSuchElementException logged) {
// The lookAhead() method shouldn't throw a NoSuchElementException since it should return null when there
// are no more elements.
log.trace("LookAheadIteration threw NoSuchElementException:", logged);
return false;
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion core/common/order/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-order</artifactId>
<name>RDF4J: common order</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/common/text/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-text</artifactId>
<name>RDF4J: common text</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/transaction/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-transaction</artifactId>
<name>RDF4J: common transaction</name>
Expand Down
2 changes: 1 addition & 1 deletion core/common/xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-common</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-common-xml</artifactId>
<name>RDF4J: common XML</name>
Expand Down
2 changes: 1 addition & 1 deletion core/http/client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-http</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-client</artifactId>
<name>RDF4J: HTTP client</name>
Expand Down
2 changes: 1 addition & 1 deletion core/http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/http/protocol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-http</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-http-protocol</artifactId>
<name>RDF4J: HTTP protocol</name>
Expand Down
2 changes: 1 addition & 1 deletion core/model-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model-api</artifactId>
<name>RDF4J: Model API</name>
Expand Down
2 changes: 1 addition & 1 deletion core/model-vocabulary/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model-vocabulary</artifactId>
<name>RDF4J: RDF Vocabularies</name>
Expand Down
2 changes: 1 addition & 1 deletion core/model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-model</artifactId>
<name>RDF4J: Model</name>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-core</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-core</artifactId>
<version>5.1.6-SNAPSHOT</version>
<version>5.1.7-SNAPSHOT</version>
</parent>
<artifactId>rdf4j-query</artifactId>
<name>RDF4J: Query</name>
Expand Down
Loading
Loading