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/07/15 12:12:03 UTC
[2/3] camel git commit: CAMEL-XXX Add JMH benchmarks for
TypeConverter - replace Scanner with IOHelper for reading file,
fix checkstyle in SimpleMockTest.java
CAMEL-XXX Add JMH benchmarks for TypeConverter - replace Scanner with IOHelper for reading file, fix checkstyle in SimpleMockTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/320eff0b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/320eff0b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/320eff0b
Branch: refs/heads/master
Commit: 320eff0ba334be6932ce381bb9b26a59093a0940
Parents: d7c2906
Author: Lachowicz, Marcin <la...@gmail.com>
Authored: Sat Jul 15 13:03:01 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jul 15 13:34:03 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/itest/jmh/TypeConverterTest.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/320eff0b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java
index 912225e..329ea5b 100644
--- a/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java
+++ b/tests/camel-jmh/src/test/java/org/apache/camel/itest/jmh/TypeConverterTest.java
@@ -20,13 +20,13 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-import java.util.Scanner;
import java.util.concurrent.TimeUnit;
import org.w3c.dom.Document;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.IOHelper;
import org.junit.Test;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.Level;
@@ -89,7 +89,7 @@ public class TypeConverterTest {
// ignore
}
- xmlAsString = getResourceAsString("sample_soap.xml");
+ xmlAsString = IOHelper.loadText(getClass().getClassLoader().getResourceAsStream("sample_soap.xml"));
xmlAsBytes = xmlAsString.getBytes(StandardCharsets.UTF_8);
}
@@ -101,12 +101,6 @@ public class TypeConverterTest {
// ignore
}
}
-
- private String getResourceAsString(String resource) {
- Scanner s = new Scanner(getClass().getClassLoader().getResourceAsStream(resource))
- .useDelimiter("\\A");
- return s.hasNext() ? s.next() : "";
- }
}