CAMEL-10791-review adjustment and some proper naming for the option
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc72a19a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc72a19a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc72a19a Branch: refs/heads/master Commit: fc72a19af4722ae162de1f15bd14fe18276cb70e Parents: 06e0527 Author: onders86 <ondersez...@gmail.com> Authored: Tue Mar 14 13:12:26 2017 +0300 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 14 18:29:38 2017 +0100 ---------------------------------------------------------------------- .../camel/dataformat/zipfile/ZipFileDataFormat.java | 15 ++++++++------- .../apache/camel/dataformat/zipfile/ZipIterator.java | 14 +++++++++++--- .../dataformat/zipfile/ZipFileDataFormatTest.java | 4 ++-- 3 files changed, 21 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fc72a19a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java index 8ae24b2..72b4ce5 100644 --- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java +++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormat.java @@ -39,7 +39,7 @@ import static org.apache.camel.Exchange.FILE_NAME; */ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, DataFormatName { private boolean usingIterator; - private boolean supportEmptyDirectory; + private boolean supportIteratorForEmptyDirectory; @Override public String getDataFormatName() { @@ -73,9 +73,10 @@ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, Dat @Override public Object unmarshal(final Exchange exchange, final InputStream inputStream) throws Exception { - exchange.getIn().setHeader("unzipEmptyDirectorySupported", isSupportEmptyDirectory()); if (usingIterator) { - return new ZipIterator(exchange.getIn()); + ZipIterator zipIterator = new ZipIterator(exchange.getIn()); + zipIterator.setSupportIteratorForEmptyDirectory(supportIteratorForEmptyDirectory); + return zipIterator; } else { ZipInputStream zis = new ZipInputStream(inputStream); OutputStreamBuilder osb = OutputStreamBuilder.withExchange(exchange); @@ -107,12 +108,12 @@ public class ZipFileDataFormat extends ServiceSupport implements DataFormat, Dat this.usingIterator = usingIterator; } - public boolean isSupportEmptyDirectory() { - return supportEmptyDirectory; + public boolean isSupportIteratorForEmptyDirectory() { + return supportIteratorForEmptyDirectory; } - public void setSupportEmptyDirectory(boolean supportEmptyDirectory) { - this.supportEmptyDirectory = supportEmptyDirectory; + public void setSupportIteratorForEmptyDirectory(boolean supportIteratorForEmptyDirectory) { + this.supportIteratorForEmptyDirectory = supportIteratorForEmptyDirectory; } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/fc72a19a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java ---------------------------------------------------------------------- diff --git a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java index bd67f8a..3370d21 100644 --- a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java +++ b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java @@ -40,13 +40,13 @@ public class ZipIterator implements Iterator<Message>, Closeable { static final Logger LOGGER = LoggerFactory.getLogger(ZipIterator.class); private final Message inputMessage; - private final boolean unzipEmptyDirectorySupported; + private boolean supportIteratorForEmptyDirectory; private volatile ZipInputStream zipInputStream; private volatile Message parent; public ZipIterator(Message inputMessage) { this.inputMessage = inputMessage; - this.unzipEmptyDirectorySupported = (boolean)inputMessage.getHeader("unzipEmptyDirectorySupported"); + this.supportIteratorForEmptyDirectory = false; InputStream inputStream = inputMessage.getBody(InputStream.class); if (inputStream instanceof ZipInputStream) { zipInputStream = (ZipInputStream)inputStream; @@ -132,7 +132,7 @@ public class ZipIterator implements Iterator<Message>, Closeable { if (!entry.isDirectory()) { return entry; } else { - if (unzipEmptyDirectorySupported) { + if (supportIteratorForEmptyDirectory) { ZipEntry dirEntry = new ZipEntry(entry.getName()); return dirEntry; } @@ -152,4 +152,12 @@ public class ZipIterator implements Iterator<Message>, Closeable { IOHelper.close(zipInputStream); zipInputStream = null; } + + public boolean isSupportIteratorForEmptyDirectory() { + return supportIteratorForEmptyDirectory; + } + + public void setSupportIteratorForEmptyDirectory(boolean supportIteratorForEmptyDirectory) { + this.supportIteratorForEmptyDirectory = supportIteratorForEmptyDirectory; + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/fc72a19a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java index caf71dc..de996fb 100644 --- a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java +++ b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java @@ -117,7 +117,7 @@ public class ZipFileDataFormatTest extends CamelTestSupport { public void testUnzipWithEmptyDirectorySupported() throws Exception { deleteDirectory(new File("hello_out")); zip.setUsingIterator(true); - zip.setSupportEmptyDirectory(true); + zip.setSupportIteratorForEmptyDirectory(true); template.sendBody("direct:unzipWithEmptyDirectory", new File("src/test/resources/hello.odt")); assertTrue(Files.exists(Paths.get("hello_out/Configurations2"))); deleteDirectory(new File("hello_out")); @@ -127,7 +127,7 @@ public class ZipFileDataFormatTest extends CamelTestSupport { public void testUnzipWithEmptyDirectoryUnsupported() throws Exception { deleteDirectory(new File("hello_out")); zip.setUsingIterator(true); - zip.setSupportEmptyDirectory(false); + zip.setSupportIteratorForEmptyDirectory(false); template.sendBody("direct:unzipWithEmptyDirectory", new File("src/test/resources/hello.odt")); assertTrue(!Files.exists(Paths.get("hello_out/Configurations2"))); deleteDirectory(new File("hello_out"));
