This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 6482b79 Upgrade Flatpack
6482b79 is described below
commit 6482b79b7638ed18d512bfce5de019ac581c26bb
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Tue Jun 4 11:13:54 2019 +0100
Upgrade Flatpack
---
components/camel-flatpack/pom.xml | 7 +-
.../camel/component/flatpack/DataSetList.java | 74 +++++++++++++++++++++-
.../dataformat/flatpack/FlatpackDataFormat.java | 3 +-
.../component/flatpack/InvalidFixedLengthTest.java | 2 +-
parent/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 1 -
6 files changed, 76 insertions(+), 13 deletions(-)
diff --git a/components/camel-flatpack/pom.xml
b/components/camel-flatpack/pom.xml
index 39112b2..64abad9 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -34,7 +34,7 @@
<properties>
<camel.osgi.import.additional>
- net.sf.flatpack.*;version="[3.1.1,4)"
+ net.sf.flatpack.*;version="[4,5)"
</camel.osgi.import.additional>
</properties>
@@ -50,11 +50,6 @@
<artifactId>flatpack</artifactId>
<version>${flatpack-version}</version>
</dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom-version}</version>
- </dependency>
<!-- logging -->
<dependency>
diff --git
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
index 6987993..f554b29 100644
---
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
+++
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/DataSetList.java
@@ -19,13 +19,20 @@ package org.apache.camel.component.flatpack;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.util.AbstractList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Properties;
+import java.util.function.DoubleSupplier;
+import java.util.function.IntSupplier;
+import java.util.function.LongSupplier;
+import java.util.function.Supplier;
+import net.sf.flatpack.DataError;
import net.sf.flatpack.DataSet;
import net.sf.flatpack.Record;
import net.sf.flatpack.ordering.OrderBy;
@@ -93,7 +100,7 @@ public class DataSetList extends AbstractList<Map<String,
Object>> implements Da
}
@Override
- public List getErrors() {
+ public List<DataError> getErrors() {
return dataSet.getErrors();
}
@@ -253,7 +260,70 @@ public class DataSetList extends AbstractList<Map<String,
Object>> implements Da
}
@Override
- public Record getRecord() {
+ public String getString(String column, Supplier<String> defaultSupplier) {
+ return dataSet.getString(column, defaultSupplier);
+ }
+
+ @Override
+ public double getDouble(String column, DoubleSupplier defaultSupplier) {
+ return dataSet.getDouble(column, defaultSupplier);
+ }
+
+ @Override
+ public BigDecimal getBigDecimal(String column, Supplier<BigDecimal>
defaultSupplier) {
+ return dataSet.getBigDecimal(column, defaultSupplier);
+ }
+
+ @Override
+ public int getInt(String column, IntSupplier defaultSupplier) {
+ return dataSet.getInt(column, defaultSupplier);
+ }
+
+ @Override
+ public long getLong(String column, LongSupplier defaultSupplier) {
+ return dataSet.getLong(column, defaultSupplier);
+ }
+
+ @Override
+ public Date getDate(String column, Supplier<Date> defaultSupplier) throws
ParseException {
+ return dataSet.getDate(column, defaultSupplier);
+ }
+
+ @Override
+ public Date getDate(String column, SimpleDateFormat sdf, Supplier<Date>
defaultSupplier)
+ throws ParseException {
+ return dataSet.getDate(column, sdf, defaultSupplier);
+ }
+
+ @Override
+ public LocalDate getLocalDate(String column, Supplier<LocalDate>
defaultSupplier) throws ParseException {
+ return dataSet.getLocalDate(column, defaultSupplier);
+ }
+
+ @Override
+ public LocalDate getLocalDate(String column) throws ParseException {
+ return dataSet.getLocalDate(column);
+ }
+
+ @Override
+ public LocalDate getLocalDate(String column, String dateFormat,
Supplier<LocalDate> defaultSupplier)
+ throws ParseException {
+ return dataSet.getLocalDate(column, dateFormat, defaultSupplier);
+ }
+
+ @Override
+ public LocalDate getLocalDate(String column, String dateFormat) throws
ParseException {
+ return dataSet.getLocalDate(column, dateFormat);
+ }
+
+ @Override
+ public String getRecordID() {
+ return dataSet.getRecordID();
+ }
+
+ @Override
+ public Optional<Record> getRecord() {
return dataSet.getRecord();
}
+
}
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
index 7c899ad..9888cf8 100644
---
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
@@ -42,7 +42,6 @@ import org.apache.camel.support.ExchangeHelper;
import org.apache.camel.support.ResourceHelper;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.ObjectHelper;
-import org.jdom.JDOMException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -238,7 +237,7 @@ public class FlatpackDataFormat extends ServiceSupport
implements DataFormat, Da
}
}
- private Writer createWriter(Exchange exchange, Map<String, Object>
firstRow, OutputStream stream) throws JDOMException, IOException {
+ private Writer createWriter(Exchange exchange, Map<String, Object>
firstRow, OutputStream stream) throws IOException {
if (isFixed()) {
InputStream is =
ResourceHelper.resolveMandatoryResourceAsInputStream(exchange.getContext(),
getDefinition());
InputStreamReader reader = new InputStreamReader(is,
ExchangeHelper.getCharsetName(exchange));
diff --git
a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
index 0c6dded..298e14a 100644
---
a/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
+++
b/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/InvalidFixedLengthTest.java
@@ -43,7 +43,7 @@ public class InvalidFixedLengthTest extends
AbstractJUnit4SpringContextTests {
Exchange e = error.getReceivedExchanges().get(0);
FlatpackException cause = e.getProperty(Exchange.EXCEPTION_CAUGHT,
FlatpackException.class);
- Assert.notNull(cause);
+ Assert.notNull(cause, "Exception should not be null");
Assert.hasText("Flatpack has found 4 errors while parsing.
Exchange[PEOPLE-FixedLength.txt]", cause.getMessage());
Assert.hasText("Line:4 Level:2 Desc:LINE TOO LONG. LINE IS 278 LONG.
SHOULD BE 277", cause.getMessage());
diff --git a/parent/pom.xml b/parent/pom.xml
index 265905c..ef9144b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -215,7 +215,7 @@
<google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version>
<google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version>
<google-maps-services-version>0.2.9</google-maps-services-version>
- <flatpack-version>3.4.3</flatpack-version>
+ <flatpack-version>4.0.4</flatpack-version>
<flink-version>1.8.0</flink-version>
<fop-bundle-version>2.3_1</fop-bundle-version>
<fop-version>2.3</fop-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 223e670..ad7f7f7 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -962,7 +962,6 @@
</feature>
<feature name='camel-flatpack' version='${project.version}' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
- <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle
dependency='true'>mvn:net.sf.flatpack/flatpack/${flatpack-version}</bundle>
<bundle>mvn:org.apache.camel/camel-flatpack/${project.version}</bundle>
</feature>
