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 2014/07/29 22:48:18 UTC
svn commit: r1614482 - in /jena/trunk/jena-tdb/src:
main/java/com/hp/hpl/jena/tdb/ main/java/com/hp/hpl/jena/tdb/index/bplustree/
main/java/com/hp/hpl/jena/tdb/solver/stats/
main/java/com/hp/hpl/jena/tdb/sys/ main/java/tdb/cmdline/
main/java/tdb/tools/...
Author: andy
Date: Tue Jul 29 20:48:18 2014
New Revision: 1614482
URL: http://svn.apache.org/r1614482
Log:
try-resource refactoring
Modified:
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeTools.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/ProcessUtils.java
jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestLocationLock.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TimeoutTDBPattern.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TransTestLib.java
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java Tue Jul 29 20:48:18 2014
@@ -38,12 +38,8 @@ public class TDBBackup
{
public static void backup(Location location, String backupfile)
{
- try
- {
- OutputStream out = new FileOutputStream(backupfile) ;
- out = new BufferedOutputStream(out) ;
+ try(OutputStream out = new BufferedOutputStream(new FileOutputStream(backupfile))) {
backup(location, out) ;
- out.close() ;
}
catch (FileNotFoundException e)
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeTools.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeTools.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeTools.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeTools.java Tue Jul 29 20:48:18 2014
@@ -39,9 +39,7 @@ class BPlusTreeTools
/*public*/private static void binDump(String filename)
{
- try
- {
- RandomAccessFile fh = new RandomAccessFile(filename, "r") ;
+ try(RandomAccessFile fh = new RandomAccessFile(filename, "r")) {
ByteBuffer bb = ByteBuffer.allocate(8*1024) ;
FileChannel ch = fh.getChannel() ;
int idx = 0 ;
@@ -53,8 +51,6 @@ class BPlusTreeTools
ByteBufferLib.print(bb) ;
bb.clear() ;
}
- fh.close() ;
-
} catch (IOException ex)
{
ex.printStackTrace();
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java Tue Jul 29 20:48:18 2014
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.tdb.solver.stats
import static com.hp.hpl.jena.sparql.sse.Item.addPair ;
import static com.hp.hpl.jena.sparql.sse.Item.createTagged ;
+import java.io.BufferedOutputStream ;
import java.io.FileOutputStream ;
import java.io.IOException ;
import java.io.OutputStream ;
@@ -60,10 +61,8 @@ public class Stats
static private void write(String filename, Map<Node, Integer> predicateStats, Map<Node, Integer> typeStats, long statsTotal)
{
// Write out the stats
- try {
- OutputStream statsOut = new FileOutputStream(filename) ;
+ try (OutputStream statsOut = new BufferedOutputStream(new FileOutputStream(filename))) {
write(statsOut, predicateStats, typeStats, statsTotal) ;
- statsOut.close() ;
} catch (IOException ex)
{ Log.warn(Stats.class, "Problem when writing stats file", ex) ; }
}
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/ProcessUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/ProcessUtils.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/ProcessUtils.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/ProcessUtils.java Tue Jul 29 20:48:18 2014
@@ -145,15 +145,13 @@ public class ProcessUtils {
}
// Run and read data from the process
- BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
-
- List<String> data = new ArrayList<>();
- String line = null;
- while ((line = reader.readLine()) != null) {
- data.add(line);
+ try(BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()))) {
+ List<String> data = new ArrayList<>();
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ data.add(line);
+ }
+ return data;
}
- reader.close();
-
- return data;
}
}
Modified: jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java Tue Jul 29 20:48:18 2014
@@ -124,19 +124,12 @@ public class ModTDBDataset extends ModDa
// Find and clear all locations
Model m = FileManager.get().loadModel(modAssembler.getAssemblerFile()) ;
Query query = QueryFactory.create("PREFIX tdb: <http://jena.hpl.hp.com/2008/tdb#> SELECT ?dir { [] tdb:location ?dir FILTER (isURI(?dir)) }") ;
- QueryExecution qExec = null ;
- try {
- qExec = QueryExecutionFactory.create(query, m) ;
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, m)) {
for (ResultSet rs = qExec.execSelect() ; rs.hasNext() ; )
{
String x = rs.nextSolution().getResource("dir").getURI() ;
locations.add(x) ;
}
- } catch ( RuntimeException ex)
- {
- if ( qExec != null )
- qExec.close() ;
- throw ex ;
}
}
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java Tue Jul 29 20:48:18 2014
@@ -101,23 +101,24 @@ public class dumpnodetable extends CmdGe
// Better to hack the indexes?
Iterator<Pair<NodeId, Node>> iter = nodeTable.all() ;
long count = 0 ;
- IndentedWriter iw = new IndentedWriter(w) ;
- for ( ; iter.hasNext() ; )
- {
- Pair<NodeId, Node> pair = iter.next() ;
- iw.print(pair.car().toString()) ;
- iw.print(" : ") ;
- //iw.print(pair.cdr()) ;
- Node n = pair.cdr() ;
- String $ = stringForNode(n) ;
- iw.print($) ;
+ try(IndentedWriter iw = new IndentedWriter(w)) {
+ for ( ; iter.hasNext() ; )
+ {
+ Pair<NodeId, Node> pair = iter.next() ;
+ iw.print(pair.car().toString()) ;
+ iw.print(" : ") ;
+ //iw.print(pair.cdr()) ;
+ Node n = pair.cdr() ;
+ String $ = stringForNode(n) ;
+ iw.print($) ;
+ iw.println() ;
+ count++ ;
+ }
+ iw.println() ;
+ iw.printf("Total: "+count) ;
iw.println() ;
- count++ ;
+ iw.flush() ;
}
- iw.println() ;
- iw.printf("Total: "+count) ;
- iw.println() ;
- iw.flush() ;
}
private static String stringForNode(Node n)
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestLocationLock.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestLocationLock.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestLocationLock.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestLocationLock.java Tue Jul 29 20:48:18 2014
@@ -72,11 +72,9 @@ public class TestLocationLock {
Assert.assertTrue(lock.canObtain());
// Write a fake PID to the lock file
- BufferedWriter writer = new BufferedWriter(new FileWriter(
- dir.getPath("tdb.lock")));
- writer.write(Integer.toString(-1234)); // Fake PID that would never be
- // valid
- writer.close();
+ try(BufferedWriter writer = new BufferedWriter(new FileWriter(dir.getPath("tdb.lock")))) {
+ writer.write(Integer.toString(-1234)); // Fake PID that would never be valid
+ }
Assert.assertTrue(lock.isLocked());
Assert.assertFalse(lock.isOwned());
Assert.assertFalse(lock.canObtain());
@@ -116,11 +114,10 @@ public class TestLocationLock {
Assert.assertTrue(lock.canObtain());
// Write a fake PID to the lock file
- BufferedWriter writer = new BufferedWriter(new FileWriter(
- dir.getPath("tdb.lock")));
- writer.write(Integer.toString(-1234)); // Fake PID that would never be
- // valid
- writer.close();
+ try(BufferedWriter writer = new BufferedWriter(new FileWriter(dir.getPath("tdb.lock")))) {
+ // Fake PID that would never be valid
+ writer.write(Integer.toString(-1234));
+ }
Assert.assertTrue(lock.isLocked());
Assert.assertFalse(lock.isOwned());
@@ -141,11 +138,11 @@ public class TestLocationLock {
Assert.assertTrue(lock.canObtain());
// Write a fake PID to the lock file
- BufferedWriter writer = new BufferedWriter(new FileWriter(
- dir.getPath("tdb.lock")));
- writer.write(Integer.toString(-1234)); // Fake PID that would never be
- // valid
- writer.close();
+ try(BufferedWriter writer =
+ new BufferedWriter(new FileWriter(dir.getPath("tdb.lock")))) {
+ // Fake PID that would never be valid
+ writer.write(Integer.toString(-1234));
+ }
Assert.assertTrue(lock.isLocked());
Assert.assertFalse(lock.isOwned());
@@ -166,11 +163,11 @@ public class TestLocationLock {
Assert.assertTrue(lock.canObtain());
// Write a fake PID to the lock file
- BufferedWriter writer = new BufferedWriter(new FileWriter(
- dir.getPath("tdb.lock")));
- writer.write(Integer.toString(-1234)); // Fake PID that would never be
- // valid
- writer.close();
+ try(BufferedWriter writer =
+ new BufferedWriter(new FileWriter(dir.getPath("tdb.lock")))) {
+ // Fake PID that would never be valid
+ writer.write(Integer.toString(-1234));
+ }
Assert.assertTrue(lock.isLocked());
Assert.assertFalse(lock.isOwned());
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TimeoutTDBPattern.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TimeoutTDBPattern.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TimeoutTDBPattern.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TimeoutTDBPattern.java Tue Jul 29 20:48:18 2014
@@ -54,12 +54,9 @@ public class T_TimeoutTDBPattern
Query query = QueryFactory.create(sparql);
ds.begin(ReadWrite.READ);
- QueryExecution qexec = null;
- try {
- System.out.println(MessageFormat.format(
- "{0,date} {0,time} Executing query [timeout1={1}s timeout2={2}s]: {3}",
- new Date(System.currentTimeMillis()), timeout1_sec, timeout2_sec, sparql));
- qexec = QueryExecutionFactory.create(query, ds);
+ System.out.println(MessageFormat.format("{0,date} {0,time} Executing query [timeout1={1}s timeout2={2}s]: {3}",
+ new Date(System.currentTimeMillis()), timeout1_sec, timeout2_sec, sparql));
+ try(QueryExecution qexec = QueryExecutionFactory.create(query, ds)) {
if ( true )
qexec.setTimeout(timeout1_sec, TimeUnit.SECONDS, timeout2_sec, TimeUnit.SECONDS);
long start = System.nanoTime() ;
@@ -79,8 +76,6 @@ public class T_TimeoutTDBPattern
} catch (Throwable t) {
t.printStackTrace(); // OOME
} finally {
- if (qexec != null)
- qexec.close();
ds.end();
ds.close();
System.out.println(MessageFormat.format("{0,date} {0,time} Finished",
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java Tue Jul 29 20:48:18 2014
@@ -264,8 +264,7 @@ public class T_TransSystem
{
int counter = 0 ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg)) ;
- try {
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
qExec.setTimeout(abortTime);
ResultSet rs = qExec.execSelect() ;
for (; rs.hasNext() ; )
@@ -274,15 +273,14 @@ public class T_TransSystem
counter++ ;
}
return counter ;
- } finally { qExec.close() ; }
+ }
}
public static int describeWithAbort(String queryStr, DatasetGraph dsg, long abortTime)
{
int counter = 0 ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg)) ;
- try {
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
qExec.setTimeout(abortTime);
Model model = qExec.execDescribe();
//ResultSet rs = qExec.execSelect() ;
@@ -291,7 +289,7 @@ public class T_TransSystem
counter++;
}
return counter ;
- } finally { qExec.close() ; }
+ }
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/QueryTestTDB.java Tue Jul 29 20:48:18 2014
@@ -144,9 +144,9 @@ public class QueryTestTDB extends EarlTe
else
{
QueryEngineFactory f = QueryEngineRef.getFactory() ;
- QueryExecution qExec1 = new QueryExecutionBase(query, ds, null, f) ;
- rs1 = ResultSetFactory.makeRewindable(qExec1.execSelect()) ;
- qExec1.close() ;
+ try(QueryExecution qExec1 = new QueryExecutionBase(query, ds, null, f)) {
+ rs1 = ResultSetFactory.makeRewindable(qExec1.execSelect()) ;
+ }
expectedLabel = "Standard engine" ;
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java Tue Jul 29 20:48:18 2014
@@ -177,11 +177,11 @@ public class TestConcurrentAccess extend
{
Dataset ds = create();
Query query = QueryFactory.create("SELECT * { ?s ?p ?o}") ;
- QueryExecution qExec = QueryExecutionFactory.create(query, ds) ;
- ResultSet rs = qExec.execSelect() ;
- while(rs.hasNext())
- rs.next();
- qExec.close() ;
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
+ ResultSet rs = qExec.execSelect() ;
+ while(rs.hasNext())
+ rs.next();
+ }
DatasetGraph dsg = ds.asDatasetGraph() ;
Quad quad = SSE.parseQuad("(<g> <y> <p> 99)") ;
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java Tue Jul 29 20:48:18 2014
@@ -202,16 +202,18 @@ public class TestDatasetTDB extends Base
String qs = "PREFIX : <"+baseNS+"> SELECT (COUNT(?x) as ?c) WHERE { ?x (:p1|:p2) 'x1' }" ;
Query q = QueryFactory.create(qs) ;
+ long c_m ;
// Model
- QueryExecution qExec = QueryExecutionFactory.create(q, m) ;
- long c_m = qExec.execSelect().next().getLiteral("c").getLong() ;
+ try (QueryExecution qExec = QueryExecutionFactory.create(q, m)) {
+ c_m = qExec.execSelect().next().getLiteral("c").getLong() ;
+ }
// dataset
- qExec = QueryExecutionFactory.create(q, ds) ;
- qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
-
- long c_ds = qExec.execSelect().next().getLiteral("c").getLong() ;
- qExec.close() ;
+ long c_ds ;
+ try (QueryExecution qExec = QueryExecutionFactory.create(q, ds)) {
+ qExec.getContext().set(TDB.symUnionDefaultGraph, true) ;
+ c_ds = qExec.execSelect().next().getLiteral("c").getLong() ;
+ }
// String qs2 = "PREFIX : <"+baseNS+"> SELECT * WHERE { ?x (:p1|:p2) 'x1' }" ;
// Query q2 = QueryFactory.create(qs2) ;
@@ -224,7 +226,6 @@ public class TestDatasetTDB extends Base
// --------
assertEquals(c_m, c_ds) ;
- qExec.close() ;
}
@Test public void special5()
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java Tue Jul 29 20:48:18 2014
@@ -112,20 +112,19 @@ public class TestQuadFilter extends Base
// } ;
Query query = QueryFactory.create(qs) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, ds) ;
- // Install filter for this query only.
- qExec.getContext().set(SystemTDB.symTupleFilter, filter) ;
- qExec.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- long x1 = ResultSetFormatter.consume(qExec.execSelect()) ;
- qExec.close() ;
- assertEquals(withFilter, x1) ;
-
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
+ // Install filter for this query only.
+ qExec.getContext().set(SystemTDB.symTupleFilter, filter) ;
+ qExec.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ long x1 = ResultSetFormatter.consume(qExec.execSelect()) ;
+ assertEquals(withFilter, x1) ;
+ }
// No filter.
- qExec = QueryExecutionFactory.create(query, ds) ;
- qExec.getContext().setTrue(TDB.symUnionDefaultGraph) ;
- long x2 = ResultSetFormatter.consume(qExec.execSelect()) ;
- qExec.close() ;
- assertEquals(withoutFilter, x2) ;
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, ds)) {
+ qExec.getContext().setTrue(TDB.symUnionDefaultGraph) ;
+ long x2 = ResultSetFormatter.consume(qExec.execSelect()) ;
+ assertEquals(withoutFilter, x2) ;
+ }
}
Modified: jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TransTestLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TransTestLib.java?rev=1614482&r1=1614481&r2=1614482&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TransTestLib.java (original)
+++ jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TransTestLib.java Tue Jul 29 20:48:18 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.hp.hpl.jena.tdb.transaction;
+package com.hp.hpl.jena.tdb.transaction ;
import java.util.ArrayList ;
import java.util.List ;
@@ -32,41 +32,33 @@ import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.Var ;
-public class TransTestLib
-{
+public class TransTestLib {
- public static int count(String queryStr, DatasetGraph dsg)
- {
+ public static int count(String queryStr, DatasetGraph dsg) {
int counter = 0 ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg)) ;
- try {
+ try (QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
ResultSet rs = qExec.execSelect() ;
- for (; rs.hasNext() ; )
- {
+ for ( ; rs.hasNext() ; ) {
rs.nextBinding() ;
counter++ ;
}
return counter ;
- } finally { qExec.close() ; }
+ }
}
// To QueryExecUtils?
- public static List<Node> query(String queryStr, String var, DatasetGraphTxn dsg)
- {
+ public static List<Node> query(String queryStr, String var, DatasetGraphTxn dsg) {
Var v = Var.alloc(var) ;
Query query = QueryFactory.create(queryStr, Syntax.syntaxARQ) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg)) ;
- List<Node> nodes = new ArrayList<>() ;
- try {
+ try (QueryExecution qExec = QueryExecutionFactory.create(query, DatasetFactory.create(dsg))) {
+ List<Node> nodes = new ArrayList<>() ;
ResultSet rs = qExec.execSelect() ;
- for (; rs.hasNext() ; )
- {
+ for ( ; rs.hasNext() ; ) {
Node n = rs.nextBinding().get(v) ;
nodes.add(n) ;
}
return nodes ;
- } finally { qExec.close() ; }
+ }
}
-
}