You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/04/18 12:39:46 UTC
[1/2] cxf git commit: Stream cleanup
Repository: cxf
Updated Branches:
refs/heads/master c94d8b2c3 -> 679835fe2
Stream cleanup
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d1513222
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d1513222
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d1513222
Branch: refs/heads/master
Commit: d151322220de948dea0539d5077354c988db80fb
Parents: c94d8b2
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 18 11:39:17 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Apr 18 11:39:17 2016 +0100
----------------------------------------------------------------------
.../common/toolspec/AbstractToolContainer.java | 6 +--
.../toolspec/parser/CommandLineParser.java | 44 +++++++++++---------
.../toolspec/parser/CommandLineParserTest.java | 13 +++---
3 files changed, 35 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d1513222/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
index 263621c..d26c3ef 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
@@ -83,7 +83,7 @@ public abstract class AbstractToolContainer implements ToolContainer {
}
}
- public void parseCommandLine() throws BadUsageException {
+ public void parseCommandLine() throws BadUsageException, IOException {
if (toolspec != null) {
parser = new CommandLineParser(toolspec);
commandDoc = parser.parseArguments(arguments);
@@ -176,8 +176,8 @@ public abstract class AbstractToolContainer implements ToolContainer {
init();
try {
parseCommandLine();
- } catch (BadUsageException bue) {
- throw new ToolException(bue);
+ } catch (BadUsageException | IOException e) {
+ throw new ToolException(e);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/d1513222/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
index 7da11ef..967f4be 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParser.java
@@ -20,6 +20,7 @@
package org.apache.cxf.tools.common.toolspec.parser;
import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
@@ -68,11 +69,11 @@ public class CommandLineParser {
return res.toArray(new String[res.size()]);
}
- public CommandDocument parseArguments(String args) throws BadUsageException {
+ public CommandDocument parseArguments(String args) throws BadUsageException, IOException {
return parseArguments(getArgsFromString(args));
}
- public CommandDocument parseArguments(String[] args) throws BadUsageException {
+ public CommandDocument parseArguments(String[] args) throws BadUsageException, IOException {
if (LOG.isLoggable(Level.FINE)) {
StringBuilder debugMsg = new StringBuilder("Parsing arguments: ");
@@ -185,9 +186,10 @@ public class CommandLineParser {
new StreamSource(Tool.class
.getResourceAsStream("indent-no-xml-declaration.xsl")));
- OutputStream os = new ByteArrayOutputStream();
- serializer.transform(new DOMSource(resultDoc), new StreamResult(os));
- LOG.fine(os.toString());
+ try (OutputStream os = new ByteArrayOutputStream()) {
+ serializer.transform(new DOMSource(resultDoc), new StreamResult(os));
+ LOG.fine(os.toString());
+ }
} catch (Exception ex) {
LOG.log(Level.SEVERE, "ERROR_SERIALIZE_COMMAND_MSG", ex);
}
@@ -196,7 +198,7 @@ public class CommandLineParser {
return new CommandDocument(toolspec, resultDoc);
}
- public void throwUsage(ErrorVisitor errors) throws BadUsageException {
+ public void throwUsage(ErrorVisitor errors) throws BadUsageException, IOException {
try {
throw new BadUsageException(getUsage(), errors);
} catch (TransformerException ex) {
@@ -205,28 +207,32 @@ public class CommandLineParser {
}
}
- public String getUsage() throws TransformerException {
+ public String getUsage() throws TransformerException, IOException {
// REVISIT: style usage document into a form more readily output as a
// usage message
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- InputStream in = getClass().getResourceAsStream("usage.xsl");
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ InputStream in = getClass().getResourceAsStream("usage.xsl");
- toolspec.transform(in, baos);
- return baos.toString();
+ toolspec.transform(in, baos);
+ return baos.toString();
+ }
}
- public String getDetailedUsage() throws TransformerException {
+ public String getDetailedUsage() throws TransformerException, IOException {
// REVISIT: style usage document into a form more readily output as a
// usage message
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
- return baos.toString();
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
+ return baos.toString();
+ }
}
- public String getFormattedDetailedUsage() throws TransformerException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
- String usage = baos.toString();
+ public String getFormattedDetailedUsage() throws TransformerException, IOException {
+ String usage = null;
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ toolspec.transform(getClass().getResourceAsStream("detailedUsage.xsl"), baos);
+ usage = baos.toString();
+ }
// we use the following pattern to format usage
// |-------|-options|------|description-----------------|
// before option white space size is 7
http://git-wip-us.apache.org/repos/asf/cxf/blob/d1513222/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
----------------------------------------------------------------------
diff --git a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
index 9ca2489..8019ada 100644
--- a/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
+++ b/tools/common/src/test/java/org/apache/cxf/tools/common/toolspec/parser/CommandLineParserTest.java
@@ -19,6 +19,7 @@
package org.apache.cxf.tools.common.toolspec.parser;
+import java.io.IOException;
import java.util.StringTokenizer;
import org.apache.cxf.common.util.StringUtils;
@@ -97,7 +98,7 @@ public class CommandLineParserTest extends Assert {
}
@Test
- public void testInvalidOption() {
+ public void testInvalidOption() throws IOException {
try {
String[] args = new String[] {"-n", "-r", "arg1"};
parser.parseArguments(args);
@@ -119,7 +120,7 @@ public class CommandLineParserTest extends Assert {
}
@Test
- public void testMissingOption() {
+ public void testMissingOption() throws IOException {
try {
String[] args = new String[] {"-n", "test", "arg1"};
parser.parseArguments(args);
@@ -138,7 +139,7 @@ public class CommandLineParserTest extends Assert {
}
@Test
- public void testMissingArgument() {
+ public void testMissingArgument() throws IOException {
try {
String[] args = new String[] {"-n", "test", "-r"};
parser.parseArguments(args);
@@ -157,7 +158,7 @@ public class CommandLineParserTest extends Assert {
}
@Test
- public void testDuplicateArgument() {
+ public void testDuplicateArgument() throws IOException {
try {
String[] args = new String[] {"-n", "test", "-r", "arg1", "arg2"};
parser.parseArguments(args);
@@ -171,7 +172,7 @@ public class CommandLineParserTest extends Assert {
}
@Test
- public void testUnexpectedOption() {
+ public void testUnexpectedOption() throws IOException {
try {
String[] args = new String[] {"-n", "test", "-r", "-unknown"};
parser.parseArguments(args);
@@ -191,7 +192,7 @@ public class CommandLineParserTest extends Assert {
@Test
- public void testInvalidPackageName() {
+ public void testInvalidPackageName() throws IOException {
try {
String[] args = new String[]{
[2/2] cxf git commit: More Strema cleanup
Posted by co...@apache.org.
More Strema cleanup
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/679835fe
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/679835fe
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/679835fe
Branch: refs/heads/master
Commit: 679835fe23883ce9937ecf1e88b0d448d56a2992
Parents: d151322
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Apr 18 11:39:26 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Apr 18 11:39:26 2016 +0100
----------------------------------------------------------------------
.../jaxrs/provider/DataSourceProviderTest.java | 18 ++++++++++--------
.../cxf/systest/jaxws/ClientServerMiscTest.java | 15 ++++++++-------
.../cxf/systest/jaxws/ClientServerTest.java | 1 +
.../datasource/DataSourceProviderTest.java | 10 ++++------
.../cxf/systest/swa/ClientServerSwaTest.java | 4 ++--
5 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/679835fe/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
index ca87769..8b51eba 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/DataSourceProviderTest.java
@@ -76,12 +76,13 @@ public class DataSourceProviderTest extends Assert {
DataSourceProvider<DataSource> p = new DataSourceProvider<DataSource>();
DataSource ds = new InputStreamDataSource(new ByteArrayInputStream("image".getBytes()),
"image/png");
- ByteArrayOutputStream os = new ByteArrayOutputStream();
MultivaluedMap<String, Object> outHeaders = new MetadataMap<String, Object>();
- p.writeTo(ds, DataSource.class, DataSource.class, new Annotation[]{},
- MediaType.valueOf("image/png"), outHeaders, os);
- assertEquals("image", os.toString());
+ try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ p.writeTo(ds, DataSource.class, DataSource.class, new Annotation[]{},
+ MediaType.valueOf("image/png"), outHeaders, os);
+ assertEquals("image", os.toString());
+ }
assertEquals(0, outHeaders.size());
}
@@ -91,11 +92,12 @@ public class DataSourceProviderTest extends Assert {
p.setUseDataSourceContentType(true);
DataSource ds = new InputStreamDataSource(new ByteArrayInputStream("image".getBytes()),
"image/png");
- ByteArrayOutputStream os = new ByteArrayOutputStream();
MultivaluedMap<String, Object> outHeaders = new MetadataMap<String, Object>();
- p.writeTo(ds, DataSource.class, DataSource.class, new Annotation[]{},
- MediaType.valueOf("image/jpeg"), outHeaders, os);
- assertEquals("image", os.toString());
+ try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+ p.writeTo(ds, DataSource.class, DataSource.class, new Annotation[]{},
+ MediaType.valueOf("image/jpeg"), outHeaders, os);
+ assertEquals("image", os.toString());
+ }
assertEquals("image/png", outHeaders.getFirst("Content-Type"));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/679835fe/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
index ead7c4f..0ae5a02 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
@@ -887,14 +887,15 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
String str = IOUtils.readStringFromStream(con.getInputStream());
//Check to make sure SESSIONID is a string
- BufferedReader reader = new BufferedReader(new StringReader(str));
- String s = reader.readLine();
- while (s != null) {
- if (s.contains("SESSIONID") && s.contains("element ")) {
- assertTrue(s.contains("string"));
- assertFalse(s.contains("headerObj"));
+ try (BufferedReader reader = new BufferedReader(new StringReader(str))) {
+ String s = reader.readLine();
+ while (s != null) {
+ if (s.contains("SESSIONID") && s.contains("element ")) {
+ assertTrue(s.contains("string"));
+ assertFalse(s.contains("headerObj"));
+ }
+ s = reader.readLine();
}
- s = reader.readLine();
}
//wsdl is correct, now make sure we can actually invoke it
QName name = new QName("http://cxf.apache.org/cxf5064",
http://git-wip-us.apache.org/repos/asf/cxf/blob/679835fe/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
index abc9ed8..7bece33 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
@@ -805,6 +805,7 @@ public class ClientServerTest extends AbstractBusClientServerTestBase {
GZIPInputStream inputStream = new GZIPInputStream(in);
Document doc = StaxUtils.read(inputStream);
assertNotNull(doc);
+ inputStream.close();
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/679835fe/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
index 792fa8e..35d1fce 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
@@ -90,9 +90,9 @@ public class DataSourceProviderTest extends AbstractBusClientServerTestBase {
conn.setRequestMethod("POST");
conn.addRequestProperty("Content-Type", contentType);
- OutputStream out = conn.getOutputStream();
- IOUtils.copy(in, out);
- out.close();
+ try (OutputStream out = conn.getOutputStream()) {
+ IOUtils.copy(in, out);
+ }
MimeMultipart mm = readAttachmentParts(conn.getContentType(),
conn.getInputStream());
@@ -101,8 +101,7 @@ public class DataSourceProviderTest extends AbstractBusClientServerTestBase {
}
private void printSource(Source source) {
- try {
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
StreamResult sr = new StreamResult(bos);
TransformerFactory transformerFactory = TransformerFactory.newInstance();
transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
@@ -112,7 +111,6 @@ public class DataSourceProviderTest extends AbstractBusClientServerTestBase {
transformer.setOutputProperties(oprops);
transformer.transform(source, sr);
assertEquals(bos.toString(), "<doc><response>Hello</response></doc>");
- bos.close();
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/679835fe/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
----------------------------------------------------------------------
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
index 4e5c166..997d3d7 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
@@ -174,12 +174,12 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
port.echoDataRef(structHolder);
handler = structHolder.value.getDataRef();
- InputStream bis = null;
- bis = handler.getDataSource().getInputStream();
+ InputStream bis = handler.getDataSource().getInputStream();
byte b[] = new byte[10];
bis.read(b, 0, 10);
String string = IOUtils.newStringFromBytes(b);
assertEquals("testfoobar", string);
+ bis.close();
}
@Test