camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1245084 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/ components/camel-test-spring/src/main/java/org/apache/camel/test/spring/ components/camel-test/src/main/java/org/apache/camel/test/ components/camel-test/src/main/java/o...
Date Thu, 16 Feb 2012 17:06:48 GMT
Author: davsclaus
Date: Thu Feb 16 17:06:47 2012
New Revision: 1245084

URL: http://svn.apache.org/viewvc?rev=1245084&view=rev
Log:
CAMEL-5011: Do not use lazy load type converter.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
    camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
    camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
    camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
    camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=1245084&r1=1245083&r2=1245084&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Thu Feb
16 17:06:47 2012
@@ -142,13 +142,12 @@ public abstract class ContextTestSupport
 
     /**
      * Whether or not type converters should be lazy loaded (notice core converters is always
loaded)
-     * <p/>
-     * We enabled lazy by default as it would speedup unit testing.
      *
-     * @return <tt>true</tt> by default.
+     * @return <tt>false</tt> by default.
      */
+    @Deprecated
     protected boolean isLazyLoadingTypeConverter() {
-        return true;
+        return false;
     }
 
     protected void stopCamelContext() throws Exception {

Modified: camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java?rev=1245084&r1=1245083&r2=1245084&view=diff
==============================================================================
--- camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
(original)
+++ camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
Thu Feb 16 17:06:47 2012
@@ -31,11 +31,12 @@ import java.lang.annotation.Target;
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
+@Deprecated
 public @interface LazyLoadTypeConverters {
     
     /**
      * Whether the test annotated with this annotation should be run with lazy type converter
loading in Camel.
      * Defaults to {@code true}. 
      */
-    boolean value() default true;
+    boolean value() default false;
 }

Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1245084&r1=1245083&r2=1245084&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
(original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
Thu Feb 16 17:06:47 2012
@@ -232,13 +232,12 @@ public abstract class CamelTestSupport e
 
     /**
      * Whether or not type converters should be lazy loaded (notice core converters is always
loaded)
-     * <p/>
-     * We enabled lazy by default as it would speedup unit testing.
      *
-     * @return <tt>true</tt> by default.
+     * @return <tt>false</tt> by default.
      */
+    @Deprecated
     protected boolean isLazyLoadingTypeConverter() {
-        return true;
+        return false;
     }
 
     /**

Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=1245084&r1=1245083&r2=1245084&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
(original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
Thu Feb 16 17:06:47 2012
@@ -335,13 +335,12 @@ public abstract class CamelTestSupport e
 
     /**
      * Whether or not type converters should be lazy loaded (notice core converters is always
loaded)
-     * <p/>
-     * We enabled lazy by default as it would speedup unit testing.
      *
-     * @return <tt>true</tt> by default.
+     * @return <tt>false</tt> by default.
      */
+    @Deprecated
     protected boolean isLazyLoadingTypeConverter() {
-        return true;
+        return false;
     }
 
     protected void postProcessTest() throws Exception {

Modified: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java?rev=1245084&r1=1245083&r2=1245084&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
(original)
+++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
Thu Feb 16 17:06:47 2012
@@ -338,13 +338,12 @@ public abstract class CamelTestSupport e
 
     /**
      * Whether or not type converters should be lazy loaded (notice core converters is always
loaded)
-     * <p/>
-     * We enabled lazy by default as it would speedup unit testing.
      *
-     * @return <tt>true</tt> by default.
+     * @return <tt>false</tt> by default.
      */
+    @Deprecated
     protected boolean isLazyLoadingTypeConverter() {
-        return true;
+        return false;
     }
 
     /**



Mime
View raw message