CAMEL-7999: Fixed camel-flatpack to not clash component and dataformat in same package with same name.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/55de4878 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/55de4878 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/55de4878 Branch: refs/heads/master Commit: 55de4878533ee93c19a759248e71bc5ef836254a Parents: 8dd6c1f Author: Claus Ibsen <[email protected]> Authored: Fri Jan 30 14:41:40 2015 +0100 Committer: Claus Ibsen <[email protected]> Committed: Fri Jan 30 14:41:40 2015 +0100 ---------------------------------------------------------------------- components/camel-flatpack/pom.xml | 5 +- .../component/flatpack/FlatpackDataFormat.java | 245 ------------------ .../dataformat/flatpack/FlatpackDataFormat.java | 246 +++++++++++++++++++ .../org/apache/camel/dataformat/flatpack | 2 +- .../FlatpackDelimitedDataFormatTest.java | 1 + .../FlatpackFixedLengthDataFormatTest.java | 1 + ...engthWithHeaderAndTrailerDataFormatTest.java | 1 + .../flatpack/DelimitedAllowLongTest-context.xml | 2 +- .../DelimitedAllowShortAndLongTest-context.xml | 2 +- .../DelimitedAllowShortTest-context.xml | 2 +- .../DelimitedWithUnmarshalTest-context.xml | 2 +- .../FixedLengthAllowLongTest-context.xml | 2 +- ...FixedLengthAllowShortAndLongTest-context.xml | 2 +- .../FixedLengthAllowShortTest-context.xml | 2 +- .../FixedLengthWithUnmarshalTest-context.xml | 2 +- 15 files changed, 262 insertions(+), 255 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml index 6c134f4..26ffec8 100644 --- a/components/camel-flatpack/pom.xml +++ b/components/camel-flatpack/pom.xml @@ -30,7 +30,10 @@ <description>Camel FlatPack support</description> <properties> - <camel.osgi.export.pkg>org.apache.camel.component.flatpack.*</camel.osgi.export.pkg> + <camel.osgi.export.pkg> + org.apache.camel.component.flatpack.*, + org.apache.camel.dataformat.flatpack.* + </camel.osgi.export.pkg> <camel.osgi.export.service> org.apache.camel.spi.ComponentResolver;component=flatpack, org.apache.camel.spi.DataFormatResolver;dataformat=flatpack http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java deleted file mode 100644 index 6384433..0000000 --- a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java +++ /dev/null @@ -1,245 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.flatpack; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.sf.flatpack.DataSet; -import net.sf.flatpack.DefaultParserFactory; -import net.sf.flatpack.Parser; -import net.sf.flatpack.ParserFactory; -import net.sf.flatpack.writer.DelimiterWriterFactory; -import net.sf.flatpack.writer.FixedWriterFactory; -import net.sf.flatpack.writer.Writer; -import org.apache.camel.Exchange; -import org.apache.camel.spi.DataFormat; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.ObjectHelper; -import org.apache.camel.util.ResourceHelper; -import org.jdom.JDOMException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Flatpack DataFormat. - * <p/> - * This data format supports two operations: - * <ul> - * <li>marshal = from <tt>List<Map<String, Object>></tt> to <tt>OutputStream</tt> (can be converted to String)</li> - * <li>unmarshal = from <tt>InputStream</tt> (such as a File) to {@link DataSetList}. - * </ul> - * <b>Notice:</b> The Flatpack library does currently not support header and trailers for the marshal operation. - * - * @version - */ -public class FlatpackDataFormat implements DataFormat { - private static final Logger LOG = LoggerFactory.getLogger(FlatpackDataFormat.class); - private ParserFactory parserFactory = DefaultParserFactory.getInstance(); - private char delimiter = ','; - private char textQualifier = '"'; - private boolean ignoreFirstRecord = true; - private boolean fixed; - private boolean allowShortLines; - private boolean ignoreExtraColumns; - private String definition; - - @SuppressWarnings("unchecked") - public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception { - ObjectHelper.notNull(graph, "The object to marshal must be provided"); - - List<Map<String, Object>> data = (List<Map<String, Object>>) graph; - if (data.isEmpty()) { - LOG.warn("No data to marshal as the list is empty"); - return; - } - Map<String, Object> firstRow = data.get(0); - - Writer writer = createWriter(exchange, firstRow, stream); - try { - boolean first = true; - writer.printHeader(); - for (Map<String, Object> row : data) { - if (ignoreFirstRecord && first) { - // skip first row - first = false; - continue; - } - for (Entry<String, Object> entry : row.entrySet()) { - writer.addRecordEntry(entry.getKey(), entry.getValue()); - } - writer.nextRecord(); - } - writer.printFooter(); - } finally { - writer.flush(); - writer.close(); - } - } - - public Object unmarshal(Exchange exchange, InputStream stream) throws Exception { - InputStreamReader reader = new InputStreamReader(stream, IOHelper.getCharsetName(exchange)); - try { - Parser parser = createParser(exchange, reader); - DataSet dataSet = parser.parse(); - return new DataSetList(dataSet); - } finally { - reader.close(); - } - } - - // Properties - //------------------------------------------------------------------------- - - public String getDefinition() { - return definition; - } - - public void setDefinition(String definition) { - this.definition = definition; - } - - public boolean isFixed() { - return fixed; - } - - public void setFixed(boolean fixed) { - this.fixed = fixed; - } - - public char getDelimiter() { - return delimiter; - } - - public void setDelimiter(char delimiter) { - this.delimiter = delimiter; - } - - public boolean isIgnoreFirstRecord() { - return ignoreFirstRecord; - } - - public void setIgnoreFirstRecord(boolean ignoreFirstRecord) { - this.ignoreFirstRecord = ignoreFirstRecord; - } - - public char getTextQualifier() { - return textQualifier; - } - - public void setTextQualifier(char textQualifier) { - this.textQualifier = textQualifier; - } - - public ParserFactory getParserFactory() { - return parserFactory; - } - - public void setParserFactory(ParserFactory parserFactory) { - this.parserFactory = parserFactory; - } - - public boolean isAllowShortLines() { - return this.allowShortLines; - } - - /** - * Allows for lines to be shorter than expected and ignores the extra characters - */ - public void setAllowShortLines(boolean allowShortLines) { - this.allowShortLines = allowShortLines; - } - - /** - * Allows for lines to be longer than expected and ignores the extra characters - */ - public void setIgnoreExtraColumns(boolean ignoreExtraColumns) { - this.ignoreExtraColumns = ignoreExtraColumns; - } - - public boolean isIgnoreExtraColumns() { - return ignoreExtraColumns; - } - - // Implementation methods - //------------------------------------------------------------------------- - - protected Parser createParser(Exchange exchange, Reader bodyReader) throws IOException { - if (isFixed()) { - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); - InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); - Parser parser = getParserFactory().newFixedLengthParser(reader, bodyReader); - if (allowShortLines) { - parser.setHandlingShortLines(true); - parser.setIgnoreParseWarnings(true); - } - if (ignoreExtraColumns) { - parser.setIgnoreExtraColumns(true); - parser.setIgnoreParseWarnings(true); - } - return parser; - } else { - if (ObjectHelper.isEmpty(getDefinition())) { - return getParserFactory().newDelimitedParser(bodyReader, delimiter, textQualifier); - } else { - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); - InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); - Parser parser = getParserFactory().newDelimitedParser(reader, bodyReader, delimiter, textQualifier, ignoreFirstRecord); - if (allowShortLines) { - parser.setHandlingShortLines(true); - parser.setIgnoreParseWarnings(true); - } - if (ignoreExtraColumns) { - parser.setIgnoreExtraColumns(true); - parser.setIgnoreParseWarnings(true); - } - return parser; - } - } - } - - private Writer createWriter(Exchange exchange, Map<String, Object> firstRow, OutputStream stream) throws JDOMException, IOException { - if (isFixed()) { - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); - InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); - FixedWriterFactory factory = new FixedWriterFactory(reader); - return factory.createWriter(new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange))); - } else { - if (getDefinition() == null) { - DelimiterWriterFactory factory = new DelimiterWriterFactory(delimiter, textQualifier); - // add columns from the keys in the data map as the columns must be known - for (String key : firstRow.keySet()) { - factory.addColumnTitle(key); - } - return factory.createWriter(new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange))); - } else { - InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); - InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); - DelimiterWriterFactory factory = new DelimiterWriterFactory(reader, delimiter, textQualifier); - return factory.createWriter(new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange))); - } - } - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormat.java b/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormat.java new file mode 100644 index 0000000..c8f0e46 --- /dev/null +++ b/components/camel-flatpack/src/main/java/org/apache/camel/dataformat/flatpack/FlatpackDataFormat.java @@ -0,0 +1,246 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.dataformat.flatpack; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import net.sf.flatpack.DataSet; +import net.sf.flatpack.DefaultParserFactory; +import net.sf.flatpack.Parser; +import net.sf.flatpack.ParserFactory; +import net.sf.flatpack.writer.DelimiterWriterFactory; +import net.sf.flatpack.writer.FixedWriterFactory; +import net.sf.flatpack.writer.Writer; +import org.apache.camel.Exchange; +import org.apache.camel.component.flatpack.DataSetList; +import org.apache.camel.spi.DataFormat; +import org.apache.camel.util.IOHelper; +import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.ResourceHelper; +import org.jdom.JDOMException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Flatpack DataFormat. + * <p/> + * This data format supports two operations: + * <ul> + * <li>marshal = from <tt>List<Map<String, Object>></tt> to <tt>OutputStream</tt> (can be converted to String)</li> + * <li>unmarshal = from <tt>InputStream</tt> (such as a File) to {@link org.apache.camel.component.flatpack.DataSetList}. + * </ul> + * <b>Notice:</b> The Flatpack library does currently not support header and trailers for the marshal operation. + * + * @version + */ +public class FlatpackDataFormat implements DataFormat { + private static final Logger LOG = LoggerFactory.getLogger(FlatpackDataFormat.class); + private ParserFactory parserFactory = DefaultParserFactory.getInstance(); + private char delimiter = ','; + private char textQualifier = '"'; + private boolean ignoreFirstRecord = true; + private boolean fixed; + private boolean allowShortLines; + private boolean ignoreExtraColumns; + private String definition; + + @SuppressWarnings("unchecked") + public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception { + ObjectHelper.notNull(graph, "The object to marshal must be provided"); + + List<Map<String, Object>> data = (List<Map<String, Object>>) graph; + if (data.isEmpty()) { + LOG.warn("No data to marshal as the list is empty"); + return; + } + Map<String, Object> firstRow = data.get(0); + + Writer writer = createWriter(exchange, firstRow, stream); + try { + boolean first = true; + writer.printHeader(); + for (Map<String, Object> row : data) { + if (ignoreFirstRecord && first) { + // skip first row + first = false; + continue; + } + for (Entry<String, Object> entry : row.entrySet()) { + writer.addRecordEntry(entry.getKey(), entry.getValue()); + } + writer.nextRecord(); + } + writer.printFooter(); + } finally { + writer.flush(); + writer.close(); + } + } + + public Object unmarshal(Exchange exchange, InputStream stream) throws Exception { + InputStreamReader reader = new InputStreamReader(stream, IOHelper.getCharsetName(exchange)); + try { + Parser parser = createParser(exchange, reader); + DataSet dataSet = parser.parse(); + return new DataSetList(dataSet); + } finally { + reader.close(); + } + } + + // Properties + //------------------------------------------------------------------------- + + public String getDefinition() { + return definition; + } + + public void setDefinition(String definition) { + this.definition = definition; + } + + public boolean isFixed() { + return fixed; + } + + public void setFixed(boolean fixed) { + this.fixed = fixed; + } + + public char getDelimiter() { + return delimiter; + } + + public void setDelimiter(char delimiter) { + this.delimiter = delimiter; + } + + public boolean isIgnoreFirstRecord() { + return ignoreFirstRecord; + } + + public void setIgnoreFirstRecord(boolean ignoreFirstRecord) { + this.ignoreFirstRecord = ignoreFirstRecord; + } + + public char getTextQualifier() { + return textQualifier; + } + + public void setTextQualifier(char textQualifier) { + this.textQualifier = textQualifier; + } + + public ParserFactory getParserFactory() { + return parserFactory; + } + + public void setParserFactory(ParserFactory parserFactory) { + this.parserFactory = parserFactory; + } + + public boolean isAllowShortLines() { + return this.allowShortLines; + } + + /** + * Allows for lines to be shorter than expected and ignores the extra characters + */ + public void setAllowShortLines(boolean allowShortLines) { + this.allowShortLines = allowShortLines; + } + + /** + * Allows for lines to be longer than expected and ignores the extra characters + */ + public void setIgnoreExtraColumns(boolean ignoreExtraColumns) { + this.ignoreExtraColumns = ignoreExtraColumns; + } + + public boolean isIgnoreExtraColumns() { + return ignoreExtraColumns; + } + + // Implementation methods + //------------------------------------------------------------------------- + + protected Parser createParser(Exchange exchange, Reader bodyReader) throws IOException { + if (isFixed()) { + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); + InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); + Parser parser = getParserFactory().newFixedLengthParser(reader, bodyReader); + if (allowShortLines) { + parser.setHandlingShortLines(true); + parser.setIgnoreParseWarnings(true); + } + if (ignoreExtraColumns) { + parser.setIgnoreExtraColumns(true); + parser.setIgnoreParseWarnings(true); + } + return parser; + } else { + if (ObjectHelper.isEmpty(getDefinition())) { + return getParserFactory().newDelimitedParser(bodyReader, delimiter, textQualifier); + } else { + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); + InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); + Parser parser = getParserFactory().newDelimitedParser(reader, bodyReader, delimiter, textQualifier, ignoreFirstRecord); + if (allowShortLines) { + parser.setHandlingShortLines(true); + parser.setIgnoreParseWarnings(true); + } + if (ignoreExtraColumns) { + parser.setIgnoreExtraColumns(true); + parser.setIgnoreParseWarnings(true); + } + return parser; + } + } + } + + private Writer createWriter(Exchange exchange, Map<String, Object> firstRow, OutputStream stream) throws JDOMException, IOException { + if (isFixed()) { + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); + InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); + FixedWriterFactory factory = new FixedWriterFactory(reader); + return factory.createWriter(new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange))); + } else { + if (getDefinition() == null) { + DelimiterWriterFactory factory = new DelimiterWriterFactory(delimiter, textQualifier); + // add columns from the keys in the data map as the columns must be known + for (String key : firstRow.keySet()) { + factory.addColumnTitle(key); + } + return factory.createWriter(new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange))); + } else { + InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext().getClassResolver(), getDefinition()); + InputStreamReader reader = new InputStreamReader(is, IOHelper.getCharsetName(exchange)); + DelimiterWriterFactory factory = new DelimiterWriterFactory(reader, delimiter, textQualifier); + return factory.createWriter(new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange))); + } + } + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/dataformat/flatpack ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/dataformat/flatpack b/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/dataformat/flatpack index 2263e7d..6731ece 100644 --- a/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/dataformat/flatpack +++ b/components/camel-flatpack/src/main/resources/META-INF/services/org/apache/camel/dataformat/flatpack @@ -15,4 +15,4 @@ # limitations under the License. # -class=org.apache.camel.component.flatpack.FlatpackDataFormat +class=org.apache.camel.dataformat.flatpack.FlatpackDataFormat http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java index 03703f6..e902734 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; +import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java index 8fac600..eb83b7b 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; +import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java index d25619d..afad8e0 100644 --- a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java +++ b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java @@ -22,6 +22,7 @@ import java.util.Map; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.IOConverter; +import org.apache.camel.dataformat.flatpack.FlatpackDataFormat; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml index 6ecc13b..8801506 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowLongTest-context.xml @@ -21,7 +21,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - <bean id="df" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="df" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="INVENTORY-Delimited.pzmap.xml"/> <property name="fixed" value="false"/> <property name="ignoreExtraColumns" value="true"/> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml index 4de44be..fc4dfc2 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortAndLongTest-context.xml @@ -21,7 +21,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - <bean id="df" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="df" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="INVENTORY-Delimited.pzmap.xml"/> <property name="fixed" value="false"/> <property name="ignoreExtraColumns" value="true"/> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml index ff884b4..3d780fb 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedAllowShortTest-context.xml @@ -21,7 +21,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd"> - <bean id="df" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="df" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="INVENTORY-Delimited.pzmap.xml"/> <property name="fixed" value="false"/> <property name="allowShortLines" value="true"/> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml index e39bf64..4a41ed5 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/DelimitedWithUnmarshalTest-context.xml @@ -36,7 +36,7 @@ </camelContext> <!-- END SNIPPET: example --> - <bean id="delimitedFormat" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="delimitedFormat" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="INVENTORY-Delimited.pzmap.xml"/> </bean> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowLongTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowLongTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowLongTest-context.xml index 39cbb2d..a60b89a 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowLongTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowLongTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> - <bean id="df" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="df" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="PEOPLE-FixedLength.pzmap.xml"/> <property name="fixed" value="true"/> <property name="ignoreExtraColumns" value="true"/> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest-context.xml index 06f4882..a82a945 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortAndLongTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> - <bean id="df" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="df" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="PEOPLE-FixedLength.pzmap.xml"/> <property name="fixed" value="true"/> <property name="ignoreExtraColumns" value="true"/> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortTest-context.xml index 5a27558..b98c2e6 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthAllowShortTest-context.xml @@ -22,7 +22,7 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> - <bean id="df" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="df" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="PEOPLE-FixedLength.pzmap.xml"/> <property name="fixed" value="true"/> <property name="allowShortLines" value="true"/> http://git-wip-us.apache.org/repos/asf/camel/blob/55de4878/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml index fc019d9..4f47df1 100644 --- a/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml +++ b/components/camel-flatpack/src/test/resources/org/apache/camel/component/flatpack/FixedLengthWithUnmarshalTest-context.xml @@ -35,7 +35,7 @@ </route> </camelContext> - <bean id="fixedFormat" class="org.apache.camel.component.flatpack.FlatpackDataFormat"> + <bean id="fixedFormat" class="org.apache.camel.dataformat.flatpack.FlatpackDataFormat"> <property name="definition" value="PEOPLE-FixedLength.pzmap.xml"/> <property name="fixed" value="true"/> </bean>
