Merge remote-tracking branch 'origin/issues/#848-lucene-flex'

- Ref #848

Signed-off-by: Jacek Grzebyta <grzebyta.dev@gmail.com>

Author: jgrzebyta

.travis.yml

@@ -5,6 +5,7 @@ script: mvn verify
 branches:
   only:
   - master
+  - develop
   - /^releases.*$/
 env:
   - MAVEN_OPTS=-Xmx1024M

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/rdfjson/RDFJSONParserCustomTest.java

@@ -24,7 +24,7 @@ public class RDFJSONParserCustomTest {
 	public void testSupportedSettings()
 		throws Exception
 	{
-		assertEquals(17, Rio.createParser(RDFFormat.RDFJSON).getSupportedSettings().size());
+		assertEquals(18, Rio.createParser(RDFFormat.RDFJSON).getSupportedSettings().size());
 	}
 
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/rdfxml/RDFXMLParserCustomTest.java

@@ -223,6 +223,6 @@ public void testParseCommentAtStart()
 	public void testSupportedSettings()
 		throws Exception
 	{
-		assertEquals(21, Rio.createParser(RDFFormat.RDFXML).getSupportedSettings().size());
+		assertEquals(22, Rio.createParser(RDFFormat.RDFXML).getSupportedSettings().size());
 	}
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGParserCustomTest.java

@@ -226,7 +226,7 @@ public void testBadPname02()
 	public void testSupportedSettings()
 		throws Exception
 	{
-		assertEquals(12, Rio.createParser(RDFFormat.TRIG).getSupportedSettings().size());
+		assertEquals(13, Rio.createParser(RDFFormat.TRIG).getSupportedSettings().size());
 	}
 
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/CustomTurtleParserTest.java

@@ -7,19 +7,25 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.rio.turtle;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Collections;
+import java.util.function.Consumer;
 
 import org.eclipse.rdf4j.model.IRI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Model;
 import org.eclipse.rdf4j.model.Namespace;
+import org.eclipse.rdf4j.model.Value;
 import org.eclipse.rdf4j.model.ValueFactory;
 import org.eclipse.rdf4j.model.impl.LinkedHashModel;
 import org.eclipse.rdf4j.model.impl.NamespaceImpl;
+import org.eclipse.rdf4j.model.impl.SimpleValueFactory;
 import org.eclipse.rdf4j.model.impl.ValueFactoryImpl;
 import org.eclipse.rdf4j.model.util.Models;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
@@ -206,7 +212,7 @@ public void testLiteralWithNewlines()
 	public void testSupportedSettings()
 		throws Exception
 	{
-		assertEquals(12, parser.getSupportedSettings().size());
+		assertEquals(13, parser.getSupportedSettings().size());
 	}
 
 	@Test
@@ -507,4 +513,24 @@ public void testParsingNamespacesWithOverride()
 		assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:not_skos:broader"),
 				vf.createIRI("urn:b")));
 	}
+
+	@Test
+	public void test780IRISpace()
+		throws Exception
+	{
+		String ttl = "_:b25978837	a <http://purl.bioontology.org/ontology/UATC/\\u0020SERINE\\u0020\\u0020> .";
+		try {
+			Rio.parse(new StringReader(ttl), "", RDFFormat.TURTLE);
+			fail();
+		}
+		catch (RDFParseException e) {
+			// Invalid IRI
+		}
+		Model model = Rio.parse(new StringReader(ttl), "", RDFFormat.TURTLE,
+				new ParserConfig().set(BasicParserSettings.VERIFY_URI_SYNTAX, false),
+				SimpleValueFactory.getInstance(), new ParseErrorLogger());
+		assertEquals(1, model.size());
+		model.filter(null, RDF.TYPE, null).objects().forEach(obj -> assertEquals(
+				"http://purl.bioontology.org/ontology/UATC/%20SERINE%20%20", obj.stringValue()));
+	}
 }

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTest.java

@@ -7,13 +7,10 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.rio.turtle;
 
-import junit.framework.Test;
-
 import org.eclipse.rdf4j.rio.RDFParser;
-import org.eclipse.rdf4j.rio.helpers.TurtleParserSettings;
 import org.eclipse.rdf4j.rio.ntriples.NTriplesParser;
-import org.eclipse.rdf4j.rio.turtle.TurtleParser;
-import org.eclipse.rdf4j.rio.turtle.TurtleParserTestCase;
+
+import junit.framework.Test;
 
 /**
  * JUnit test for the Turtle parser that uses the tests that are available

compliance/store/src/test/java/org/eclipse/rdf4j/repository/sparql/SPARQLServiceEvaluationTest.java

@@ -26,16 +26,21 @@
 import org.eclipse.rdf4j.query.QueryLanguage;
 import org.eclipse.rdf4j.query.TupleQuery;
 import org.eclipse.rdf4j.query.TupleQueryResult;
+import org.eclipse.rdf4j.query.algebra.evaluation.EvaluationStrategy;
+import org.eclipse.rdf4j.query.algebra.evaluation.federation.FederatedServiceResolverImpl;
+import org.eclipse.rdf4j.query.algebra.evaluation.impl.StrictEvaluationStrategyFactory;
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.RepositoryConnection;
 import org.eclipse.rdf4j.repository.RepositoryException;
 import org.eclipse.rdf4j.repository.http.HTTPMemServer;
 import org.eclipse.rdf4j.repository.http.HTTPRepository;
 import org.eclipse.rdf4j.repository.sail.SailRepository;
-import org.eclipse.rdf4j.rio.RDFFormat;
 import org.eclipse.rdf4j.rio.RDFParseException;
 import org.eclipse.rdf4j.rio.Rio;
+import org.eclipse.rdf4j.sail.Sail;
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
+import org.eclipse.rdf4j.sail.memory.config.MemoryStoreConfig;
+import org.eclipse.rdf4j.sail.memory.config.MemoryStoreFactory;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -100,6 +105,12 @@ public void setUp()
 		localRepository = new SailRepository(new MemoryStore());
 		localRepository.initialize();
 
+		prepareLocalRepository();
+	}
+
+	private void prepareLocalRepository()
+		throws IOException
+	{
 		loadDataSet(localRepository, "/testdata-query/defaultgraph.ttl");
 
 		f = localRepository.getValueFactory();
@@ -199,4 +210,23 @@ else if (alice.equals(x)) {
 			conn.close();
 		}
 	}
+
+	/**
+	 * The provided FederatedServiceResolver should finds it way to the {@link EvaluationStrategy}
+	 */
+	@Test
+	public void testRepositoryConfigurationSetup()
+		throws Exception
+	{
+		tearDown();
+		MemoryStoreFactory factory = new MemoryStoreFactory();
+		MemoryStoreConfig config = new MemoryStoreConfig();
+		config.setEvaluationStrategyFactoryClassName(StrictEvaluationStrategyFactory.class.getName());
+		Sail sail = factory.getSail(config);
+		localRepository = new SailRepository(sail);
+		localRepository.setFederatedServiceResolver(new FederatedServiceResolverImpl());
+		localRepository.initialize();
+		prepareLocalRepository();
+		testSimpleServiceQuery();
+	}
 }

core/config/pom.xml

@@ -32,5 +32,12 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

core/config/src/main/java/org/eclipse/rdf4j/RDF4J.java

@@ -14,9 +14,18 @@
  */
 public class RDF4J {
 
-	private static final String VERSION = MavenUtil.loadVersion("org.eclipse.rdf4j", "rdf4j-config", "dev");
+	private static final String VERSION = loadVersion();
 
 	public final static String getVersion() {
 		return VERSION;
 	}
+
+	private static String loadVersion() {
+		String impl = RDF4J.class.getPackage().getImplementationVersion();
+		if (impl == null) {
+			return MavenUtil.loadVersion("org.eclipse.rdf4j", "rdf4j-config", "dev");
+		} else {
+			return impl;
+		}
+	}
 }

core/config/src/main/java/org/eclipse/rdf4j/common/app/AppVersion.java

@@ -43,6 +43,11 @@ public class AppVersion implements Comparable<AppVersion> {
 	 */
 	private String modifier;
 
+	/**
+	 * The version's build, if any.
+	 */
+	private String build;
+
 	/**
 	 * Construct an uninitialized AppVersion.
 	 */
@@ -83,11 +88,16 @@ public AppVersion(int major, int minor, int patch, String modifier) {
 	 * <tt>1.0.1M1-SNAPSHOT</tt>.
 	 */
 	public AppVersion(int major, int minor, int patch, int milestone, String modifier) {
+		this(major, minor, patch, milestone, modifier, null);
+	}
+
+	public AppVersion(int major, int minor, int patch, int milestone, String modifier, String build) {
 		this.major = major;
 		this.minor = minor;
 		this.patch = patch;
 		this.milestone = milestone;
 		this.modifier = modifier;
+		this.build = build;
 	}
 
 	/**
@@ -264,6 +274,7 @@ public static AppVersion parse(String versionString) {
 		int patchSeparator = versionString.indexOf('.', minorSeparator + 1);
 		int milestoneSeparator = versionString.indexOf('M', Math.max(minorSeparator, patchSeparator));
 		int modifierSeparator = versionString.indexOf('-', Math.max(minorSeparator, milestoneSeparator));
+		int buildSeparator = versionString.indexOf('+', Math.max(Math.max(minorSeparator, milestoneSeparator), modifierSeparator));
 
 		if (minorSeparator == -1) {
 			throw new NumberFormatException("Illegal version string: " + versionString);
@@ -272,21 +283,35 @@ public static AppVersion parse(String versionString) {
 		final boolean hasPatch = patchSeparator > -1;
 		final boolean hasMilestone = milestoneSeparator > -1;
 		final boolean hasModifier = modifierSeparator > -1;
+		final boolean hasBuild = buildSeparator > -1;
 
 		String major = versionString.substring(0, minorSeparator);
 		String minor = null;
 		String patch = null;
 		String milestone = null;
 		String modifier = null;
+		String build = null;
+
+		if (hasBuild) {
+			build = versionString.substring(buildSeparator + 1);
+		}
 
 		if (hasModifier) {
-			modifier = versionString.substring(modifierSeparator + 1);
+			if (hasBuild) {
+				modifier = versionString.substring(modifierSeparator + 1, buildSeparator);
+			}
+			else {
+				modifier = versionString.substring(modifierSeparator + 1);
+			}
 		}
 
 		if (hasMilestone) {
 			if (hasModifier) {
 				milestone = versionString.substring(milestoneSeparator + 1, modifierSeparator);
 			}
+			else if (hasBuild) {
+				milestone = versionString.substring(milestoneSeparator + 1, buildSeparator);
+			}
 			else {
 				milestone = versionString.substring(milestoneSeparator + 1);
 			}
@@ -300,6 +325,9 @@ public static AppVersion parse(String versionString) {
 			else if (hasModifier) {
 				patch = versionString.substring(patchSeparator + 1, modifierSeparator);
 			}
+			else if (hasBuild) {
+				patch = versionString.substring(patchSeparator + 1, buildSeparator);
+			}
 			else {
 				patch = versionString.substring(patchSeparator + 1);
 			}
@@ -312,6 +340,9 @@ else if (hasModifier) {
 			else if (hasModifier) {
 				minor = versionString.substring(minorSeparator + 1, modifierSeparator);
 			}
+			else if (hasBuild) {
+				minor = versionString.substring(minorSeparator + 1, buildSeparator);
+			}
 			else {
 				minor = versionString.substring(minorSeparator + 1);
 			}
@@ -322,7 +353,7 @@ else if (hasModifier) {
 		int minorInt = Integer.parseInt(minor);
 		int patchInt = patch == null ? -1 : Integer.parseInt(patch);
 		int milestoneInt = milestone == null ? -1 : Integer.parseInt(milestone);
-		return new AppVersion(majorInt, minorInt, patchInt, milestoneInt, modifier);
+		return new AppVersion(majorInt, minorInt, patchInt, milestoneInt, modifier, build);
 	}
 
 	/**
@@ -351,6 +382,13 @@ public String toString() {
 			sb.append(modifier);
 		}
 
+		if (build != null) {
+			if (sb.length() > 0) {
+				sb.append('+');
+			}
+			sb.append(build);
+		}
+
 		return sb.toString();
 	}
 }