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/06/25 11:13:17 UTC
svn commit: r1605298 - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/graph/impl/
main/java/com/hp/hpl/jena/rdf/model/impl/
main/java/com/hp/hpl/jena/reasoner/rulesys/ main/java/com/hp/hpl/jena/util/
main/java/jena/ test/java/com/hp/hpl/jena/a...
Author: andy
Date: Wed Jun 25 09:13:17 2014
New Revision: 1605298
URL: http://svn.apache.org/r1605298
Log:
try-resources cleanup
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java
jena/trunk/jena-core/src/main/java/jena/RuleMap.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/acceptance/AllAccept.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3JenaWriterTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestARPStates.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterFeatures.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterInterface.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java
jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java
jena/trunk/jena-core/src/test/java/jena/test/Test_schemagen.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/FileGraph.java Wed Jun 25 09:13:17 2014
@@ -105,21 +105,15 @@ public class FileGraph extends GraphMem
{ readModelFrom( m, strict, name ); }
protected void readModelFrom( Model m, boolean strict, File name )
- {
- FileInputStream in = null;
- try
- {
- in = new FileInputStream( name );
+ {
+ try(FileInputStream in = new FileInputStream( name ) ) {
model.read( in, "", this.lang );
- }
- catch (FileNotFoundException f)
- { if (strict) throw new DoesNotExistException( name.toString() ); }
- finally
- {
- if (in != null) try {in.close();} catch (IOException ignore) {}
- }
}
-
+ catch (FileNotFoundException f)
+ { if (strict) throw new DoesNotExistException( name.toString() ); }
+ catch (IOException ignore) {}
+ }
+
/**
As for FileGraph(File,boolean), except the name is given as a String.
*/
@@ -165,18 +159,18 @@ public class FileGraph extends GraphMem
that the output is either done completely or not at all.
*/
protected void saveContents( File targetName )
- {
+ {
try
- {
+ {
File intermediate = new File( targetName.getPath() + ".new" );
- FileOutputStream out = new FileOutputStream( intermediate );
- model.write( out, lang );
- out.close();
- updateFrom( targetName, intermediate );
+ try( FileOutputStream out = new FileOutputStream( intermediate ) ) {
+ model.write( out, lang );
}
- catch (Exception e)
- { throw new JenaException( e ); }
+ updateFrom( targetName, intermediate );
}
+ catch (Exception e)
+ { throw new JenaException( e ); }
+ }
/**
The file intermediate has the new file contents. We want to move
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java Wed Jun 25 09:13:17 2014
@@ -257,11 +257,8 @@ implements Model, PrefixMapping, Lock
@Override
public Model read( String url, String base, String lang )
{
- try
- {
- InputStream is = new URL( url ) .openStream();
- try { read( is, base, lang ); }
- finally { if (null != is) { is.close(); } }
+ try ( InputStream is = new URL( url ) .openStream() ) {
+ read( is, base, lang );
}
catch (IOException e) { throw new WrappedIOException( e ); }
return this;
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Util.java Wed Jun 25 09:13:17 2014
@@ -269,18 +269,17 @@ public class Util {
* If the URL fails it will try a plain file name as well.
*/
public static String loadURLFile(String urlStr) throws IOException {
- BufferedReader dataReader = FileUtils.readerFromURL( urlStr );
- StringWriter sw = new StringWriter(1024);
- char buff[] = new char[1024];
- while (dataReader.ready()) {
- int l = dataReader.read(buff);
- if (l <= 0)
- break;
- sw.write(buff, 0, l);
- }
- dataReader.close();
- sw.close();
- return sw.toString();
+ try ( BufferedReader dataReader = FileUtils.readerFromURL( urlStr );
+ StringWriter sw = new StringWriter(1024); ) {
+ char buff[] = new char[1024];
+ while (dataReader.ready()) {
+ int l = dataReader.read(buff);
+ if (l <= 0)
+ break;
+ sw.write(buff, 0, l);
+ }
+ return sw.toString();
+ }
}
/**
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileManager.java Wed Jun 25 09:13:17 2014
@@ -480,23 +480,17 @@ public class FileManager
/** Slurp up a whole file */
public String readWholeFileAsUTF8(InputStream in)
{
- try {
- Reader r = FileUtils.asBufferedUTF8(in) ;
- StringWriter sw = new StringWriter(1024);
- char buff[] = new char[1024];
+ try (Reader r = FileUtils.asBufferedUTF8(in); StringWriter sw = new StringWriter(1024)) {
+ char buff[] = new char[1024] ;
while (true) {
- int l = r.read(buff);
- if (l <= 0)
- break;
- sw.write(buff, 0, l);
+ int l = r.read(buff) ;
+ if ( l <= 0 )
+ break ;
+ sw.write(buff, 0, l) ;
}
- r.close();
- sw.close();
- return sw.toString();
+ return sw.toString() ;
} catch (IOException ex)
- {
- throw new WrappedIOException(ex) ;
- }
+ { throw new WrappedIOException(ex) ; }
}
/** Slurp up a whole file: map filename as necessary */
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java Wed Jun 25 09:13:17 2014
@@ -399,8 +399,9 @@ public class FileUtils
*/
public static String readWholeFileAsUTF8(InputStream in) throws IOException
{
- Reader r = new BufferedReader(asUTF8(in),1024) ;
- return readWholeFileAsUTF8(r) ;
+ try ( Reader r = new BufferedReader(asUTF8(in),1024) ) {
+ return readWholeFileAsUTF8(r) ;
+ }
}
/** Read a whole file as UTF-8
@@ -413,17 +414,16 @@ public class FileUtils
// Private worker as we are trying to force UTF-8.
private static String readWholeFileAsUTF8(Reader r) throws IOException
{
- StringWriter sw = new StringWriter(1024);
- char buff[] = new char[1024];
- int l ;
- while ((l = r.read(buff))!=-1) { // .ready does not work with HttpClient streams.
- if (l <= 0)
- break;
- sw.write(buff, 0, l);
+ try ( StringWriter sw = new StringWriter(1024) ) {
+ char buff[] = new char[1024];
+ int l ;
+ while ((l = r.read(buff))!=-1) { // .ready does not work with HttpClient streams.
+ if (l <= 0)
+ break;
+ sw.write(buff, 0, l);
+ }
+ return sw.toString();
}
- r.close();
- sw.close();
- return sw.toString();
}
}
Modified: jena/trunk/jena-core/src/main/java/jena/RuleMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/RuleMap.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/RuleMap.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/RuleMap.java Wed Jun 25 09:13:17 2014
@@ -180,17 +180,16 @@ public class RuleMap {
infModel.setNsPrefixes(prefixes);
// Output
- PrintWriter writer = new PrintWriter(System.out);
- if (deductionsOnly) {
- Model deductions = infModel.getDeductionsModel();
- deductions.setNsPrefixes(prefixes);
- deductions.setNsPrefixes(inModel);
- deductions.write(writer, outLang);
- } else {
- infModel.write(writer, outLang);
+ try ( PrintWriter writer = new PrintWriter(System.out) ) {
+ if (deductionsOnly) {
+ Model deductions = infModel.getDeductionsModel();
+ deductions.setNsPrefixes(prefixes);
+ deductions.setNsPrefixes(inModel);
+ deductions.write(writer, outLang);
+ } else {
+ infModel.write(writer, outLang);
+ }
}
- writer.close();
-
} catch (Throwable t) {
System.err.println("An error occured: \n" + t);
t.printStackTrace();
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/acceptance/AllAccept.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/acceptance/AllAccept.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/acceptance/AllAccept.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/assembler/acceptance/AllAccept.java Wed Jun 25 09:13:17 2014
@@ -58,9 +58,9 @@ public class AllAccept extends Assembler
{
File f = FileUtils.tempFileName( "assembler-acceptance-", ".n3" );
Model data = model( "a P b; b Q c" );
- FileOutputStream fs = new FileOutputStream( f );
- data.write( fs, "N3" );
- fs.close();
+ try ( FileOutputStream fs = new FileOutputStream( f ) ) {
+ data.write( fs, "N3" );
+ }
Resource root = resourceInModel( "x rdf:type ja:MemoryModel; x ja:content y; y ja:externalContent file:" + f.getAbsolutePath() );
Model m = Assembler.general.openModel( root );
assertIsoModels( data, m );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3JenaWriterTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3JenaWriterTests.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3JenaWriterTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/n3/N3JenaWriterTests.java Wed Jun 25 09:13:17 2014
@@ -99,17 +99,16 @@ public class N3JenaWriterTests extends N
Model model_1 = ModelFactory.createDefaultModel() ;
model_1.read(data, uriBase, "N3") ;
- StringWriter w = new StringWriter() ;
- model_1.write(w, writerName, uriBase) ;
- // Check we really are writing different things!
- //model_1.write(System.out, writerName, uriBase) ;
- w.close() ;
-
- StringReader r = new StringReader(w.toString()) ;
+ String tmpStr ;
+ try ( StringWriter w = new StringWriter() ){
+ model_1.write(w, writerName, uriBase) ;
+ tmpStr = w.toString() ;
+ }
Model model_2 = ModelFactory.createDefaultModel() ;
- model_2.read(r, uriBase, "N3") ;
-
- if ( ! model_1.isIsomorphicWith(model_2) )
+ try ( StringReader r = new StringReader(tmpStr) ) {
+ model_2.read(r, uriBase, "N3") ;
+ }
+ if ( ! model_1.isIsomorphicWith(model_2) )
{
System.out.println("#### ---- "+testName+" ------------------------------") ;
System.out.println("#### Model 1 ---- "+testName+" ------------------------------") ;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MemoryLeakTest.java Wed Jun 25 09:13:17 2014
@@ -62,22 +62,14 @@ public class MemoryLeakTest extends Test
static void loadFile(String fileName)
throws IOException {
- PrintStream
- out = new PrintStream(new OutputStream() {
-
+ PrintStream oldOut = System.out;
+ try ( PrintStream out = new PrintStream(new OutputStream() {
@Override
public void write(int b) throws IOException {
}
- });
- PrintStream oldOut = System.out;
- try {
- System.setOut(out);
- NTriple.mainEh(new String[] { "-b", "http://eg.org/", "-t", fileName }, null, null);
- out.close();
- } finally {
- System.setOut(oldOut);
-
- }
+ });) {
+ NTriple.mainEh(new String[] { "-b", "http://eg.org/", "-t", fileName }, null, null);
+ } finally { System.setOut(oldOut); }
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/MoreTests.java Wed Jun 25 09:13:17 2014
@@ -114,14 +114,13 @@ public class MoreTests extends TestCase
testWineNS(ModelFactory.createOntologyModel());
}
- private void testWineNS(Model m) throws FileNotFoundException, IOException {
- InputStream in = new FileInputStream("testing/arp/xmlns/wine.rdf");
- m.read(in, "");
- in.close();
- assertEquals("http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#", m
- .getNsPrefixURI(""));
- }
-
+ private void testWineNS(Model m) throws FileNotFoundException, IOException {
+ try (InputStream in = new FileInputStream("testing/arp/xmlns/wine.rdf")) {
+ m.read(in, "") ;
+ assertEquals("http://www.w3.org/TR/2003/CR-owl-guide-20030818/wine#", m.getNsPrefixURI("")) ;
+ }
+ }
+
public void testLatin1() throws IOException {
Model m = createMemModel();
RDFReader rdr = m.getReader();
@@ -165,19 +164,18 @@ public class MoreTests extends TestCase
public void testEncodingMismatch1() throws IOException {
Model m = createMemModel();
RDFReader rdr = m.getReader();
- FileReader r = new FileReader(
- "testing/wg/rdfms-syntax-incomplete/test001.rdf");
- if (r.getEncoding().startsWith("UTF")) {
- logger.warn("Encoding mismatch tests not executed on platform with default UTF encoding.");
- r.close() ;
- return;
+ try ( FileReader r = new FileReader("testing/wg/rdfms-syntax-incomplete/test001.rdf") ) {
+ if (r.getEncoding().startsWith("UTF")) {
+ logger.warn("Encoding mismatch tests not executed on platform with default UTF encoding.");
+ r.close() ;
+ return;
+ }
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_ENCODING_MISMATCH };
+ rdr.read(m, r, "http://example.org/");
+ //System.err.println(m.size() + " triples read.");
+ checkExpected();
}
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_ENCODING_MISMATCH };
- rdr.read(m, r, "http://example.org/");
- //System.err.println(m.size() + " triples read.");
- checkExpected();
- r.close() ;
}
public void testIcu() throws IOException {
@@ -186,34 +184,31 @@ public class MoreTests extends TestCase
// "\u0bcd\u0ba4\u0bbf\u0baf\u0bbe"
// ,Normalizer.NFC,0);
- Model m = createMemModel();
- RDFReader rdr = m.getReader();
- FileInputStream r = new FileInputStream(
- "testing/arp/i18n/icubug.rdf");
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_STRING_COMPOSING_CHAR };
- rdr.read(m, r, "http://example.org/");
- r.close();
- checkExpected();
-
+ Model m = createMemModel();
+ RDFReader rdr = m.getReader();
+ try(FileInputStream r = new FileInputStream("testing/arp/i18n/icubug.rdf")){
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_STRING_COMPOSING_CHAR };
+ rdr.read(m, r, "http://example.org/");
+ }
+ checkExpected();
}
public void testIcu2() throws IOException {
// "\u0b87\u0ba8\u0bcd\u0ba4\u0bbf\u0baf\u0bbe"
// Normalizer. isNormalized(
// "\u0bcd\u0ba4\u0bbf\u0baf\u0bbe"
// ,Normalizer.NFC,0);
-
- Model m = createMemModel();
- RDFReader rdr = m.getReader();
- FileInputStream r = new FileInputStream(
- "testing/arp/i18n/icubugtwo.rdf");
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_STRING_NOT_NORMAL_FORM_C };
- rdr.read(m, r, "http://example.org/");
- r.close();
- checkExpected();
-
- }
+
+ Model m = createMemModel();
+ RDFReader rdr = m.getReader();
+ try(FileInputStream r = new FileInputStream("testing/arp/i18n/icubugtwo.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_STRING_NOT_NORMAL_FORM_C };
+ rdr.read(m, r, "http://example.org/");
+ }
+ checkExpected();
+ }
+
static class ToStringStatementHandler implements StatementHandler {
String obj;
@@ -259,27 +254,15 @@ public class MoreTests extends TestCase
subTestEncodingMismatch2(r);
}
-
public void testEncodingMismatch3() throws IOException {
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdf-charmod-literals/test001.rdf"
- );
- InputStreamReader r = null;
- try {
- r = new InputStreamReader(
- fin,
- "MS950"
- );
- }
- catch (java.io.UnsupportedEncodingException e) {
- System.err
- .println("WARNING: Encoding mismatch3 test not executed on platform without MS950 encoding.");
- if ( fin != null ) fin.close() ;
- return;
- }
-
-
- subTestEncodingMismatch2(r);
+ try ( FileInputStream fin = new FileInputStream("testing/wg/rdf-charmod-literals/test001.rdf") ;
+ InputStreamReader r = new InputStreamReader(fin,"MS950")) {
+ subTestEncodingMismatch2(r);
+ }catch (java.io.UnsupportedEncodingException e) {
+ System.err
+ .println("WARNING: Encoding mismatch3 test not executed on platform without MS950 encoding.");
+ return;
+ }
}
private void subTestEncodingMismatch2(InputStreamReader r) {
@@ -301,77 +284,65 @@ public class MoreTests extends TestCase
Model m = createMemModel();
Model m1 = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
-
- rdr.setErrorHandler(this);
- expected = new int[] {};
- rdr.read(m, fin, "http://example.org/");
- fin.close();
- fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
- rdr.read(m1, fin, null);
- fin.close();
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf") ) {
+ rdr.setErrorHandler(this);
+ expected = new int[] {};
+ rdr.read(m, fin, "http://example.org/");
+ }
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.read(m1, fin, null);
+ }
assertTrue("Base URI should have no effect.", m.isIsomorphicWith(m1));
checkExpected();
}
public void testDanBriXMLBase() throws IOException {
Model m = createMemModel();
Model m1 = createMemModel();
- FileInputStream fin = new FileInputStream(
- "testing/arp/xmlbase/danbri.rdf");
-
- m.read(fin,"http://wrong.example.org/");
- fin.close();
- fin = new FileInputStream(
- "testing/arp/xmlbase/danbri.nt");
-
- m1.read(fin,"http://wrong.example.org/","N-TRIPLE");
- fin.close();
+ try (FileInputStream fin = new FileInputStream("testing/arp/xmlbase/danbri.rdf")) {
+ m.read(fin,"http://wrong.example.org/");
+ }
+ try (FileInputStream fin = new FileInputStream("testing/arp/xmlbase/danbri.nt")) {
+ m1.read(fin,"http://wrong.example.org/","N-TRIPLE");
+ }
assertTrue("Dan Bri nested XML Base.", m.isIsomorphicWith(m1));
}
public void testNullBaseParamError() throws IOException {
Model m = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-difference-between-ID-and-about/test1.rdf");
- rdr.setErrorHandler(this);
- expected = new int[] { ERR_RESOLVING_URI_AGAINST_NULL_BASE, WARN_RELATIVE_URI};
- rdr.read(m, fin, null);
- fin.close();
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-difference-between-ID-and-about/test1.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { ERR_RESOLVING_URI_AGAINST_NULL_BASE, WARN_RELATIVE_URI};
+ rdr.read(m, fin, null);
+ }
checkExpected();
}
public void testEmptyBaseParamOK() throws IOException {
- Model m = createMemModel();
- Model m1 = createMemModel();
- RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
-
- rdr.setErrorHandler(this);
- expected = new int[] {};
- rdr.read(m, fin, "http://example.org/");
- fin.close();
- fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
- rdr.read(m1, fin, "");
- fin.close();
- assertTrue("Empty base URI should have no effect.[" + m1.toString()
- + "]", m.isIsomorphicWith(m1));
- checkExpected();
+ Model m = createMemModel();
+ Model m1 = createMemModel();
+ RDFReader rdr = m.getReader();
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")){
+ rdr.setErrorHandler(this);
+ expected = new int[] {};
+ rdr.read(m, fin, "http://example.org/");
+ }
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.read(m1, fin, "");
+ }
+ assertTrue("Empty base URI should have no effect.[" + m1.toString()
+ + "]", m.isIsomorphicWith(m1));
+ checkExpected();
}
public void testEmptyBaseParamError() throws IOException {
Model m = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-difference-between-ID-and-about/test1.rdf");
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_RESOLVING_URI_AGAINST_EMPTY_BASE};
- rdr.read(m, fin, "");
- fin.close();
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-difference-between-ID-and-about/test1.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_RESOLVING_URI_AGAINST_EMPTY_BASE};
+ rdr.read(m, fin, "");
+ }
Model m1 = createMemModel();
m1.createResource("#foo").addProperty(RDF.value, "abc");
assertTrue("Empty base URI should produce relative URI.["
@@ -382,15 +353,14 @@ public class MoreTests extends TestCase
public void testBadBaseParamError() throws IOException {
Model m = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-difference-between-ID-and-about/test1.rdf");
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_MALFORMED_URI,
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-difference-between-ID-and-about/test1.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_MALFORMED_URI,
WARN_MALFORMED_URI,
-// WARN_RELATIVE_URI, ERR_RESOLVING_AGAINST_MALFORMED_BASE};
- ERR_RESOLVING_AGAINST_MALFORMED_BASE};
- rdr.read(m, fin, "http://jjc^3.org/demo.mp3");
- fin.close();
+ // WARN_RELATIVE_URI, ERR_RESOLVING_AGAINST_MALFORMED_BASE};
+ ERR_RESOLVING_AGAINST_MALFORMED_BASE};
+ rdr.read(m, fin, "http://jjc^3.org/demo.mp3");
+ }
Model m1 = createMemModel();
assertTrue("Bad base URI should produce no URIs in model.["
+ m.toString() + "]", m.isIsomorphicWith(m1));
@@ -401,31 +371,28 @@ public class MoreTests extends TestCase
Model m = createMemModel();
Model m1 = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_MALFORMED_URI };
- rdr.read(m, fin, "http://jjc^3.org/demo.mp3");
- fin.close();
- fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
- rdr.read(m1, fin, "");
- fin.close();
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_MALFORMED_URI };
+ rdr.read(m, fin, "http://jjc^3.org/demo.mp3");
+ }
+ try(FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.read(m1, fin, "");
+ }
assertTrue("Bad base URI should have no effect on model.[" + m1.toString()
- + "]", m.isIsomorphicWith(m1));
+ + "]", m.isIsomorphicWith(m1));
checkExpected();
}
public void testRelativeBaseParamError() throws IOException {
Model m = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-difference-between-ID-and-about/test1.rdf");
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_RELATIVE_URI, WARN_RELATIVE_URI, ERR_RESOLVING_AGAINST_RELATIVE_BASE, };
- rdr.setProperty("ERR_RESOLVING_AGAINST_RELATIVE_BASE","EM_WARNING");
- rdr.read(m, fin, "foo/");
- fin.close();
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-difference-between-ID-and-about/test1.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_RELATIVE_URI, WARN_RELATIVE_URI, ERR_RESOLVING_AGAINST_RELATIVE_BASE, };
+ rdr.setProperty("ERR_RESOLVING_AGAINST_RELATIVE_BASE","EM_WARNING");
+ rdr.read(m, fin, "foo/");
+ }
Model m1 = createMemModel();
m1.createResource("foo/#foo").addProperty(RDF.value, "abc");
assertTrue("Relative base URI should produce relative URIs in model (when error suppressed).["
@@ -437,19 +404,17 @@ public class MoreTests extends TestCase
Model m = createMemModel();
Model m1 = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_RELATIVE_URI };
+ rdr.read(m, fin, "foo/");
+ }
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_RELATIVE_URI };
- rdr.read(m, fin, "foo/");
- fin.close();
- fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
- rdr.read(m1, fin, "");
- fin.close();
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.read(m1, fin, "");
+ }
assertTrue("Bad base URI should have no effect on model.[" + m1.toString()
- + "]", m.isIsomorphicWith(m1));
+ + "]", m.isIsomorphicWith(m1));
checkExpected();
}
@@ -457,63 +422,56 @@ public class MoreTests extends TestCase
Model m = createMemModel();
Model m1 = createMemModel();
RDFReader rdr = m.getReader();
- FileInputStream fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
-
- rdr.setErrorHandler(this);
- expected = new int[] { WARN_MALFORMED_URI, WARN_RELATIVE_URI };
- rdr.read(m, fin, "ht#tp://jjc3.org/demo.mp3#frag");
- fin.close();
- fin = new FileInputStream(
- "testing/wg/rdfms-identity-anon-resources/test001.rdf");
- rdr.read(m1, fin, "");
- fin.close();
- assertTrue("Bad base URI should have no effect.[" + m1.toString()
- + "]", m.isIsomorphicWith(m1));
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.setErrorHandler(this);
+ expected = new int[] { WARN_MALFORMED_URI, WARN_RELATIVE_URI };
+ rdr.read(m, fin, "ht#tp://jjc3.org/demo.mp3#frag");
+ }
+ try (FileInputStream fin = new FileInputStream("testing/wg/rdfms-identity-anon-resources/test001.rdf")) {
+ rdr.read(m1, fin, "");
+ }
+ assertTrue("Bad base URI should have no effect.[" + m1.toString()+ "]",
+ m.isIsomorphicWith(m1));
checkExpected();
}
public void testInterrupt() throws SAXException, IOException {
- ARP a = new ARP();
- InputStream in;
-// long start = System.currentTimeMillis();
- in = new FileInputStream("testing/wg/miscellaneous/consistent001.rdf");
- a.getHandlers().setStatementHandler(new StatementHandler() {
- int countDown = 10;
-
- @Override
- public void statement(AResource subj, AResource pred, AResource obj) {
- if (countDown-- == 0)
- Thread.currentThread().interrupt();
-
- }
-
- @Override
- public void statement(AResource subj, AResource pred, ALiteral lit) {
-
- }
- });
- a.getHandlers().setErrorHandler(new ErrorHandler(){
- @Override
- public void error(SAXParseException exception) throws SAXException {
- throw new RuntimeException("Unexpected error", exception);
- }
- @Override
- public void fatalError(SAXParseException exception) throws SAXException {
- throw exception;
- }
- @Override
- public void warning(SAXParseException exception) throws SAXException {
- throw new RuntimeException("Unexpected warning", exception);
- }});
- try {
- a.load(in);
- fail("Thread was not interrupted.");
- } catch (InterruptedIOException | SAXParseException e) {
- }
- finally {
- in.close();
- }
- // System.err.println("Finished "+Thread.interrupted());
+ ARP a = new ARP();
+ try ( InputStream in = new FileInputStream("testing/wg/miscellaneous/consistent001.rdf") ) {
+ a.getHandlers().setStatementHandler(new StatementHandler() {
+ int countDown = 10;
+
+ @Override
+ public void statement(AResource subj, AResource pred, AResource obj) {
+ if (countDown-- == 0)
+ Thread.currentThread().interrupt();
+
+ }
+
+ @Override
+ public void statement(AResource subj, AResource pred, ALiteral lit) {
+
+ }
+ });
+ a.getHandlers().setErrorHandler(new ErrorHandler(){
+ @Override
+ public void error(SAXParseException exception) throws SAXException {
+ throw new RuntimeException("Unexpected error", exception);
+ }
+ @Override
+ public void fatalError(SAXParseException exception) throws SAXException {
+ throw exception;
+ }
+ @Override
+ public void warning(SAXParseException exception) throws SAXException {
+ throw new RuntimeException("Unexpected warning", exception);
+ }});
+ try {
+ a.load(in);
+ fail("Thread was not interrupted.");
+ } catch (InterruptedIOException | SAXParseException e) {
+ }
+ }
+ // System.err.println("Finished "+Thread.interrupted());
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/NTripleTestSuite.java Wed Jun 25 09:13:17 2014
@@ -247,7 +247,9 @@ class NTripleTestSuite extends WGTestSui
throws IOException {
return loadRDFx(in, eh, base, true, 0);
}
- static Model loadRDFx(
+
+ @SuppressWarnings("resource")
+ static Model loadRDFx(
InFactoryX in,
RDFErrorHandler eh,
String base,
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/Performance.java Wed Jun 25 09:13:17 2014
@@ -595,10 +595,8 @@ class Performance {
if (f.length() == 0)
continue;
rslt[i] = new byte[(int) f.length()];
- try {
- InputStream in = new FileInputStream(f);
+ try ( InputStream in = new FileInputStream(f) ) {
in.read(rslt[i]);
- in.close();
} catch (IOException e) {
System.err.println(files[i][1] + " " + e.getMessage());
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFMoreTests.java Wed Jun 25 09:13:17 2014
@@ -42,38 +42,36 @@ public class SAX2RDFMoreTests extends Te
}
public void testLang() throws Exception {
- Model m = ModelFactory.createDefaultModel();
- Model m2 = ModelFactory.createDefaultModel();
- InputStream in = new FileInputStream(
- "testing/wg/rdfms-xmllang/test004.rdf");
- RDFEHArray eh = new RDFEHArray();
- RDFReader w = m.getReader();
- w.setErrorHandler(eh);
- w.read(m, in, "http://example.org/");
- in.close();
- in = new FileInputStream("testing/wg/rdfms-xmllang/test003.rdf");
-
- RDFEHArray eh2 = new RDFEHArray();
-
- XMLReader saxParser = new SAXParser();
- SAX2Model handler = SAX2Model.create("http://example.org/", m2,
- "fr");
- SAX2RDF.installHandlers(saxParser, handler);
- handler.setErrorHandler(eh2);
-
- InputSource ins = new InputSource(in);
- ins.setSystemId("http://example.org/");
- try {
- try {
- saxParser.parse(ins);
- } finally {
- handler.close();
- }
- } catch (SAXParseException e) {
- // already reported, leave it be.
- }
-
- in.close();
+ Model m = ModelFactory.createDefaultModel();
+ Model m2 = ModelFactory.createDefaultModel();
+ RDFEHArray eh = new RDFEHArray();
+ try ( InputStream in = new FileInputStream("testing/wg/rdfms-xmllang/test004.rdf") ) {
+ RDFReader w = m.getReader();
+ w.setErrorHandler(eh);
+ w.read(m, in, "http://example.org/");
+ }
+
+ RDFEHArray eh2 = new RDFEHArray();
+
+ try ( InputStream in = new FileInputStream("testing/wg/rdfms-xmllang/test003.rdf") ) {
+ XMLReader saxParser = new SAXParser();
+ SAX2Model handler = SAX2Model.create("http://example.org/", m2,
+ "fr");
+ SAX2RDF.installHandlers(saxParser, handler);
+ handler.setErrorHandler(eh2);
+
+ InputSource ins = new InputSource(in);
+ ins.setSystemId("http://example.org/");
+ try {
+ try {
+ saxParser.parse(ins);
+ } finally {
+ handler.close();
+ }
+ } catch (SAXParseException e) {
+ // already reported, leave it be.
+ }
+ }
/*
* System.out.println("Normal:"); m.write(System.out,"N-TRIPLE");
*
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/SAX2RDFTest.java Wed Jun 25 09:13:17 2014
@@ -1231,23 +1231,21 @@ public class SAX2RDFTest extends TestCas
//System.err.println(base+" + "+this.file);
Model m = ModelFactory.createDefaultModel();
Model m2 = ModelFactory.createDefaultModel();
- InputStream in = new FileInputStream(file);
- RDFEHArray eh = new RDFEHArray();
- RDFReader w = m.getReader();
- w.setErrorHandler(eh);
- w.read(m, in, base);
- in.close();
- in = new FileInputStream(file);
-
- RDFEHArray eh2 = new RDFEHArray();
-
- /*
- * w = m.getReader(); w.setErrorHandler(eh2); w.read(m2,in,base);
- * in.close();
- */
- loadXMLModel(m2, in, eh2);
-
- in.close();
+ RDFEHArray eh = new RDFEHArray();
+ try ( InputStream in = new FileInputStream(file) ) {
+ RDFReader w = m.getReader();
+ w.setErrorHandler(eh);
+ w.read(m, in, base);
+ }
+
+ RDFEHArray eh2 = new RDFEHArray();
+ try ( InputStream in = new FileInputStream(file) ) {
+ /*
+ * w = m.getReader(); w.setErrorHandler(eh2); w.read(m2,in,base);
+ * in.close();
+ */
+ loadXMLModel(m2, in, eh2);
+ }
/*
* System.out.println("Normal:"); m.write(System.out,"N-TRIPLE");
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TaintingTests.java Wed Jun 25 09:13:17 2014
@@ -190,18 +190,11 @@ public class TaintingTests extends TestC
ByteArrayOutputStream badBytes = new ByteArrayOutputStream();
PrintStream oldOut = System.out;
PrintStream oldErr = System.err;
-// Model m = createMemModel();
- try {
- PrintStream out = new PrintStream(goodBytes);
- PrintStream err = new PrintStream(badBytes);
-// PrintStream out = new PrintStream(new FileOutputStream(goodTriples));
-// PrintStream err = new PrintStream(new FileOutputStream(badTriples));
- System.setOut(out);
- System.setErr(err);
- NTriple.mainEh(new String[]{"-e","102,136,105,103,108,107,116,106,004,131",
- "-E","-b",base,fileName},this,null);
- out.close();
- err.close();
+ try (PrintStream out = new PrintStream(goodBytes); PrintStream err = new PrintStream(badBytes); ) {
+ System.setOut(out);
+ System.setErr(err);
+ NTriple.mainEh(new String[]{"-e","102,136,105,103,108,107,116,106,004,131",
+ "-E","-b",base,fileName},this,null);
}
finally {
System.setErr(oldErr);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/TestErrorMsg.java Wed Jun 25 09:13:17 2014
@@ -86,15 +86,10 @@ public class TestErrorMsg extends TestCa
}
});
- InputStream in = new FileInputStream("testing/arp/error-msgs/"+filename+".rdf");
- try {
- arp.load(in, "file:///" + filename);
+ try ( InputStream in = new FileInputStream("testing/arp/error-msgs/"+filename+".rdf") ){
+ arp.load(in, "file:///" + filename);
}
- catch (SAXException e){
-
- }
-
- in.close();
+ catch (SAXException e){ }
String contents = buf.toString();
if (regexPresent != null)
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/WGTestSuite.java Wed Jun 25 09:13:17 2014
@@ -124,9 +124,9 @@ class WGTestSuite extends TestSuite impl
if ( base.contains( "/xmlns/" )
|| base.contains( "/comments/" ) )
jr.setProperty("embedding","true");
- InputStream inx = in.open();
- jr.read(model, inx, base);
- inx.close();
+ try ( InputStream inx = in.open() ) {
+ jr.read(model, inx, base);
+ }
return model;
}
@@ -144,12 +144,11 @@ class WGTestSuite extends TestSuite impl
@Override
public void runTest() throws IOException {
if (logging) {
- RDFWriter w = testResults.getWriter("RDF/XML-ABBREV");
- w.setProperty("xmlbase",BASE_RESULTS_URI );
- OutputStream out = System.out ;
- out = new FileOutputStream("/tmp/rdf-results.rdf");
- w.write(testResults,out,BASE_RESULTS_URI);
- out.close();
+ RDFWriter w = testResults.getWriter("RDF/XML-ABBREV");
+ w.setProperty("xmlbase",BASE_RESULTS_URI );
+ try ( OutputStream out = new FileOutputStream("/tmp/rdf-results.rdf") ) {
+ w.write(testResults,out,BASE_RESULTS_URI);
+ }
}
}
}
@@ -254,16 +253,14 @@ class WGTestSuite extends TestSuite impl
if (!base.endsWith("/"))
base = base + "/";
- try {
- InputStream in = fact.fullyOpen(file);
+ try ( InputStream in = fact.fullyOpen(file) ) {
if (in == null )
return null;
- in.close();
m = loadRDF(new InFactoryX(){
- @Override
+ @Override
public InputStream open() throws IOException {
- return fact.fullyOpen(file);
- } }, null, base + file);
+ return fact.fullyOpen(file);
+ } }, null, base + file);
} catch (JenaException e) {
// System.out.println(e.getMessage());
throw e;
@@ -276,7 +273,7 @@ class WGTestSuite extends TestSuite impl
}
return m;
}
-
+
/** Creates new WGTestSuite
This is a private snapshot of the RDF Test Cases Working Draft's
data.
@@ -619,10 +616,8 @@ class WGTestSuite extends TestSuite impl
int suffix = uri.lastIndexOf('.');
String saveUri = uri.substring(0, suffix) + ".ntx";
// System.out.println("Saving to " + saveUri);
- try {
- OutputStream w = factory.openOutput(saveUri);
+ try ( OutputStream w = factory.openOutput(saveUri) ) {
m1.write(w, "N-TRIPLE");
- w.close();
} catch (IOException e) {
throw new JenaException( e );
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestARPStates.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestARPStates.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestARPStates.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestARPStates.java Wed Jun 25 09:13:17 2014
@@ -36,29 +36,25 @@ public class TestARPStates extends TestC
TestSuite rslt = new TestSuite();
rslt.setName("ARP state machine");
Map<String, TestSuite> tests = new HashMap<>();
- try {
- LineNumberReader r = new LineNumberReader(new FileReader(TestData.dataFile));
- while (true) {
- String line = r.readLine();
- if (line == null)
- {
- r.close() ;
- return rslt;
- }
- int hash = line.indexOf('%');
- line = (hash==-1?line:line.substring(0,hash)).trim();
- String fields[] = line.split(" *");
- if (fields.length==0)
- continue;
- TestSuite child = tests.get(fields[0]);
- if (child==null) {
- child = new TestSuite();
- child.setName(TestData.stateLongName(fields[0]));
- rslt.addTest(child);
- tests.put(fields[0],child);
- }
- child.addTest(TestEventList.create(line,fields));
- }
+ try ( LineNumberReader r = new LineNumberReader(new FileReader(TestData.dataFile)) ) {
+ while (true) {
+ String line = r.readLine();
+ if (line == null)
+ return rslt;
+ int hash = line.indexOf('%');
+ line = (hash==-1?line:line.substring(0,hash)).trim();
+ String fields[] = line.split(" *");
+ if (fields.length==0)
+ continue;
+ TestSuite child = tests.get(fields[0]);
+ if (child==null) {
+ child = new TestSuite();
+ child.setName(TestData.stateLongName(fields[0]));
+ rslt.addTest(child);
+ tests.put(fields[0],child);
+ }
+ child.addTest(TestEventList.create(line,fields));
+ }
}
catch (IOException e) {
e.printStackTrace();
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/rdf/arp/states/TestData.java Wed Jun 25 09:13:17 2014
@@ -423,13 +423,13 @@ public class TestData implements ARPErro
}
stats(f);
}
- FileWriter fw = new FileWriter(dataFile);
- Iterator<String> it2 = data.iterator();
- while (it.hasNext()) {
- fw.write(it2.next());
- fw.write('\n');
+ try ( FileWriter fw = new FileWriter(dataFile) ) {
+ Iterator<String> it2 = data.iterator();
+ while (it.hasNext()) {
+ fw.write(it2.next());
+ fw.write('\n');
+ }
}
- fw.close();
}
static public void main(String args[]) throws IOException {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/PrettyWriterTest.java Wed Jun 25 09:13:17 2014
@@ -70,10 +70,10 @@ public class PrettyWriterTest extends Mo
try {
Model m = createMemModel();
m.read( filename );
- StringWriter sw = new StringWriter();
- m.write( sw, "RDF/XML-ABBREV", filename );
- sw.close();
- contents = sw.toString();
+ try ( StringWriter sw = new StringWriter() ) {
+ m.write( sw, "RDF/XML-ABBREV", filename );
+ contents = sw.toString();
+ }
Model m2 = createMemModel();
m2.read( new StringReader( contents ), filename );
assertTrue( m.isIsomorphicWith( m2 ) );
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestEntityOutput.java Wed Jun 25 09:13:17 2014
@@ -117,18 +117,17 @@ public class TestEntityOutput extends Mo
*/
public void testDifficultChars() throws IOException
{
- Model m = createMemModel();
- m.read("file:testing/abbreviated/entities.rdf");
- StringWriter w = new StringWriter();
- RDFWriter wr = m.getWriter();
- wr.setProperty("showDoctypeDeclaration", "true");
- wr.write(m, w, "http://example.org/");
- w.close();
-// System.err.println(w.toString());
- Reader r = new StringReader(w.toString());
- Model m2 = createMemModel();
- m2.read(r,"http://example.org/");
- assertIsoModels("showDoctypeDeclaration problem", m, m2);
+ Model m = createMemModel();
+ m.read("file:testing/abbreviated/entities.rdf");
+ try ( StringWriter w = new StringWriter() ) {
+ RDFWriter wr = m.getWriter();
+ wr.setProperty("showDoctypeDeclaration", "true");
+ wr.write(m, w, "http://example.org/");
+ Reader r = new StringReader(w.toString());
+ Model m2 = createMemModel();
+ m2.read(r,"http://example.org/");
+ assertIsoModels("showDoctypeDeclaration problem", m, m2);
+ }
}
public void testCRinLiterals() throws IOException
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterFeatures.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterFeatures.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterFeatures.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterFeatures.java Wed Jun 25 09:13:17 2014
@@ -43,17 +43,21 @@ public class TestWriterFeatures extends
Model model = createMemModel();
FileManager.get().readModel(model, filename );
- StringWriter sw = new StringWriter();
- RDFWriter w = model.getWriter(writerName) ;
- if ( propertyName != null )
- w.setProperty(propertyName, propertyValue) ;
- w.write(model, sw, null) ;
+ String contents = null ;
- try { sw.close(); } catch (IOException ex) {}
+ try ( StringWriter sw = new StringWriter() ) {
+ RDFWriter w = model.getWriter(writerName) ;
+ if ( propertyName != null )
+ w.setProperty(propertyName, propertyValue) ;
+ w.write(model, sw, null) ;
+ contents = sw.toString() ;
+ } catch (IOException ex) { /* ignore : StringWriter */ }
- Model model2 = createMemModel();
- model2.read( new StringReader( sw.toString() ), filename );
- assertTrue( model.isIsomorphicWith( model2 ) );
+ try ( StringReader sr = new StringReader( contents ) ) {
+ Model model2 = createMemModel();
+ model2.read( new StringReader( contents ), filename );
+ assertTrue( model.isIsomorphicWith( model2 ) );
+ }
}
private void checkReadWriteRead(String filename, String propertyName, String propertyValue)
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterInterface.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterInterface.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterInterface.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestWriterInterface.java Wed Jun 25 09:13:17 2014
@@ -18,17 +18,16 @@
package com.hp.hpl.jena.xmloutput;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.io.StringWriter;
-
-import com.hp.hpl.jena.Jena;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.impl.NTripleWriter;
-import com.hp.hpl.jena.rdf.model.test.ModelTestBase;
-import com.hp.hpl.jena.shared.NoWriterForLangException;
-import com.hp.hpl.jena.xmloutput.impl.Abbreviated;
-import com.hp.hpl.jena.xmloutput.impl.Basic;
+import java.io.ByteArrayOutputStream ;
+import java.io.StringWriter ;
+
+import com.hp.hpl.jena.Jena ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.impl.NTripleWriter ;
+import com.hp.hpl.jena.rdf.model.test.ModelTestBase ;
+import com.hp.hpl.jena.shared.NoWriterForLangException ;
+import com.hp.hpl.jena.xmloutput.impl.Abbreviated ;
+import com.hp.hpl.jena.xmloutput.impl.Basic ;
public class TestWriterInterface extends ModelTestBase {
private String lang;
@@ -93,25 +92,12 @@ public class TestWriterInterface extends
}
public void testWriting() {
- // Changed to use "in-memory files" (ByteArrayOutputStream)
- // Used to use temporary file.
- //System.err.println(lang);
- OutputStream output = null;
Model m1 = createMemModel();
- try {
- ByteArrayOutputStream out = new ByteArrayOutputStream() ;
- output = out ;
- m1.write(output, lang);
+ try ( ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
+ m1.write(out, lang);
out.reset() ;
- output.close() ;
} catch (Exception e) {
fail(e.getMessage());
- } finally {
- if (output != null)
- try {
- output.close();
- } catch (Exception e) { }
}
}
-
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java Wed Jun 25 09:13:17 2014
@@ -405,70 +405,69 @@ public class TestXMLFeatures extends XML
static final int BadURI = 3;
- public void checkPropURI(String s, String p, Object val, int behaviour)
- throws IOException {
- // create triple and graph.
- // BaseXMLWriter.dbg = true;
- // SystemOutAndErr.block();
- // TestLogger tl = new TestLogger(BaseXMLWriter.class);
- blockLogger();
- Node blank = NodeFactory.createAnon();
- Node prop = NodeFactory.createURI(s);
- Graph g = Factory.createGraphMem();
- g.add(Triple.create(blank, prop, blank));
- // create Model
- Model m = ModelFactory.createModelForGraph(g);
- // serialize
- StringWriter w = new StringWriter();
- RDFWriter rw = m.getWriter(lang);
- if (p != null)
- rw.setProperty(p, val);
- try {
- rw.write(m, w, "http://example.org/");
- w.close();
- String f = w.toString();
-
- switch (behaviour) {
- case BadPropURI:
- fail("Bad property URI <" + s + "> was not detected."); return ;
- case BadURI:
- fail("Bad URI <" + s + "> was not detected."); return ;
- }
- // read back in
- Model m2 = createMemModel();
- RDFReader rdr = m2.getReader("RDF/XML");
- rdr.setProperty("error-mode", "lax");
- rdr.read(m2, new StringReader(f), "http://example.org/");
- // m2.read(, lang);
-
- // check
- switch (behaviour) {
- case ExtraTriples:
- assertTrue("Expecting Brickley behaviour.", m2.size() == 3);
- break;
- case NoError:
- assertTrue("Comparing Model written out and read in.", m
- .isIsomorphicWith(m2));
- break;
+ public void checkPropURI(String s, String p, Object val, int behaviour) throws IOException {
+ // create triple and graph.
+ // BaseXMLWriter.dbg = true;
+ // SystemOutAndErr.block();
+ // TestLogger tl = new TestLogger(BaseXMLWriter.class);
+ blockLogger() ;
+ Node blank = NodeFactory.createAnon() ;
+ Node prop = NodeFactory.createURI(s) ;
+ Graph g = Factory.createGraphMem() ;
+ g.add(Triple.create(blank, prop, blank)) ;
+ // create Model
+ Model m = ModelFactory.createModelForGraph(g) ;
+ // serialize
+
+ RDFWriter rw = m.getWriter(lang) ;
+ if ( p != null )
+ rw.setProperty(p, val) ;
+ try (StringWriter w = new StringWriter()) {
+ rw.write(m, w, "http://example.org/") ;
+ String f = w.toString() ;
+
+ switch (behaviour) {
+ case BadPropURI :
+ fail("Bad property URI <" + s + "> was not detected.") ;
+ return ;
+ case BadURI :
+ fail("Bad URI <" + s + "> was not detected.") ;
+ return ;
+ }
+ // read back in
+ Model m2 = createMemModel() ;
+ RDFReader rdr = m2.getReader("RDF/XML") ;
+ rdr.setProperty("error-mode", "lax") ;
+ try (StringReader sr = new StringReader(f)) {
+ rdr.read(m2, sr, "http://example.org/") ;
+ }
- }
- } catch (BadURIException e) {
- if (behaviour == BadURI)
- return;
- throw e;
- } catch (InvalidPropertyURIException je) {
- if (behaviour == BadPropURI)
- return;
- throw je;
- } catch (JenaException e) {
- throw e;
- } finally {
- // BaseXMLWriter.dbg = false;
- // tl.end();
- unblockLogger();
- // SystemOutAndErr.unblock();
- }
- }
+ // check
+ switch (behaviour) {
+ case ExtraTriples :
+ assertTrue("Expecting Brickley behaviour.", m2.size() == 3) ;
+ break ;
+ case NoError :
+ assertTrue("Comparing Model written out and read in.", m.isIsomorphicWith(m2)) ;
+ break ;
+ }
+ } catch (BadURIException e) {
+ if ( behaviour == BadURI )
+ return ;
+ throw e ;
+ } catch (InvalidPropertyURIException je) {
+ if ( behaviour == BadPropURI )
+ return ;
+ throw je ;
+ } catch (JenaException e) {
+ throw e ;
+ } finally {
+ // BaseXMLWriter.dbg = false;
+ // tl.end();
+ unblockLogger() ;
+ // SystemOutAndErr.unblock();
+ }
+ }
public void testBadURIAsProperty1() throws IOException {
try {
@@ -529,13 +528,14 @@ public class TestXMLFeatures extends XML
Model m = createMemModel();
m.read("file:testing/abbreviated/relative-uris.rdf");
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- RDFWriter writer = m.getWriter(lang);
- writer.setProperty("relativeURIs", relativeParam);
- writer.write(m, bos, base);
- bos.close();
+ String contents ;
+ try ( ByteArrayOutputStream bos = new ByteArrayOutputStream() ) {
+ RDFWriter writer = m.getWriter(lang);
+ writer.setProperty("relativeURIs", relativeParam);
+ writer.write(m, bos, base);
+ contents = bos.toString("UTF8");
+ }
- String contents = bos.toString("UTF8");
try {
Model m2 = createMemModel();
m2.read(new StringReader(contents), base);
@@ -558,12 +558,7 @@ public class TestXMLFeatures extends XML
String regexAbsent = it.next();
assertTrue(
"Looking for (not) /" + regexAbsent + "/",
- !Pattern
- .compile(
- "[\"']"
- + Util
- .substituteStandardEntities(regexAbsent)
- + "[\"']", Pattern.DOTALL)
+ !Pattern.compile("[\"']"+ Util.substituteStandardEntities(regexAbsent)+ "[\"']", Pattern.DOTALL)
.matcher(contents).find()
// matcher.contains(
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/XMLOutputTestBase.java Wed Jun 25 09:13:17 2014
@@ -172,6 +172,7 @@ public class XMLOutputTestBase extends M
check(filename, encoding, regexPresent, regexAbsent, errs, code, "file:"+filename);
}
+ @SuppressWarnings("resource")
protected void check(
String filename,
String encoding,
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/testWriterAndReader.java Wed Jun 25 09:13:17 2014
@@ -281,9 +281,9 @@ public class testWriterAndReader
baseUriRead = baseUris[fileNumber];
else
baseUriRead = "http://foo.com/Hello";
- InputStream rdr = new FileInputStream( filebase + fileName );
- m1.read(rdr, baseUriRead);
- rdr.close();
+ try ( InputStream rdr = new FileInputStream( filebase + fileName ) ) {
+ m1.read(rdr, baseUriRead);
+ }
for (int j = 0; j < repetitionsJ; j++) {
String baseUriWrite =
@@ -301,9 +301,9 @@ public class testWriterAndReader
m2 = createMemModel();
//empty(m2);
- InputStream in = new ByteArrayInputStream( tmpOut.toByteArray() ) ;
- rdfRdr.read(m2, in, baseUriWrite);
- in.close();
+ try ( InputStream in = new ByteArrayInputStream( tmpOut.toByteArray() ) ) {
+ rdfRdr.read(m2, in, baseUriWrite);
+ }
Model s1 = m1;
Model s2 = m2;
/*
Modified: jena/trunk/jena-core/src/test/java/jena/test/Test_schemagen.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/jena/test/Test_schemagen.java?rev=1605298&r1=1605297&r2=1605298&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/jena/test/Test_schemagen.java (original)
+++ jena/trunk/jena-core/src/test/java/jena/test/Test_schemagen.java Wed Jun 25 09:13:17 2014
@@ -674,9 +674,9 @@ public class Test_schemagen
// first write the source file to a temp dir
File tmpDir = FileUtils.getScratchDirectory( "schemagen" );
File srcFile = new File( tmpDir, className + ".java" );
- FileWriter out = new FileWriter( srcFile );
- out.write( source );
- out.close();
+ try ( FileWriter out = new FileWriter( srcFile ) ) {
+ out.write( source );
+ }
// now get ready to invoke javac using the new javax.tools package
try {