Finished migration and incorporated brook_serializer 2.0

lib/brook/driver/kafka/serializer.ex

@@ -7,13 +7,10 @@ defimpl Brook.Serializer.Protocol, for: Brook.Event do
   `Brook.Event` struct type.
   """
 
-  @struct_key "__brook_struct__"
-
   def serialize(%Brook.Event{} = event) do
     %{"type" => event.type, "author" => event.author, "create_ts" => event.create_ts, "forwarded" => event.forwarded}
-    |> Map.put(@struct_key, Brook.Event)
+    |> Map.put(Brook.Serializer.struct_key(), Brook.Event)
     |> serialize_data(event.data)
-    |> encode()
   end
 
   defp serialize_data(message, data) do
@@ -22,9 +19,6 @@ defimpl Brook.Serializer.Protocol, for: Brook.Event do
       error_result -> error_result
     end
   end
-
-  defp encode({:ok, value}), do: Jason.encode(value)
-  defp encode({:error, _reason} = error), do: error
 end
 
 defimpl Brook.Deserializer.Protocol, for: Brook.Event do

lib/brook/storage/redis/migration.ex

@@ -41,6 +41,7 @@ defmodule Brook.Storage.Redis.Migration do
 
   defp move_old_entry(redix, view_state) do
     key = view_state["redis_key"]
+
     commands = [
       ["RENAME", key, "old:" <> key],
       ["EXPIRE", "old:" <> key, @expiration],

mix.exs

@@ -25,7 +25,7 @@ defmodule Brook.MixProject do
   # Run "mix help deps" to learn about dependencies.
   defp deps do
     [
-      {:brook_serializer, git: "https://github.com/bbalser/brook_serializer.git", branch: "master"},
+      {:brook_serializer, "~> 2.0"},
       {:redix, "~> 0.10.2"},
       {:elsa, "~> 0.9.0"},
       {:placebo, "~> 1.2", only: [:dev, :test, :integration]},

mix.lock

@@ -1,15 +1,13 @@
 %{
   "assertions": {:hex, :assertions, "0.14.1", "352391bbcecbfce7d4594df1267ee4ca7a8b79981859a4befdf62dd798769c42", [:mix], [], "hexpm"},
   "brod": {:hex, :brod, "3.8.1", "74426e2d27989cd7f973599bc209c899dca8588068d27a2a37ca1b4bf8823c2a", [:make, :rebar, :rebar3], [{:kafka_protocol, "2.2.9", [hex: :kafka_protocol, repo: "hexpm", optional: false]}, {:supervisor3, "1.1.8", [hex: :supervisor3, repo: "hexpm", optional: false]}], "hexpm"},
-  "brook_serializer": {:git, "https://github.com/bbalser/brook_serializer.git", "2bab2d9b5fb77063e82ce22b9e99bd277cc1cbbd", [branch: "master"]},
+  "brook_serializer": {:hex, :brook_serializer, "2.0.0", "e12e742d6a533b3820615edb9dd33791f68b7233123d8e7a9db77edb29706aa1", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"},
   "crc32cer": {:hex, :crc32cer, "0.1.3", "8984906c4b4fae6aa292c48f286a1c83b19ad44bd102287acb94d696015967ce", [:make, :rebar, :rebar3], [], "hexpm"},
-  "dialyxir": {:hex, :dialyxir, "1.0.0-rc.6", "78e97d9c0ff1b5521dd68041193891aebebce52fc3b93463c0a6806874557d7d", [:mix], [{:erlex, "~> 0.2.1", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm"},
   "divo": {:hex, :divo, "1.1.9", "6f91b0a02bd97800eb9a99abd771b4c9b67d282b67abc223eb2832b93f557b7e", [:mix], [{:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:patiently, "~> 0.2", [hex: :patiently, repo: "hexpm", optional: false]}], "hexpm"},
-  "divo_kafka": {:hex, :divo_kafka, "0.1.5", "3bd0474b3c4c8f639211e3a83fd97bb54277f6fa7c72e87a0914f57d68457d0f", [:mix], [{:divo, "~> 1.1", [hex: :divo, repo: "hexpm", optional: false]}], "hexpm"},
+  "divo_kafka": {:hex, :divo_kafka, "0.1.6", "dffaa5d419d75e6607b581187347e6fef18b9d06d517a0f7a49772b52f60115f", [:mix], [{:divo, "~> 1.1", [hex: :divo, repo: "hexpm", optional: false]}], "hexpm"},
   "divo_redis": {:hex, :divo_redis, "0.1.4", "f5bbe82ce88bdd0ea54d6b14cd8dc1a800b872f0e488e6f2715b95cd6f349ee7", [:mix], [{:divo, "~> 1.1", [hex: :divo, repo: "hexpm", optional: false]}], "hexpm"},
-  "earmark": {:hex, :earmark, "1.3.5", "0db71c8290b5bc81cb0101a2a507a76dca659513984d683119ee722828b424f6", [:mix], [], "hexpm"},
+  "earmark": {:hex, :earmark, "1.4.1", "07bb382826ee8d08d575a1981f971ed41bd5d7e86b917fd012a93c51b5d28727", [:mix], [], "hexpm"},
   "elsa": {:hex, :elsa, "0.9.0", "34f8dd7e4b8cd17895452f93ebeb7b5756ef94e039cc6b1db63dc4b86d2dd304", [:mix], [{:brod, "~> 3.8", [hex: :brod, repo: "hexpm", optional: false]}], "hexpm"},
-  "erlex": {:hex, :erlex, "0.2.4", "23791959df45fe8f01f388c6f7eb733cc361668cbeedd801bf491c55a029917b", [:mix], [], "hexpm"},
   "ex_doc": {:hex, :ex_doc, "0.20.2", "1bd0dfb0304bade58beb77f20f21ee3558cc3c753743ae0ddbb0fd7ba2912331", [:mix], [{:earmark, "~> 1.3", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.10", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
   "jason": {:hex, :jason, "1.1.2", "b03dedea67a99223a2eaf9f1264ce37154564de899fd3d8b9a21b1a6fd64afe7", [:mix], [{:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm"},
   "kafka_protocol": {:hex, :kafka_protocol, "2.2.9", "fbec2ddb607a0cb05b832a93dcfdd4dbae6bd3b838c9aace93f6871bbb91f81f", [:rebar, :rebar3], [{:crc32cer, "0.1.3", [hex: :crc32cer, repo: "hexpm", optional: false]}, {:snappyer, "1.2.4", [hex: :snappyer, repo: "hexpm", optional: false]}], "hexpm"},