You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/07/20 15:22:38 UTC

svn commit: r795825 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/ components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/ components/camel-h...

Author: ningjiang
Date: Mon Jul 20 13:22:37 2009
New Revision: 795825

URL: http://svn.apache.org/viewvc?rev=795825&view=rev
Log:
Fixed the CS errors and also added the serialVersionUID for the CamelExceptions

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
    camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
    camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java?rev=795825&r1=795824&r2=795825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/AlreadyStoppedException.java Mon Jul 20 13:22:37 2009
@@ -22,6 +22,7 @@
  * @version $Revision$
  */
 public class AlreadyStoppedException extends CamelException {
+    private static final long serialVersionUID = -8721487434390572639L;
 
     public AlreadyStoppedException() {
         super("Already stopped");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java?rev=795825&r1=795824&r2=795825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelException.java Mon Jul 20 13:22:37 2009
@@ -22,6 +22,7 @@
  * @version $Revision$
  */
 public class CamelException extends Exception {
+    private static final long serialVersionUID = -8721487434390572630L;
 
     public CamelException() {
     }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java?rev=795825&r1=795824&r2=795825&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/NoTypeConversionAvailableException.java Mon Jul 20 13:22:37 2009
@@ -22,6 +22,7 @@
  * @version $Revision$
  */
 public class NoTypeConversionAvailableException extends CamelException {
+    private static final long serialVersionUID = -8721487434390572636L;
     private final transient Object value;
     private final transient Class type;
 

Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=795825&r1=795824&r2=795825&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java Mon Jul 20 13:22:37 2009
@@ -132,12 +132,12 @@
                         LOG.debug("Size of the record splitted : " + result.size());
                     }
 
-                   	// Bind data from CSV record with model classes
-                   	factory.bind(result, model);
+                    // Bind data from CSV record with model classes
+                    factory.bind(result, model);
+
+                    // Link objects together
+                    factory.link(model);
 
-                   	// Link objects together
-                   	factory.link(model);
-                    	
                     // Add objects graph to the list
                     models.add(model);
 

Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java?rev=795825&r1=795824&r2=795825&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java Mon Jul 20 13:22:37 2009
@@ -156,8 +156,8 @@
             return new RouteBuilder() {
                 @Override
                 public void configure() {
-                        from("direct:start1").unmarshal(formatOptional).to("mock:result1");
-                        from("direct:start2").unmarshal(formatMandatory).to("mock:result2");
+                    from("direct:start1").unmarshal(formatOptional).to("mock:result1");
+                    from("direct:start2").unmarshal(formatMandatory).to("mock:result2");
                 }
             };
         }

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java?rev=795825&r1=795824&r2=795825&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpOperationFailedException.java Mon Jul 20 13:22:37 2009
@@ -23,7 +23,8 @@
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.StatusLine;
 
-public class HttpOperationFailedException extends CamelException {    
+public class HttpOperationFailedException extends CamelException {
+    private static final long serialVersionUID = -8721487434390572633L;
     private final String redirectLocation;
     private final int statusCode;
     private final StatusLine statusLine;