From d5719438ed9a93c4035262fa8bd94ee60eead048 Mon Sep 17 00:00:00 2001
From: Diego <diegolparra@gmail.com>
Date: Tue, 22 Aug 2017 11:56:12 -0300
Subject: move kamon.context.SimpleStringCodec to
 kamon.testkit.SimpleStringCodec in order to avoid
 java.lang.ClassNotFoundException: kamon.context.SimpleStringCodec in tests

---
 .../scala/kamon/context/ContextCodecSpec.scala     | 42 +---------------------
 kamon-testkit/src/main/resources/reference.conf    |  6 ++--
 .../main/scala/kamon/testkit/ContextTesting.scala  |  2 ++
 .../scala/kamon/testkit/SimpleStringCodec.scala    | 42 ++++++++++++++++++++++
 4 files changed, 47 insertions(+), 45 deletions(-)
 create mode 100644 kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala

diff --git a/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala b/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
index ceac4e58..ab71814f 100644
--- a/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
+++ b/kamon-core-tests/src/test/scala/kamon/context/ContextCodecSpec.scala
@@ -1,7 +1,5 @@
 package kamon.context
 
-import java.nio.ByteBuffer
-
 import kamon.Kamon
 import kamon.testkit.ContextTesting
 import org.scalatest.{Matchers, OptionValues, WordSpec}
@@ -69,42 +67,4 @@ class ContextCodecSpec extends WordSpec with Matchers with ContextTesting with O
   }
 
   val ContextCodec = new Codecs(Kamon.config())
-}
-
-object SimpleStringCodec {
-  final class Headers extends Codecs.ForEntry[TextMap] {
-    private val dataKey = "X-String-Value"
-
-    override def encode(context: Context): TextMap = {
-      val textMap = TextMap.Default()
-      context.get(ContextTesting.StringBroadcastKey).foreach { value =>
-        textMap.put(dataKey, value)
-      }
-
-      textMap
-    }
-
-    override def decode(carrier: TextMap, context: Context): Context = {
-      carrier.get(dataKey) match {
-        case value @ Some(_) => context.withKey(ContextTesting.StringBroadcastKey, value)
-        case None            => context
-      }
-    }
-  }
-
-  final class Binary extends Codecs.ForEntry[ByteBuffer] {
-    val emptyBuffer = ByteBuffer.allocate(0)
-
-    override def encode(context: Context): ByteBuffer = {
-      context.get(ContextTesting.StringBroadcastKey) match {
-        case Some(value)  => ByteBuffer.wrap(value.getBytes)
-        case None         => emptyBuffer
-      }
-    }
-
-    override def decode(carrier: ByteBuffer, context: Context): Context = {
-      context.withKey(ContextTesting.StringBroadcastKey, Some(new String(carrier.array())))
-    }
-  }
-
-}
+}
\ No newline at end of file
diff --git a/kamon-testkit/src/main/resources/reference.conf b/kamon-testkit/src/main/resources/reference.conf
index e20cf755..bd16a022 100644
--- a/kamon-testkit/src/main/resources/reference.conf
+++ b/kamon-testkit/src/main/resources/reference.conf
@@ -1,13 +1,11 @@
 kamon {
-
-
   context.codecs {
     http-headers-keys {
-      string-broadcast-key = "kamon.context.SimpleStringCodec$Headers"
+      string-broadcast-key = "kamon.testkit.SimpleStringCodec$Headers"
     }
 
     binary-keys {
-      string-broadcast-key = "kamon.context.SimpleStringCodec$Binary"
+      string-broadcast-key = "kamon.testkit.SimpleStringCodec$Binary"
     }
   }
 }
\ No newline at end of file
diff --git a/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala b/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala
index 8fd51024..b9e243d4 100644
--- a/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala
+++ b/kamon-testkit/src/main/scala/kamon/testkit/ContextTesting.scala
@@ -11,3 +11,5 @@ trait ContextTesting {
 }
 
 object ContextTesting extends ContextTesting
+
+
diff --git a/kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala b/kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala
new file mode 100644
index 00000000..f1d8cb14
--- /dev/null
+++ b/kamon-testkit/src/main/scala/kamon/testkit/SimpleStringCodec.scala
@@ -0,0 +1,42 @@
+package kamon.testkit
+
+import java.nio.ByteBuffer
+
+import kamon.context.{Codecs, Context, TextMap}
+
+object SimpleStringCodec {
+  final class Headers extends Codecs.ForEntry[TextMap] {
+    private val dataKey = "X-String-Value"
+
+    override def encode(context: Context): TextMap = {
+      val textMap = TextMap.Default()
+      context.get(ContextTesting.StringBroadcastKey).foreach { value =>
+        textMap.put(dataKey, value)
+      }
+
+      textMap
+    }
+
+    override def decode(carrier: TextMap, context: Context): Context = {
+      carrier.get(dataKey) match {
+        case value @ Some(_) => context.withKey(ContextTesting.StringBroadcastKey, value)
+        case None            => context
+      }
+    }
+  }
+
+  final class Binary extends Codecs.ForEntry[ByteBuffer] {
+    val emptyBuffer: ByteBuffer = ByteBuffer.allocate(0)
+
+    override def encode(context: Context): ByteBuffer = {
+      context.get(ContextTesting.StringBroadcastKey) match {
+        case Some(value)  => ByteBuffer.wrap(value.getBytes)
+        case None         => emptyBuffer
+      }
+    }
+
+    override def decode(carrier: ByteBuffer, context: Context): Context = {
+      context.withKey(ContextTesting.StringBroadcastKey, Some(new String(carrier.array())))
+    }
+  }
+}
-- 
cgit v1.2.3