From 5dfe2b7680ecee68671159a2b42aab599e5271d3 Mon Sep 17 00:00:00 2001
From: Jordan Halterman <jordan.halterman@gmail.com>
Date: Fri, 17 Nov 2017 00:20:05 -0800
Subject: [PATCH] Move messaging package into a single module.

---
 messaging/api/pom.xml                         | 36 -----------
 messaging/netty/pom.xml                       | 61 -------------------
 messaging/pom.xml                             | 42 ++++++++++---
 .../java/io/atomix/messaging/Endpoint.java    |  0
 .../messaging/ManagedMessagingService.java    |  0
 .../atomix/messaging/MessagingException.java  |  0
 .../io/atomix/messaging/MessagingService.java |  0
 .../atomix/messaging/impl}/DecoderState.java  |  2 +-
 .../messaging/impl}/InternalMessage.java      |  2 +-
 .../atomix/messaging/impl}/InternalReply.java |  2 +-
 .../messaging/impl}/InternalRequest.java      |  2 +-
 .../messaging/impl}/MessageDecoder.java       |  2 +-
 .../messaging/impl}/MessageEncoder.java       |  2 +-
 .../impl}/NettyMessagingService.java          |  2 +-
 .../io/atomix/messaging/package-info.java     |  0
 .../impl}/NettyMessagingServiceTest.java      |  2 +-
 16 files changed, 43 insertions(+), 112 deletions(-)
 delete mode 100644 messaging/api/pom.xml
 delete mode 100644 messaging/netty/pom.xml
 rename messaging/{api => }/src/main/java/io/atomix/messaging/Endpoint.java (100%)
 rename messaging/{api => }/src/main/java/io/atomix/messaging/ManagedMessagingService.java (100%)
 rename messaging/{api => }/src/main/java/io/atomix/messaging/MessagingException.java (100%)
 rename messaging/{api => }/src/main/java/io/atomix/messaging/MessagingService.java (100%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/DecoderState.java (96%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/InternalMessage.java (98%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/InternalReply.java (98%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/InternalRequest.java (97%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/MessageDecoder.java (99%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/MessageEncoder.java (99%)
 rename messaging/{netty/src/main/java/io/atomix/messaging/netty => src/main/java/io/atomix/messaging/impl}/NettyMessagingService.java (99%)
 rename messaging/{api => }/src/main/java/io/atomix/messaging/package-info.java (100%)
 rename messaging/{netty/src/test/java/io.atomix.messaging.netty => src/test/java/io/atomix/messaging/impl}/NettyMessagingServiceTest.java (99%)

diff --git a/messaging/api/pom.xml b/messaging/api/pom.xml
deleted file mode 100644
index 2e18453741..0000000000
--- a/messaging/api/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  ~ Copyright 2017-present Open Networking Foundation
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>io.atomix</groupId>
-    <artifactId>atomix-messaging-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-  </parent>
-
-  <packaging>bundle</packaging>
-  <artifactId>atomix-messaging</artifactId>
-  <name>Atomix Messaging</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.atomix</groupId>
-      <artifactId>atomix-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/messaging/netty/pom.xml b/messaging/netty/pom.xml
deleted file mode 100644
index 33c485ccda..0000000000
--- a/messaging/netty/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-  ~ Copyright 2017-present Open Networking Foundation
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>io.atomix</groupId>
-    <artifactId>atomix-messaging-parent</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-  </parent>
-
-  <packaging>bundle</packaging>
-  <artifactId>atomix-netty</artifactId>
-  <name>Atomix Messaging :: Netty</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>io.atomix</groupId>
-      <artifactId>atomix-messaging</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.atomix</groupId>
-      <artifactId>atomix-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-      <version>${netty.version}</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/messaging/pom.xml b/messaging/pom.xml
index aa2641c920..f555dbf2d1 100644
--- a/messaging/pom.xml
+++ b/messaging/pom.xml
@@ -22,12 +22,40 @@
     <version>2.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>pom</packaging>
-  <artifactId>atomix-messaging-parent</artifactId>
-  <name>Atomix Messaging Parent</name>
+  <packaging>bundle</packaging>
+  <artifactId>atomix-messaging</artifactId>
+  <name>Atomix Messaging</name>
 
-  <modules>
-    <module>api</module>
-    <module>netty</module>
-  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-messaging</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/messaging/api/src/main/java/io/atomix/messaging/Endpoint.java b/messaging/src/main/java/io/atomix/messaging/Endpoint.java
similarity index 100%
rename from messaging/api/src/main/java/io/atomix/messaging/Endpoint.java
rename to messaging/src/main/java/io/atomix/messaging/Endpoint.java
diff --git a/messaging/api/src/main/java/io/atomix/messaging/ManagedMessagingService.java b/messaging/src/main/java/io/atomix/messaging/ManagedMessagingService.java
similarity index 100%
rename from messaging/api/src/main/java/io/atomix/messaging/ManagedMessagingService.java
rename to messaging/src/main/java/io/atomix/messaging/ManagedMessagingService.java
diff --git a/messaging/api/src/main/java/io/atomix/messaging/MessagingException.java b/messaging/src/main/java/io/atomix/messaging/MessagingException.java
similarity index 100%
rename from messaging/api/src/main/java/io/atomix/messaging/MessagingException.java
rename to messaging/src/main/java/io/atomix/messaging/MessagingException.java
diff --git a/messaging/api/src/main/java/io/atomix/messaging/MessagingService.java b/messaging/src/main/java/io/atomix/messaging/MessagingService.java
similarity index 100%
rename from messaging/api/src/main/java/io/atomix/messaging/MessagingService.java
rename to messaging/src/main/java/io/atomix/messaging/MessagingService.java
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/DecoderState.java b/messaging/src/main/java/io/atomix/messaging/impl/DecoderState.java
similarity index 96%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/DecoderState.java
rename to messaging/src/main/java/io/atomix/messaging/impl/DecoderState.java
index 589f322857..228be1f66e 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/DecoderState.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/DecoderState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 /**
  * State transitions a decoder goes through as it is decoding an incoming message.
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/InternalMessage.java b/messaging/src/main/java/io/atomix/messaging/impl/InternalMessage.java
similarity index 98%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/InternalMessage.java
rename to messaging/src/main/java/io/atomix/messaging/impl/InternalMessage.java
index bfd34579af..4fc85593c9 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/InternalMessage.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/InternalMessage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 /**
  * Base class for internal messages.
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/InternalReply.java b/messaging/src/main/java/io/atomix/messaging/impl/InternalReply.java
similarity index 98%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/InternalReply.java
rename to messaging/src/main/java/io/atomix/messaging/impl/InternalReply.java
index 2604158238..bbe55f36bc 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/InternalReply.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/InternalReply.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.MoreObjects;
 import io.atomix.utils.ArraySizeHashPrinter;
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/InternalRequest.java b/messaging/src/main/java/io/atomix/messaging/impl/InternalRequest.java
similarity index 97%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/InternalRequest.java
rename to messaging/src/main/java/io/atomix/messaging/impl/InternalRequest.java
index 4727775499..bc7b0b5cad 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/InternalRequest.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/InternalRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.MoreObjects;
 import io.atomix.messaging.Endpoint;
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/MessageDecoder.java b/messaging/src/main/java/io/atomix/messaging/impl/MessageDecoder.java
similarity index 99%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/MessageDecoder.java
rename to messaging/src/main/java/io/atomix/messaging/impl/MessageDecoder.java
index cb48495803..5400284472 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/MessageDecoder.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/MessageDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.Charsets;
 import io.atomix.messaging.Endpoint;
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/MessageEncoder.java b/messaging/src/main/java/io/atomix/messaging/impl/MessageEncoder.java
similarity index 99%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/MessageEncoder.java
rename to messaging/src/main/java/io/atomix/messaging/impl/MessageEncoder.java
index e9727c10fa..4a153c5b93 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/MessageEncoder.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/MessageEncoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.Charsets;
 import io.atomix.messaging.Endpoint;
diff --git a/messaging/netty/src/main/java/io/atomix/messaging/netty/NettyMessagingService.java b/messaging/src/main/java/io/atomix/messaging/impl/NettyMessagingService.java
similarity index 99%
rename from messaging/netty/src/main/java/io/atomix/messaging/netty/NettyMessagingService.java
rename to messaging/src/main/java/io/atomix/messaging/impl/NettyMessagingService.java
index e63a671bdf..244fe70a9d 100644
--- a/messaging/netty/src/main/java/io/atomix/messaging/netty/NettyMessagingService.java
+++ b/messaging/src/main/java/io/atomix/messaging/impl/NettyMessagingService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
diff --git a/messaging/api/src/main/java/io/atomix/messaging/package-info.java b/messaging/src/main/java/io/atomix/messaging/package-info.java
similarity index 100%
rename from messaging/api/src/main/java/io/atomix/messaging/package-info.java
rename to messaging/src/main/java/io/atomix/messaging/package-info.java
diff --git a/messaging/netty/src/test/java/io.atomix.messaging.netty/NettyMessagingServiceTest.java b/messaging/src/test/java/io/atomix/messaging/impl/NettyMessagingServiceTest.java
similarity index 99%
rename from messaging/netty/src/test/java/io.atomix.messaging.netty/NettyMessagingServiceTest.java
rename to messaging/src/test/java/io/atomix/messaging/impl/NettyMessagingServiceTest.java
index 5cda385234..d0521cdfb2 100644
--- a/messaging/netty/src/test/java/io.atomix.messaging.netty/NettyMessagingServiceTest.java
+++ b/messaging/src/test/java/io/atomix/messaging/impl/NettyMessagingServiceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Uninterruptibles;