From 96118ec40e7f100270d774db10ca6dac55a608de Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Sun, 8 May 2016 22:01:59 -0400
Subject: [PATCH] Renamed com.aphyr to io.riemann

Assumes https://github.com/riemann/riemann-java-client/pull/71 has
been merged.
---
 CHANGES.markdown                | 7 +++++++
 src/riemann/common.clj          | 2 +-
 src/riemann/transport.clj       | 4 ++--
 test/riemann/client_test.clj    | 2 +-
 test/riemann/transport_test.clj | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGES.markdown b/CHANGES.markdown
index 1d765a0a5..8dd8a45c1 100644
--- a/CHANGES.markdown
+++ b/CHANGES.markdown
@@ -1,3 +1,10 @@
+# Version 0.2.12
+
+## Deprecations and API changes
+
+- The `com.aphyr` namespace used by the Riemamn Java client has been
+  updated to `io.riemann`. The client is now updated in Riemann.
+
 # Version 0.2.11
 
 This update includes a variety of bug fixes and improvements. Also
diff --git a/src/riemann/common.clj b/src/riemann/common.clj
index fee51cf47..8c86ffe01 100644
--- a/src/riemann/common.clj
+++ b/src/riemann/common.clj
@@ -3,7 +3,7 @@
   definitions and codecs, some vector set ops, etc."
   (:import [java.util Date]
            (java.io InputStream)
-           [com.aphyr.riemann Proto$Query Proto$Event Proto$Msg]
+           [io.riemann.riemann Proto$Query Proto$Event Proto$Msg]
            [java.net InetAddress])
   (:require clj-time.core
             clj-time.format
diff --git a/src/riemann/transport.clj b/src/riemann/transport.clj
index 54927fcb2..aeb16450e 100644
--- a/src/riemann/transport.clj
+++ b/src/riemann/transport.clj
@@ -14,7 +14,7 @@
     (java.util List)
     (java.util.concurrent TimeUnit
                           Executors)
-    (com.aphyr.riemann Proto$Msg)
+    (io.riemann.riemann Proto$Msg)
     (io.netty.channel ChannelInitializer
                       Channel
                       ChannelPipeline
@@ -38,7 +38,7 @@
 (def ioutil-lock
   "There's a bug in JDK 6, 7, and 8 which can cause a deadlock initializing
   sse-server and netty concurrently; we serialize them with this lock.
-  https://github.com/aphyr/riemann/issues/617"
+  https://github.com/riemann/riemann/issues/617"
   (Object.))
 
 (defn ^DefaultChannelGroup channel-group
diff --git a/test/riemann/client_test.clj b/test/riemann/client_test.clj
index 9f0075288..e1f010ce8 100644
--- a/test/riemann/client_test.clj
+++ b/test/riemann/client_test.clj
@@ -48,7 +48,7 @@
 
       (try
         (is (thrown-with-msg?
-              com.aphyr.riemann.client.ServerError
+              io.riemann.riemann.client.ServerError
               #"^mismatched input 'no' expecting \{<EOF>, 'or', 'and'\}$"
               @(query client "oh no not again")))
         (finally
diff --git a/test/riemann/transport_test.clj b/test/riemann/transport_test.clj
index 6658beb0e..e8d2915be 100644
--- a/test/riemann/transport_test.clj
+++ b/test/riemann/transport_test.clj
@@ -157,7 +157,7 @@
     ; Works with valid config
     (test-tcp-client client server)
 
-    (logging/suppress ["com.aphyr.riemann.client.TcpTransport"]
+    (logging/suppress ["io.riemann.riemann.client.TcpTransport"]
       ; Fails with mismatching client key/cert
       (is (thrown? IOException
                    (test-tcp-client (assoc client :key (:key server))