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 2015/03/16 21:28:00 UTC
[1/2] jena git commit: Remove warnings.
Repository: jena
Updated Branches:
refs/heads/master 9c0559675 -> 503a73504
Remove warnings.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6977bdf4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6977bdf4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6977bdf4
Branch: refs/heads/master
Commit: 6977bdf4ae5d3f72a78fd47cb90c933efdae32ea
Parents: 9c05596
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Mar 16 18:45:58 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Mar 16 18:45:58 2015 +0000
----------------------------------------------------------------------
.../apache/jena/query/text/TextDocProducerTriples.java | 1 -
.../jena/query/text/assembler/TextDatasetAssembler.java | 10 ++++++----
.../query/text/assembler/TestTextDatasetAssembler.java | 12 +++---------
3 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6977bdf4/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java b/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
index 30da166..9ae029b 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
@@ -32,7 +32,6 @@ public class TextDocProducerTriples implements TextDocProducer {
// Also have to have a ThreadLocal here to keep track of whether or not we are in a transaction,
// therefore whether or not we have to do autocommit
private final ThreadLocal<Boolean> inTransaction = new ThreadLocal<Boolean>() ;
-
public TextDocProducerTriples(TextIndex indexer) {
this.defn = indexer.getDocDef() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/6977bdf4/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
index f3eea7c..941f7e9 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextDatasetAssembler.java
@@ -18,12 +18,16 @@
package org.apache.jena.query.text.assembler;
+import static org.apache.jena.query.text.assembler.TextVocab.pDataset ;
+import static org.apache.jena.query.text.assembler.TextVocab.pIndex ;
+import static org.apache.jena.query.text.assembler.TextVocab.pTextDocProducer ;
+import static org.apache.jena.query.text.assembler.TextVocab.textDataset ;
+
import java.lang.reflect.Constructor ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.text.TextDatasetFactory ;
import org.apache.jena.query.text.TextDocProducer ;
-import org.apache.jena.query.text.TextDocProducerTriples ;
import org.apache.jena.query.text.TextIndex ;
import com.hp.hpl.jena.assembler.Assembler ;
@@ -32,13 +36,11 @@ import com.hp.hpl.jena.assembler.assemblers.AssemblerBase ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.ARQConstants ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.assembler.DatasetAssembler ;
import com.hp.hpl.jena.sparql.util.Loader ;
import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
-import static org.apache.jena.query.text.assembler.TextVocab.* ;
-
public class TextDatasetAssembler extends AssemblerBase implements Assembler
{
private DatasetAssembler datasetAssembler = new DatasetAssembler() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/6977bdf4/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
index 11c4bdb..4b8adcf 100644
--- a/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
+++ b/jena-text/src/test/java/org/apache/jena/query/text/assembler/TestTextDatasetAssembler.java
@@ -18,12 +18,8 @@
package org.apache.jena.query.text.assembler;
-import org.apache.jena.query.text.DatasetGraphText ;
-import org.apache.jena.query.text.TextDocProducer ;
-import org.apache.jena.query.text.TextIndex ;
-import org.apache.jena.query.text.TextIndexLucene ;
-import org.apache.jena.query.text.TextQuery ;
-import org.junit.Ignore;
+import static org.junit.Assert.assertTrue ;
+import org.apache.jena.query.text.* ;
import org.junit.Test ;
import com.hp.hpl.jena.assembler.Assembler ;
@@ -31,13 +27,11 @@ import com.hp.hpl.jena.assembler.exceptions.AssemblerException ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph;
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.QuadAction ;
import com.hp.hpl.jena.tdb.assembler.AssemblerTDB ;
import com.hp.hpl.jena.vocabulary.RDF ;
-import static org.junit.Assert.* ;
-
/**
* Test the text dataset assembler.
*/
[2/2] jena git commit: Minimal fix for JENA-903.
Posted by an...@apache.org.
Minimal fix for JENA-903.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/503a7350
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/503a7350
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/503a7350
Branch: refs/heads/master
Commit: 503a73504dab01485bd6de5b41b9cd1d04065e80
Parents: 6977bdf
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Mar 16 20:27:38 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Mar 16 20:27:38 2015 +0000
----------------------------------------------------------------------
.../apache/jena/query/text/TextDocProducerEntities.java | 11 ++++++++---
.../apache/jena/query/text/TextDocProducerTriples.java | 9 +++++++--
2 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/503a7350/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java b/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
index 4427de6..f13de6f 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerEntities.java
@@ -30,15 +30,20 @@ import com.hp.hpl.jena.sparql.core.QuadAction ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
// Currently unused
-// This would index multiple quads at a time from batched stream of chnages (e.g. rdf-patch)
+// This would index multiple quads at a time from batched stream of changes (e.g. rdf-patch)
public class TextDocProducerEntities extends DatasetChangesBatched implements TextDocProducer {
private static Logger log = LoggerFactory.getLogger(TextDocProducer.class) ;
private final EntityDefinition defn ;
private final TextIndex indexer ;
- // Also have to have a ThreadLocal here to keep track of whether or not we are in a transaction,
+ // Have to have a ThreadLocal here to keep track of whether or not we are in a transaction,
// therefore whether or not we have to do autocommit
- private final ThreadLocal<Boolean> inTransaction = new ThreadLocal<Boolean>() ;
+ private final ThreadLocal<Boolean> inTransaction = new ThreadLocal<Boolean>() {
+ @Override
+ protected Boolean initialValue() {
+ return Boolean.FALSE ;
+ }
+ } ;
public TextDocProducerEntities(TextIndex indexer) {
this.defn = indexer.getDocDef() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/503a7350/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java b/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
index 9ae029b..9fff673 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextDocProducerTriples.java
@@ -31,8 +31,13 @@ public class TextDocProducerTriples implements TextDocProducer {
// Also have to have a ThreadLocal here to keep track of whether or not we are in a transaction,
// therefore whether or not we have to do autocommit
- private final ThreadLocal<Boolean> inTransaction = new ThreadLocal<Boolean>() ;
-
+ private final ThreadLocal<Boolean> inTransaction = new ThreadLocal<Boolean>() {
+ @Override
+ protected Boolean initialValue() {
+ return Boolean.FALSE ;
+ }
+ } ;
+
public TextDocProducerTriples(TextIndex indexer) {
this.defn = indexer.getDocDef() ;
this.indexer = indexer ;