Author: andy
Date: Wed Jul 30 07:20:37 2014
New Revision: 1614567
URL: http://svn.apache.org/r1614567
Log:
try-resources cleaning
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestAuth.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
Wed Jul 30 07:20:37 2014
@@ -306,10 +306,10 @@ public class FusekiConfig
QuerySolutionMap initValues = null ;
if ( varName != null )
initValues = querySolution(varName, value) ;
- QueryExecution qExec = QueryExecutionFactory.create(query, m,
initValues) ;
- ResultSet rs = ResultSetFactory.copyResults(qExec.execSelect()) ;
- qExec.close() ;
- return rs ;
+ try(QueryExecution qExec = QueryExecutionFactory.create(query, m,
initValues)) {
+ ResultSet rs = ResultSetFactory.copyResults(qExec.execSelect()) ;
+ return rs ;
+ }
}
private static QuerySolutionMap querySolution(String varName, RDFNode
value)
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
Wed Jul 30 07:20:37 2014
@@ -51,21 +51,21 @@ public class FusekiErrorHandler extends
ByteArrayOutputStream bytes = new ByteArrayOutputStream(1024) ;
//String writer = IO.UTF8(null) ;
- Writer writer = new OutputStreamWriter(bytes, "UTF-8") ;
-
- handleErrorPage(request, writer, connection.getResponse().getStatus(),
connection.getResponse().getReason());
-
- if ( ! Fuseki.VERSION.equalsIgnoreCase("development") )
- {
- writer.write("\n") ;
- writer.write("\n") ;
- writer.write(format("Fuseki - version %s (Build date: %s)\n",
Fuseki.VERSION, Fuseki.BUILD_DATE)) ;
+ try(Writer writer = new OutputStreamWriter(bytes, "UTF-8")) {
+
+ handleErrorPage(request, writer,
connection.getResponse().getStatus(), connection.getResponse().getReason());
+
+ if ( ! Fuseki.VERSION.equalsIgnoreCase("development") )
+ {
+ writer.write("\n") ;
+ writer.write("\n") ;
+ writer.write(format("Fuseki - version %s (Build date: %s)\n",
Fuseki.VERSION, Fuseki.BUILD_DATE)) ;
+ }
+ writer.flush();
}
- writer.flush();
response.setContentLength(bytes.size()) ;
- // Copy :-(
+ // Copy
response.getOutputStream().write(bytes.toByteArray()) ;
- writer.close() ;
}
@Override
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java
Wed Jul 30 07:20:37 2014
@@ -108,11 +108,9 @@ public class DumpServlet extends HttpSer
// This resets the input stream
static public String dumpRequest(HttpServletRequest req)
- {
- try {
- StringWriter sw = new StringWriter() ;
- PrintWriter pw = new PrintWriter(sw) ;
-
+ {
+ StringWriter sw = new StringWriter() ;
+ try( PrintWriter pw = new PrintWriter(sw) ) {
// Standard environment
pw.println("Method: "+req.getMethod());
pw.println("getContentLength:
"+Integer.toString(req.getContentLength()));
@@ -204,14 +202,11 @@ public class DumpServlet extends HttpSer
}
pw.println() ;
+ pw.flush();
//printBody(pw, req) ;
-
- pw.close() ;
- sw.close() ;
return sw.toString() ;
- } catch (IOException e)
- { }
- return null ;
+ }
+
}
static void printBody(PrintWriter pw, HttpServletRequest req) throws
IOException
@@ -246,65 +241,58 @@ public class DumpServlet extends HttpSer
static public String dumpEnvironment()
{
Properties properties = System.getProperties();
+
StringWriter sw = new StringWriter() ;
- PrintWriter pw = new PrintWriter(sw) ;
- Enumeration<Object> en = properties.keys();
- while(en.hasMoreElements())
- {
- String key = en.nextElement().toString();
- pw.println(key+": '"+properties.getProperty(key)+"'");
- }
- pw.println() ;
- pw.close() ;
- try {
- sw.close() ;
- } catch (IOException e) {
- e.printStackTrace();
+ try(PrintWriter pw = new PrintWriter(sw) ) {
+ Enumeration<Object> en = properties.keys();
+ while(en.hasMoreElements())
+ {
+ String key = en.nextElement().toString();
+ pw.println(key+": '"+properties.getProperty(key)+"'");
+ }
+ pw.println() ;
+ pw.flush() ;
+ return sw.toString() ;
}
- return sw.toString() ;
}
public String dumpServletContext()
{
StringWriter sw = new StringWriter() ;
- PrintWriter pw = new PrintWriter(sw) ;
+ try(PrintWriter pw = new PrintWriter(sw)) {
- ServletContext sc = getServletContext();
- pw.println("majorVersion: '"+sc.getMajorVersion()+"'");
- pw.println("minorVersion: '"+sc.getMinorVersion()+"'");
- pw.println("contextName: '"+sc.getServletContextName()+"'");
- pw.println("servletInfo: '"+getServletInfo()+"'");
- pw.println("serverInfo: '"+sc.getServerInfo()+"'");
+ ServletContext sc = getServletContext();
+ pw.println("majorVersion: '"+sc.getMajorVersion()+"'");
+ pw.println("minorVersion: '"+sc.getMinorVersion()+"'");
+ pw.println("contextName: '"+sc.getServletContextName()+"'");
+ pw.println("servletInfo: '"+getServletInfo()+"'");
+ pw.println("serverInfo: '"+sc.getServerInfo()+"'");
- {
- Enumeration<String> en = sc.getInitParameterNames();
- if (en != null) {
- pw.println("initParameters: ");
- while(en.hasMoreElements())
- {
- String key = en.nextElement();
- pw.println(key+": '"+sc.getInitParameter(key)+"'");
+ {
+ Enumeration<String> en = sc.getInitParameterNames();
+ if (en != null) {
+ pw.println("initParameters: ");
+ while(en.hasMoreElements())
+ {
+ String key = en.nextElement();
+ pw.println(key+": '"+sc.getInitParameter(key)+"'");
+ }
}
}
- }
-
- {
- Enumeration<String> en = sc.getAttributeNames();
- if (en != null) {
- pw.println("attributes: ");
- while(en.hasMoreElements())
- {
- String key = en.nextElement();
- pw.println(key+": '"+sc.getAttribute(key)+"'");
+
+ {
+ Enumeration<String> en = sc.getAttributeNames();
+ if (en != null) {
+ pw.println("attributes: ");
+ while(en.hasMoreElements())
+ {
+ String key = en.nextElement();
+ pw.println(key+": '"+sc.getAttribute(key)+"'");
+ }
}
}
- }
- pw.println() ;
- pw.close() ;
- try {
- sw.close() ;
- } catch (IOException e) {
- e.printStackTrace();
+ pw.println() ;
+ pw.close() ;
}
return sw.toString() ;
}
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
(original)
+++
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
Wed Jul 30 07:20:37 2014
@@ -234,14 +234,13 @@ public abstract class SPARQL_Query exten
// Assumes finished whole thing by end of sendResult.
action.beginRead() ;
- QueryExecution qExec = null ;
try {
Dataset dataset = decideDataset(action, query, queryStringLog) ;
- qExec = createQueryExecution(query, dataset) ;
- SPARQLResult result = executeQuery(action, qExec, query,
queryStringLog) ;
-
- // Deals with exceptions itself.
- sendResults(action, result, query.getPrologue()) ;
+ try(QueryExecution qExec = createQueryExecution(query, dataset)) {
+ SPARQLResult result = executeQuery(action, qExec, query,
queryStringLog) ;
+ // Deals with exceptions itself.
+ sendResults(action, result, query.getPrologue()) ;
+ }
} catch (QueryCancelledException ex) {
// Additional counter information.
incCounter(action.srvRef, QueryTimeouts) ;
@@ -251,8 +250,6 @@ public abstract class SPARQL_Query exten
incCounter(action.srvRef, QueryExecErrors) ;
throw ex ;
} finally {
- if ( qExec != null )
- qExec.close() ;
action.endRead() ;
}
}
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestAuth.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestAuth.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestAuth.java
(original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestAuth.java
Wed Jul 30 07:20:37 2014
@@ -72,10 +72,10 @@ public class TestAuth extends ServerTest
public static void setup() throws IOException {
realmFile = File.createTempFile("realm", ".properties");
- FileWriter writer = new FileWriter(realmFile);
- writer.write("allowed: password, fuseki\n");
- writer.write("forbidden: password, other");
- writer.close();
+ try(FileWriter writer = new FileWriter(realmFile)) {
+ writer.write("allowed: password, fuseki\n");
+ writer.write("forbidden: password, other");
+ }
LogCtl.logLevel(Fuseki.serverLog.getName(),
org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING);
LogCtl.logLevel(Fuseki.requestLog.getName(),
org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING);
Modified:
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
(original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TestQuery.java
Wed Jul 30 07:20:37 2014
@@ -71,25 +71,24 @@ public class TestQuery extends BaseTest
@Test public void query_recursive_01()
{
String query = "SELECT * WHERE { SERVICE <" + serviceQuery + "> { ?s
?p ?o . BIND(?o AS ?x) } }";
- QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery, query);
- ResultSet rs = qExec.execSelect();
-
- Var x = Var.alloc("x");
- while (rs.hasNext()) {
- Binding b = rs.nextBinding();
- Assert.assertNotNull(b.get(x));
+ try(QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery, query)) {
+ ResultSet rs = qExec.execSelect();
+
+ Var x = Var.alloc("x");
+ while (rs.hasNext()) {
+ Binding b = rs.nextBinding();
+ Assert.assertNotNull(b.get(x));
+ }
}
- qExec.close();
}
@Test public void query_with_params_01()
{
String query = "ASK { }";
- QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery + "?output=json", query);
-
- boolean result = qExec.execAsk();
- Assert.assertTrue(result);
- qExec.close();
+ try(QueryExecution qExec =
QueryExecutionFactory.sparqlService(serviceQuery + "?output=json", query)) {
+ boolean result = qExec.execAsk();
+ Assert.assertTrue(result);
+ }
}
@Test public void request_id_header_01() throws IOException
Modified:
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
(original)
+++
jena/trunk/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java
Wed Jul 30 07:20:37 2014
@@ -50,6 +50,7 @@ public class TextIndexLuceneAssembler ex
.
*/
+ @SuppressWarnings("resource")
@Override
public TextIndex open(Assembler a, Resource root, Mode mode) {
try {
@@ -57,6 +58,7 @@ public class TextIndexLuceneAssembler ex
throw new TextIndexException("No 'text:directory' property on
" + root) ;
Directory directory ;
+
RDFNode n = root.getProperty(pDirectory).getObject() ;
if ( n.isLiteral() ) {
if ( !"mem".equals(n.asLiteral().getLexicalForm()) )
Modified:
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
(original)
+++
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/AbstractTestDatasetWithTextIndexBase.java
Wed Jul 30 07:20:37 2014
@@ -76,8 +76,7 @@ public abstract class AbstractTestDatase
public static void doTestQuery(Dataset dataset, String label, String
queryString, Set<String> expectedEntityURIs, int expectedNumResults) {
Query query = QueryFactory.create(queryString) ;
- QueryExecution qexec = QueryExecutionFactory.create(query,
dataset) ;
- try {
+ try(QueryExecution qexec = QueryExecutionFactory.create(query,
dataset)) {
dataset.begin(ReadWrite.READ);
ResultSet results = qexec.execSelect() ;
@@ -88,6 +87,6 @@ public abstract class AbstractTestDatase
assertTrue(label + ": unexpected result: " + entityURI,
expectedEntityURIs.contains(entityURI));
}
assertEquals(label, expectedNumResults, count);
- } finally { qexec.close() ; dataset.end() ; }
+ } finally { dataset.end() ; }
}
}
Modified:
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java?rev=1614567&r1=1614566&r2=1614567&view=diff
==============================================================================
---
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
(original)
+++
jena/trunk/jena-text/src/test/java/org/apache/jena/query/text/TestBuildTextDataset.java
Wed Jul 30 07:20:37 2014
@@ -93,16 +93,17 @@ public class TestBuildTextDataset extend
" }") ;
dataset.begin(ReadWrite.READ) ;
+ int x ;
try {
Query q = QueryFactory.create(pre + "\n" + qs) ;
- QueryExecution qexec = QueryExecutionFactory.create(q, dataset) ;
- int x = ResultSetFormatter.consume(qexec.execSelect()) ;
- qexec.close() ;
- assertEquals("Unexpected result count", 2, x) ;
+ try(QueryExecution qexec = QueryExecutionFactory.create(q,
dataset)) {
+ x = ResultSetFormatter.consume(qexec.execSelect()) ;
+ }
}
finally {
dataset.end() ;
}
+ assertEquals("Unexpected result count", 2, x) ;
}
public static Dataset createCode() {
