Author: andy
Date: Wed Jun 4 10:03:04 2014
New Revision: 1600077
URL: http://svn.apache.org/r1600077
Log:
Use try-resource
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/DumpServlet.java
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/FileSender.java
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAuth.java
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java?rev=1600077&r1=1600076&r2=1600077&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/FusekiErrorHandler.java
Wed Jun 4 10:03:04 2014
@@ -53,22 +53,22 @@ public class FusekiErrorHandler extends
ServletOps.setNoCache(response) ;
ByteArrayOutputStream bytes = new ByteArrayOutputStream(1024) ;
- Writer writer = IO.asUTF8(bytes) ;
- String reason=(response instanceof
Response)?((Response)response).getReason():null;
- handleErrorPage(request, writer, response.getStatus(), reason) ;
-
- if ( ! Fuseki.VERSION.equalsIgnoreCase("development") &&
- ! Fuseki.VERSION.equals("${project.version}") )
- {
- writer.write("\n") ;
- writer.write("\n") ;
- writer.write(format("Fuseki - version %s (Build date: %s)\n",
Fuseki.VERSION, Fuseki.BUILD_DATE)) ;
+ try ( Writer writer = IO.asUTF8(bytes) ) {
+ String reason=(response instanceof
Response)?((Response)response).getReason():null;
+ handleErrorPage(request, writer, response.getStatus(), reason) ;
+
+ if ( ! Fuseki.VERSION.equalsIgnoreCase("development") &&
+ ! Fuseki.VERSION.equals("${project.version}") )
+ {
+ writer.write("\n") ;
+ writer.write("\n") ;
+ writer.write(format("Fuseki - version %s (Build date: %s)\n",
Fuseki.VERSION, Fuseki.BUILD_DATE)) ;
+ }
+ writer.flush();
+ response.setContentLength(bytes.size()) ;
+ // Copy :-(
+ response.getOutputStream().write(bytes.toByteArray()) ;
}
- writer.flush();
- response.setContentLength(bytes.size()) ;
- // Copy :-(
- response.getOutputStream().write(bytes.toByteArray()) ;
- writer.close() ;
}
@Override
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/DumpServlet.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/DumpServlet.java?rev=1600077&r1=1600076&r2=1600077&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/DumpServlet.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/DumpServlet.java
Wed Jun 4 10:03:04 2014
@@ -37,6 +37,8 @@ import javax.servlet.http.HttpServlet ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.io.IO ;
+
public class DumpServlet extends HttpServlet
{
private static final long serialVersionUID = 99L; // Serilizable.
@@ -109,10 +111,8 @@ public class DumpServlet extends HttpSer
static public String dumpRequest(HttpServletRequest req)
{
- try {
- StringWriter sw = new StringWriter() ;
- PrintWriter pw = new PrintWriter(sw) ;
-
+ try ( StringWriter sw = new StringWriter() ;
+ PrintWriter pw = new PrintWriter(sw) ) {
// Standard environment
pw.println("Method: "+req.getMethod());
pw.println("getContentLength:
"+Integer.toString(req.getContentLength()));
@@ -206,12 +206,8 @@ public class DumpServlet extends HttpSer
pw.println() ;
//printBody(pw, req) ;
- pw.close() ;
- sw.close() ;
return sw.toString() ;
- } catch (IOException e)
- { }
- return null ;
+ } catch (IOException e) { return null ; }
}
static void printBody(PrintWriter pw, HttpServletRequest req) throws
IOException
@@ -234,7 +230,7 @@ public class DumpServlet extends HttpSer
x = x.replaceAll(">", ">") ;
pw.println(x) ;
}
- try { in.reset() ;} catch (IOException e) {
System.out.println("DumpServlet: Reset of content failed: "+e) ; }
+ try { in.reset() ; } catch (IOException e) {
System.out.println("DumpServlet: Reset of content failed: "+e) ; }
}
/**
@@ -246,67 +242,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();
- }
- return sw.toString() ;
+ try ( 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() ;
+ return sw.toString() ;
+ } catch (IOException e) { IO.exception(e); return null ; }
}
public String dumpServletContext()
{
- StringWriter sw = new StringWriter() ;
- 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()+"'");
-
- {
- Enumeration<String> en = sc.getInitParameterNames();
- if (en != null) {
- pw.println("initParameters: ");
- while(en.hasMoreElements())
- {
- String key = en.nextElement();
- pw.println(key+": '"+sc.getInitParameter(key)+"'");
+ try ( StringWriter sw = new StringWriter() ;
+ 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()+"'");
+
+ {
+ 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();
- }
- return sw.toString() ;
+ pw.println() ;
+
+ return sw.toString() ;
+ } catch (IOException e) { IO.exception(e); return null ; }
}
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java?rev=1600077&r1=1600076&r2=1600077&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
Wed Jun 4 10:03:04 2014
@@ -122,10 +122,8 @@ public class ShiroEnvironmentLoader exte
// Try in webapp.
- try {
- InputStream is = ResourceUtils.getInputStreamForPath(loc);
+ try ( InputStream is = ResourceUtils.getInputStreamForPath(loc); )
{
boolean exists = (is != null ) ;
- is.close() ;
return loc ;
} catch (IOException e) { }
}
Modified:
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/FileSender.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/FileSender.java?rev=1600077&r1=1600076&r2=1600077&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/FileSender.java
(original)
+++
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/FileSender.java
Wed Jun 4 10:03:04 2014
@@ -68,8 +68,7 @@ public class FileSender {
connection.setRequestMethod(method);
connection.setDoOutput(true) ;
connection.setRequestProperty("Content-Type",
"multipart/form-data; boundary=" + boundary);
- PrintStream ps = new PrintStream(connection.getOutputStream()) ;
- try {
+ try ( PrintStream ps = new
PrintStream(connection.getOutputStream()) ; ) {
for ( Entry e : items ) {
ps.print("--" + boundary+WNL) ;
ps.print("Content-Disposition: form-data; name=\"FILE\";
filename=\""+e.fileName+"\""+WNL) ;
@@ -79,9 +78,7 @@ public class FileSender {
ps.print(WNL);
}
ps.print("--" + boundary + "--"+WNL);
- } finally {
- ps.close();
- }
+ }
connection.connect();
int responseCode = connection.getResponseCode();
} catch (IOException ex) { IO.exception(ex); }
Modified:
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java?rev=1600077&r1=1600076&r2=1600077&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
(original)
+++
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
Wed Jun 4 10:03:04 2014
@@ -91,8 +91,7 @@ public class TestAdmin extends BaseTest
// --- List all datasets
@Test public void list_datasets_1() {
- TypedInputStream in = execHttpGet(urlRoot+"$/"+opDatasets) ;
- try { in.close() ; }
+ try ( TypedInputStream in = execHttpGet(urlRoot+"$/"+opDatasets) ; ) {
}
catch (IOException e) { IO.exception(e); }
}
Modified:
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAuth.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAuth.java?rev=1600077&r1=1600076&r2=1600077&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAuth.java
(original)
+++
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAuth.java
Wed Jun 4 10:03:04 2014
@@ -66,10 +66,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.actionLog.getName(),
org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING);
