svn commit: r748106 - in /camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack: FixedLengthEndpoint.java FlatpackConverter.java FlatpackDataFormat.java

[da...@apache.org]

Author: davsclaus
Date: Thu Feb 26 11:58:41 2009
New Revision: 748106

URL: http://svn.apache.org/viewvc?rev=748106&view=rev
Log:
Polished code.

Modified:
    camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
    camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
    camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java

Modified: camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java?rev=748106&r1=748105&r2=748106&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java (original)
+++ camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FixedLengthEndpoint.java Thu Feb 26 11:58:41 2009
@@ -82,7 +82,7 @@
 
     public Parser createParser(Exchange exchange) throws InvalidPayloadException, IOException {
         Resource resource = getResource();
-        ObjectHelper.notNull(resource, "endpoint.resource");
+        ObjectHelper.notNull(resource, "resource");
         Reader bodyReader = ExchangeHelper.getMandatoryInBody(exchange, Reader.class);
         return createParser(resource, bodyReader);
     }

Modified: camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java?rev=748106&r1=748105&r2=748106&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java (original)
+++ camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java Thu Feb 26 11:58:41 2009
@@ -58,7 +58,7 @@
     /**
      * Puts the values of the dataset into the map
      */
-    public static void putValues(Map<String, Object> map, DataSet dataSet) {
+    private static void putValues(Map<String, Object> map, DataSet dataSet) {
         boolean header = dataSet.isRecordID(FlatpackComponent.HEADER_ID);
         boolean trailer = dataSet.isRecordID(FlatpackComponent.TRAILER_ID);
 

Modified: camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java?rev=748106&r1=748105&r2=748106&view=diff
==============================================================================
--- camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java (original)
+++ camel/trunk/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackDataFormat.java Thu Feb 26 11:58:41 2009
@@ -61,6 +61,7 @@
     private Resource definition;
     private boolean fixed;
 
+    @SuppressWarnings("unchecked")
     public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
         ObjectHelper.notNull(graph, "The object to marshal must be provided");
 
@@ -161,7 +162,7 @@
     protected Parser createParser(Exchange exchange, Reader bodyReader) throws IOException {
         if (isFixed()) {
             Resource resource = getDefinition();
-            ObjectHelper.notNull(resource, "resource property");
+            ObjectHelper.notNull(resource, "resource");
             return getParserFactory().newFixedLengthParser(new InputStreamReader(resource.getInputStream()), bodyReader);
         } else {
             Resource resource = getDefinition();
@@ -176,7 +177,7 @@
     private Writer createWriter(Exchange exchange, Map<String, Object> firstRow, OutputStream stream) throws JDOMException, IOException {
         if (isFixed()) {
             Resource resource = getDefinition();
-            ObjectHelper.notNull(resource, "resource property");
+            ObjectHelper.notNull(resource, "resource");
             FixedWriterFactory factory = new FixedWriterFactory(new InputStreamReader(resource.getInputStream()));
             return factory.createWriter(new OutputStreamWriter(stream));
         } else {