You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/22 08:55:55 UTC

[2/7] camel git commit: Optimise - Allow to turn off loading type converters from classpath scanning.

Optimise - Allow to turn off loading type converters from classpath scanning.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa2a738a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa2a738a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa2a738a

Branch: refs/heads/master
Commit: aa2a738a43893d4da9f7f4ff46bb3a6149eebbdc
Parents: 50eacdd
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jun 21 18:38:48 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 22 10:27:34 2017 +0200

----------------------------------------------------------------------
 .../org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java  | 1 -
 .../org/apache/camel/itest/jmh/LoadTypeConvertersTest.java  | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/aa2a738a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java
index 1dc29f4..60b08f9 100644
--- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java
+++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/CaseInsensitiveMapTest.java
@@ -88,7 +88,6 @@ public class CaseInsensitiveMapTest {
         Map<String, Object> map1 = generateRandomMap(10);
         Map<String, Object> map2 = generateRandomMap(10);
 
-
         private Map<String, Object> generateRandomMap(int size) {
             return IntStream.range(0, size)
                     .boxed()

http://git-wip-us.apache.org/repos/asf/camel/blob/aa2a738a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java
index 4dcbe59..4b2dd39 100644
--- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java
+++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/LoadTypeConvertersTest.java
@@ -62,18 +62,19 @@ public class LoadTypeConvertersTest {
         new Runner(opt).run();
     }
 
-    // The JMH samples are the best documentation for how to use it
-    // http://hg.openjdk.java.net/code-tools/jmh/file/tip/jmh-samples/src/main/java/org/openjdk/jmh/samples/
+    /**
+     * Setup a fresh CamelContext per invocation
+     */
     @State(Scope.Thread)
     public static class BenchmarkState {
         CamelContext camel;
 
-        @Setup(Level.Trial)
+        @Setup(Level.Invocation)
         public void initialize() {
             camel = new DefaultCamelContext();
         }
 
-        @TearDown(Level.Trial)
+        @TearDown(Level.Invocation)
         public void close() {
             try {
                 camel.stop();