You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/10/08 16:26:13 UTC
[1/7] jena git commit: Get versions from parent.
Repository: jena
Updated Branches:
refs/heads/master b6d0f6131 -> 06628e70f
Get versions from parent.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/74b70d7c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/74b70d7c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/74b70d7c
Branch: refs/heads/master
Commit: 74b70d7c8c9e9755e06e6b30b726bfca449c97fe
Parents: b6d0f61
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 16:22:01 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 16:22:01 2016 +0100
----------------------------------------------------------------------
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/74b70d7c/jena-jdbc/jena-jdbc-driver-remote/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-remote/pom.xml b/jena-jdbc/jena-jdbc-driver-remote/pom.xml
index de3e5cf..7526c77 100644
--- a/jena-jdbc/jena-jdbc-driver-remote/pom.xml
+++ b/jena-jdbc/jena-jdbc-driver-remote/pom.xml
@@ -62,7 +62,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -72,7 +71,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
@@ -85,7 +83,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<quiet>true</quiet>
<encoding>UTF-8</encoding>
[2/7] jena git commit: Use Java8 idiom.
Posted by an...@apache.org.
Use Java8 idiom.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/98c94f24
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/98c94f24
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/98c94f24
Branch: refs/heads/master
Commit: 98c94f2410ce58e9ce8c760f499004a1cb69198c
Parents: 74b70d7
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 16:22:19 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 16:22:49 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/engine/ResultSetCheckCondition.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/98c94f24/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java
index 117f71b..be45915 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ResultSetCheckCondition.java
@@ -45,12 +45,8 @@ public class ResultSetCheckCondition implements ResultSet
this.condition = condition ;
}
- // Feel free to replace with a lambda expression for Java8!
private static Condition checkQExec(final QueryExecution qExec) {
- return new Condition() {
- @Override
- public boolean check() { return ! qExec.isClosed() ; }
- } ;
+ return ()-> ! qExec.isClosed() ;
}
@Override
[7/7] jena git commit: Use try-resource
Posted by an...@apache.org.
Use try-resource
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/06628e70
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/06628e70
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/06628e70
Branch: refs/heads/master
Commit: 06628e70ff8a8127cd8d4a812249a9f1e6b052a6
Parents: 7308f32
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 17:25:36 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 17:25:36 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/writer/TestJsonLDWriter.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/06628e70/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLDWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLDWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLDWriter.java
index f1eef17..82aaa6b 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLDWriter.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestJsonLDWriter.java
@@ -466,19 +466,14 @@ public class TestJsonLDWriter extends BaseTest {
//
private String toString(Model m, RDFFormat f, Context jenaContext) {
- try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
-
+ try(ByteArrayOutputStream out = new ByteArrayOutputStream()) {
WriterDatasetRIOT w = RDFDataMgr.createDatasetWriter(f) ;
DatasetGraph g = DatasetFactory.create(m).asDatasetGraph();
PrefixMap pm = RiotLib.prefixMap(g);
String base = null;
w.write(out, g, pm, base, jenaContext) ;
-
out.flush();
- String x = out.toString("UTF-8");
- out.close();
- return x;
+ return out.toString("UTF-8");
} catch (IOException e) { throw new RuntimeException(e); }
}
[4/7] jena git commit: Use try-resource.
Posted by an...@apache.org.
Use try-resource.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3097c5e6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3097c5e6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3097c5e6
Branch: refs/heads/master
Commit: 3097c5e65bfc2f3a7943efdc9921ee0d18359546
Parents: 21b3b60
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 16:23:52 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 16:23:52 2016 +0100
----------------------------------------------------------------------
.../jdbc/remote/TestRemoteEndpointDriver.java | 21 +++++++++-----------
.../TestRemoteEndpointConnectionWithAuth.java | 8 ++++----
.../TestRemoteEndpointResultsWithAuth.java | 8 ++++----
3 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3097c5e6/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TestRemoteEndpointDriver.java
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TestRemoteEndpointDriver.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TestRemoteEndpointDriver.java
index a99417d..5c3ae8d 100644
--- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TestRemoteEndpointDriver.java
+++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TestRemoteEndpointDriver.java
@@ -58,10 +58,9 @@ public class TestRemoteEndpointDriver extends AbstractJenaDriverTests {
// May specify key=value pairs multiple times
String url = JenaDriver.DRIVER_PREFIX + RemoteEndpointDriver.REMOTE_DRIVER_PREFIX + RemoteEndpointDriver.PARAM_QUERY_ENDPOINT + "=http://example.org/query&" + RemoteEndpointDriver.PARAM_DEFAULT_GRAPH_URI + "=http://graph/1&" + RemoteEndpointDriver.PARAM_DEFAULT_GRAPH_URI + "=http://graph/2";
RemoteEndpointDriver driver = (RemoteEndpointDriver)this.getDriver();
- RemoteEndpointConnection conn = (RemoteEndpointConnection) driver.connect(url, new Properties());
-
- Assert.assertEquals(2, conn.getDefaultGraphURIs().size());
- conn.close();
+ try(RemoteEndpointConnection conn = (RemoteEndpointConnection) driver.connect(url, new Properties())) {
+ Assert.assertEquals(2, conn.getDefaultGraphURIs().size());
+ }
}
/**
@@ -73,10 +72,9 @@ public class TestRemoteEndpointDriver extends AbstractJenaDriverTests {
// May specify key=value,value as comma separated list
String url = JenaDriver.DRIVER_PREFIX + RemoteEndpointDriver.REMOTE_DRIVER_PREFIX + RemoteEndpointDriver.PARAM_QUERY_ENDPOINT + "=http://example.org/query&" + RemoteEndpointDriver.PARAM_DEFAULT_GRAPH_URI + "=http://graph/1,http://graph/2";
RemoteEndpointDriver driver = (RemoteEndpointDriver)this.getDriver();
- RemoteEndpointConnection conn = (RemoteEndpointConnection) driver.connect(url, new Properties());
-
- Assert.assertEquals(2, conn.getDefaultGraphURIs().size());
- conn.close();
+ try(RemoteEndpointConnection conn = (RemoteEndpointConnection) driver.connect(url, new Properties())){
+ Assert.assertEquals(2, conn.getDefaultGraphURIs().size());
+ }
}
/**
@@ -88,9 +86,8 @@ public class TestRemoteEndpointDriver extends AbstractJenaDriverTests {
// May specify combination of multiple key=value pairs and key=value,value comma separated list(s)
String url = JenaDriver.DRIVER_PREFIX + RemoteEndpointDriver.REMOTE_DRIVER_PREFIX + RemoteEndpointDriver.PARAM_QUERY_ENDPOINT + "=http://example.org/query&" + RemoteEndpointDriver.PARAM_DEFAULT_GRAPH_URI + "=http://graph/1,http://graph/2&" + RemoteEndpointDriver.PARAM_DEFAULT_GRAPH_URI + "=http://graph/3";
RemoteEndpointDriver driver = (RemoteEndpointDriver)this.getDriver();
- RemoteEndpointConnection conn = (RemoteEndpointConnection) driver.connect(url, new Properties());
-
- Assert.assertEquals(3, conn.getDefaultGraphURIs().size());
- conn.close();
+ try(RemoteEndpointConnection conn = (RemoteEndpointConnection) driver.connect(url, new Properties())) {
+ Assert.assertEquals(3, conn.getDefaultGraphURIs().size());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/3097c5e6/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
index 91969b1..2355c7a 100644
--- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
+++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
@@ -69,11 +69,11 @@ public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpoint
realmFile = File.createTempFile("realm", ".properties");
- FileWriter writer = new FileWriter(realmFile);
- writer.write(USER + ": " + PASSWORD + ", fuseki\n");
- writer.close();
+ try(FileWriter writer = new FileWriter(realmFile)) {
+ writer.write(USER + ": " + PASSWORD + ", fuseki\n");
+ }
- DatasetGraph dsg = DatasetGraphFactory.createMem();
+ DatasetGraph dsg = DatasetGraphFactory.create();
// This must agree with ServerTest
ServerConfig conf = FusekiConfig.defaultConfiguration(ServerTest.datasetPath, dsg, true, false);
conf.port = ServerTest.port;
http://git-wip-us.apache.org/repos/asf/jena/blob/3097c5e6/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
index 200feb3..8295116 100644
--- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
+++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
@@ -75,11 +75,11 @@ public class TestRemoteEndpointResultsWithAuth extends AbstractRemoteEndpointRes
realmFile = File.createTempFile("realm", ".properties");
- FileWriter writer = new FileWriter(realmFile);
- writer.write(USER + ": " + PASSWORD + ", fuseki\n");
- writer.close();
+ try(FileWriter writer = new FileWriter(realmFile)) {
+ writer.write(USER + ": " + PASSWORD + ", fuseki\n");
+ }
- DatasetGraph dsg = DatasetGraphFactory.createMem();
+ DatasetGraph dsg = DatasetGraphFactory.create();
// This must agree with ServerTest
ServerConfig conf = FusekiConfig.defaultConfiguration(ServerTest.datasetPath, dsg, true, false);
conf.port = ServerTest.port;
[5/7] jena git commit: Get versions from parent.
Posted by an...@apache.org.
Get versions from parent.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/baf0ad9f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/baf0ad9f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/baf0ad9f
Branch: refs/heads/master
Commit: baf0ad9f0e902fd99e6e84ac6dfd16579abbef0d
Parents: 3097c5e
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 17:25:08 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 17:25:08 2016 +0100
----------------------------------------------------------------------
jena-jdbc/jena-jdbc-core/pom.xml | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/baf0ad9f/jena-jdbc/jena-jdbc-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-core/pom.xml b/jena-jdbc/jena-jdbc-core/pom.xml
index c1e9a2c..b14935c 100644
--- a/jena-jdbc/jena-jdbc-core/pom.xml
+++ b/jena-jdbc/jena-jdbc-core/pom.xml
@@ -43,20 +43,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${ver.slf4j}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${ver.log4j}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -83,7 +80,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<goals>
@@ -96,7 +92,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
<configuration>
<quiet>true</quiet>
<encoding>UTF-8</encoding>
[3/7] jena git commit: Localise warning and suppress.
Posted by an...@apache.org.
Localise warning and suppress.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/21b3b609
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/21b3b609
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/21b3b609
Branch: refs/heads/master
Commit: 21b3b609e086b5db367b0a6831dcebed4097572f
Parents: 98c94f2
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 16:23:18 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 16:23:18 2016 +0100
----------------------------------------------------------------------
.../test/java/org/apache/jena/rdf/model/test/TestModelRead.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/21b3b609/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java
index a9f9c76..c4a7e26 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelRead.java
@@ -19,7 +19,6 @@
package org.apache.jena.rdf.model.test ;
import org.apache.jena.iri.IRIException ;
-import org.apache.jena.n3.IRIResolver;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.rdf.model.ModelFactory ;
import org.apache.jena.rdf.model.test.helpers.ModelHelper ;
@@ -70,11 +69,10 @@ public class TestModelRead extends AbstractModelTestBase
@SuppressWarnings("deprecation")
public void testSimpleLoadImplictBase() throws IRIException {
final Model mBasedImplicit = createModel() ;
- String fn=IRIResolver.resolveGlobal(getFileName("modelReading/based.n3"));
+ String fn=org.apache.jena.n3.IRIResolver.resolveGlobal(getFileName("modelReading/based.n3"));
final Model wanted = createModel().add(ModelHelper.resource(fn), ModelHelper.property("ja:predicate"),
ModelHelper.resource("ja:object")) ;
mBasedImplicit.read(fn, "N3") ;
ModelHelper.assertIsoModels(wanted, mBasedImplicit) ;
}
-
}
[6/7] jena git commit: Fix unused imports.
Posted by an...@apache.org.
Fix unused imports.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7308f32d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7308f32d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7308f32d
Branch: refs/heads/master
Commit: 7308f32daf0e5779714dd4850cfc10e83c909e69
Parents: baf0ad9
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Oct 8 17:25:23 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Oct 8 17:25:23 2016 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7308f32d/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java b/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
index fc28188..8add612 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/test/Gen.java
@@ -20,13 +20,7 @@ package org.apache.jena.atlas.test;
import static org.apache.jena.atlas.lib.RandomLib.random ;
-import java.util.ArrayList ;
-import java.util.Arrays ;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List ;
-import java.util.Set;
-import java.util.StringJoiner;
+import java.util.* ;
import java.util.function.IntSupplier;
import java.util.stream.IntStream;