camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ond...@apache.org
Subject [camel] branch master updated (081474d -> 40177eb)
Date Fri, 05 Oct 2018 22:52:17 GMT
This is an automated email from the ASF dual-hosted git repository.

onders pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


    from 081474d  CAMEL-12855 - camel-swagger-java not honoring the x-forwarded-[host,proto,prefix]
headers.
     add 07bd826  CAMEL-12698: Use the Files API to read files instead of Scanner
     add d670dbe  Adjust the KeyValuePairDataFormat class to resist the Unicode newline
     add 08fe4e9  CAMEL-12698: Use the Stream API to read files instead of Scanner
     add 7f7e9a0  Merge branch 'fix-bindy-parser' of github.com:MakotoTheKnight/camel into
fix-bindy-parser
     add 86f51e6  Audit fixes
     add 9d946dc  Update comment per review feedback.
     new 248cb88  CAMEL-12698: Use the Stream API to read files instead of Scanner
     new 40177eb  CAMEL-12698 - conflict resolution after merging #2454

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel/dataformat/bindy/WrappedException.java   |  38 ++++++++
 .../dataformat/bindy/csv/BindyCsvDataFormat.java   | 103 +++++++++++----------
 .../bindy/kvp/BindyKeyValuePairDataFormat.java     |  85 ++++++++++-------
 ...indySimpleCsvUnmarshallUnicodeNextLineTest.java |  72 ++++++++++++++
 ...BindySimpleKeyValuePairUnicodeNextLineTest.java | 100 ++++++++++++++++++++
 .../bindy/model/unicode/LocationRecord.java        |  51 ++++++++++
 ...pleCsvUnmarshallUnicodeNextLineTest-context.xml |  34 +++++++
 ...mpleKeyValuePairUnicodeNextLineTest-context.xml |  34 +++++++
 8 files changed, 435 insertions(+), 82 deletions(-)
 create mode 100644 components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/WrappedException.java
 create mode 100644 components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest.java
 create mode 100644 components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest.java
 create mode 100644 components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/unicode/LocationRecord.java
 create mode 100644 components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallUnicodeNextLineTest-context.xml
 create mode 100644 components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fix/BindySimpleKeyValuePairUnicodeNextLineTest-context.xml


Mime
View raw message