Author: davsclaus
Date: Mon Apr 23 04:50:36 2012
New Revision: 1329063
URL: http://svn.apache.org/viewvc?rev=1329063&view=rev
Log:
Polished
Added:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/ConverterUtils.java
- copied unchanged from r1328837,
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/ConverterUtils.java
Removed:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/Converter.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
camel/branches/camel-2.9.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1328837
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1329063&r1=1329062&r2=1329063&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
Mon Apr 23 04:50:36 2012
@@ -33,7 +33,7 @@ import org.apache.camel.dataformat.bindy
import org.apache.camel.dataformat.bindy.annotation.OneToMany;
import org.apache.camel.dataformat.bindy.annotation.Section;
import org.apache.camel.dataformat.bindy.format.FormatException;
-import org.apache.camel.dataformat.bindy.util.Converter;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -234,7 +234,7 @@ public class BindyCsvFactory extends Bin
// Check if separator exists
ObjectHelper.notNull(this.separator, "The separator has not been
instantiated or property not defined in the @CsvRecord annotation");
- char separator = Converter.getCharDelimitor(this.getSeparator());
+ char separator = ConverterUtils.getCharDelimiter(this.getSeparator());
if (LOG.isDebugEnabled()) {
LOG.debug("Separator converted: '0x{}', from: {}",
Integer.toHexString(separator), this.getSeparator());
@@ -309,7 +309,7 @@ public class BindyCsvFactory extends Bin
}
if (it.hasNext()) {
-
buffer.append(Converter.getStringCarriageReturn(getCarriageReturn()));
+
buffer.append(ConverterUtils.getStringCarriageReturn(getCarriageReturn()));
}
}
}
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=1329063&r1=1329062&r2=1329063&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
Mon Apr 23 04:50:36 2012
@@ -31,7 +31,7 @@ import org.apache.camel.dataformat.bindy
import org.apache.camel.dataformat.bindy.annotation.Message;
import org.apache.camel.dataformat.bindy.annotation.OneToMany;
import org.apache.camel.dataformat.bindy.annotation.Section;
-import org.apache.camel.dataformat.bindy.util.Converter;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -424,7 +424,7 @@ public class BindyKeyValuePairFactory ex
// Check if separator exists
ObjectHelper.notNull(this.pairSeparator, "The pair separator has not
been instantiated or property not defined in the @Message annotation");
- char separator = Converter.getCharDelimitor(this.getPairSeparator());
+ char separator =
ConverterUtils.getCharDelimiter(this.getPairSeparator());
if (LOG.isDebugEnabled()) {
LOG.debug("Separator converted: '0x{}', from: {}",
Integer.toHexString(separator), this.getPairSeparator());
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=1329063&r1=1329062&r2=1329063&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
Mon Apr 23 04:50:36 2012
@@ -32,7 +32,7 @@ import org.apache.camel.converter.IOConv
import org.apache.camel.dataformat.bindy.BindyAbstractDataFormat;
import org.apache.camel.dataformat.bindy.BindyAbstractFactory;
import org.apache.camel.dataformat.bindy.BindyCsvFactory;
-import org.apache.camel.dataformat.bindy.util.Converter;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.IOHelper;
@@ -61,7 +61,7 @@ public class BindyCsvDataFormat extends
ObjectHelper.notNull(factory, "not instantiated");
// Get CRLF
- byte[] bytesCRLF =
Converter.getByteReturn(factory.getCarriageReturn());
+ byte[] bytesCRLF =
ConverterUtils.getByteReturn(factory.getCarriageReturn());
if (factory.getGenerateHeaderColumnNames()) {
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java?rev=1329063&r1=1329062&r2=1329063&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
Mon Apr 23 04:50:36 2012
@@ -28,7 +28,7 @@ import java.util.Scanner;
import org.apache.camel.Exchange;
import org.apache.camel.dataformat.bindy.BindyFixedLengthFactory;
-import org.apache.camel.dataformat.bindy.util.Converter;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.IOHelper;
@@ -60,7 +60,7 @@ public class BindyFixedLengthDataFormat
ObjectHelper.notNull(factory, "not instantiated");
// Get CRLF
- byte[] bytesCRLF =
Converter.getByteReturn(factory.getCarriageReturn());
+ byte[] bytesCRLF =
ConverterUtils.getByteReturn(factory.getCarriageReturn());
List<Map<String, Object>> models;
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java?rev=1329063&r1=1329062&r2=1329063&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/kvp/BindyKeyValuePairDataFormat.java
Mon Apr 23 04:50:36 2012
@@ -30,7 +30,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.dataformat.bindy.BindyAbstractDataFormat;
import org.apache.camel.dataformat.bindy.BindyAbstractFactory;
import org.apache.camel.dataformat.bindy.BindyKeyValuePairFactory;
-import org.apache.camel.dataformat.bindy.util.Converter;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.util.IOHelper;
@@ -60,7 +60,7 @@ public class BindyKeyValuePairDataFormat
byte[] crlf;
// Get CRLF
- crlf = Converter.getByteReturn(factory.getCarriageReturn());
+ crlf = ConverterUtils.getByteReturn(factory.getCarriageReturn());
for (Map<String, Object> model : models) {
String result = factory.unbind(model);
Modified:
camel/branches/camel-2.9.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java?rev=1329063&r1=1329062&r2=1329063&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalWithQuoteTest.java
Mon Apr 23 04:50:36 2012
@@ -18,7 +18,7 @@ package org.apache.camel.dataformat.bind
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.util.Converter;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.model.dataformat.BindyType;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -31,7 +31,7 @@ public class BindyMarshalWithQuoteTest e
@Test
public void testBindyMarshalWithQuote() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("\"123\",\"Wednesday, November 9,
2011\",\"Central California\"" + Converter.getStringCarriageReturn("WINDOWS"));
+ mock.expectedBodiesReceived("\"123\",\"Wednesday, November 9,
2011\",\"Central California\"" +
ConverterUtils.getStringCarriageReturn("WINDOWS"));
WeatherModel model = new WeatherModel();
model.setId(123);
