From 88b2fe8c90d9c5b2bd6b811d88396cafc5427011 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 2 Mar 2023 11:20:22 +0100
Subject: [PATCH] Fold atomix-utils into atomix-storage

There is very little value in keeping these two artifacts separate,
combine them to form a single unit.

JIRA: CONTROLLER-2071
Change-Id: I480ce9d050f32d5d843cc5ada90dcf422ee7f7ee
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             |  5 --
 .../md-sal/sal-akka-segmented-journal/pom.xml |  6 --
 third-party/atomix/pom.xml                    |  1 -
 third-party/atomix/storage/pom.xml            | 21 ++++-
 .../BufferAwareByteArrayOutputStream.java     |  0
 .../utils/serializer/ByteArrayOutput.java     |  0
 .../atomix/utils/serializer/KryoIOPool.java   |  0
 .../utils/serializer/KryoInputPool.java       |  0
 .../utils/serializer/KryoOutputPool.java      |  0
 .../io/atomix/utils/serializer/Namespace.java |  0
 .../atomix/utils/serializer/Namespaces.java   |  0
 .../atomix/utils/serializer/Serializer.java   |  0
 .../utils/serializer/SerializerBuilder.java   |  0
 .../atomix/utils/serializer/package-info.java |  0
 .../serializers/ArraysAsListSerializer.java   |  0
 .../serializers/DefaultSerializers.java       |  0
 .../serializers/ImmutableListSerializer.java  |  0
 .../serializers/ImmutableMapSerializer.java   |  0
 .../serializers/ImmutableSetSerializer.java   |  0
 .../serializer/serializers/package-info.java  |  0
 .../BufferAwareByteArrayOutputStreamTest.java |  0
 .../utils/serializer/KryoInputPoolTest.java   |  0
 .../utils/serializer/KryoOutputPoolTest.java  |  0
 third-party/atomix/utils/pom.xml              | 76 -------------------
 24 files changed, 18 insertions(+), 91 deletions(-)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/KryoIOPool.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/KryoInputPool.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/Namespace.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/Namespaces.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/Serializer.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/package-info.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/serializers/ArraysAsListSerializer.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/serializers/DefaultSerializers.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/serializers/ImmutableListSerializer.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/serializers/ImmutableMapSerializer.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/serializers/ImmutableSetSerializer.java (100%)
 rename third-party/atomix/{utils => storage}/src/main/java/io/atomix/utils/serializer/serializers/package-info.java (100%)
 rename third-party/atomix/{utils => storage}/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java (100%)
 rename third-party/atomix/{utils => storage}/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java (100%)
 rename third-party/atomix/{utils => storage}/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java (100%)
 delete mode 100644 third-party/atomix/utils/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 26b7dd0f68..0ae23e7f74 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -431,11 +431,6 @@
                 <artifactId>atomix-storage</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>atomix-utils</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index f5fe46edb5..93fef5cda7 100644
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -67,11 +67,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>atomix-storage</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>atomix-utils</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.esotericsoftware</groupId>
             <artifactId>kryo</artifactId>
@@ -133,7 +128,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                             <!-- atomix.io is using an older Guava, and Kryo is using ancient objenesis,
                                  so let's embed it to prevent duplicates -->
                             *;inline=true;artifactId=atomix-storage,
-                            *;inline=true;artifactId=atomix-utils,
                             *;inline=true;groupId=com.esotericsoftware,
                             *;inline=true;groupId=org.objenesis,
                             *;inline=true;groupId=org.ow2.asm,
diff --git a/third-party/atomix/pom.xml b/third-party/atomix/pom.xml
index 11adbd2393..6b3a318594 100644
--- a/third-party/atomix/pom.xml
+++ b/third-party/atomix/pom.xml
@@ -21,6 +21,5 @@
 
     <modules>
         <module>storage</module>
-        <module>utils</module>
     </modules>
 </project>
diff --git a/third-party/atomix/storage/pom.xml b/third-party/atomix/storage/pom.xml
index d404373c07..c077f156f4 100644
--- a/third-party/atomix/storage/pom.xml
+++ b/third-party/atomix/storage/pom.xml
@@ -35,8 +35,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>atomix-utils</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.esotericsoftware</groupId>
+      <artifactId>kryo</artifactId>
+      <version>4.0.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava-testlib</artifactId>
     </dependency>
   </dependencies>
 
@@ -49,7 +63,8 @@
         <configuration>
           <instructions>
             <Export-Package>
-              io.atomix.storage.*
+              io.atomix.storage.*,
+              io.atomix.utils.*
             </Export-Package>
             <Import-Package>
               sun.nio.ch;resolution:=optional,sun.misc;resolution:=optional,*
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/KryoIOPool.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/KryoIOPool.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/KryoInputPool.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/KryoInputPool.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespace.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespace.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespace.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespaces.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespaces.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Namespaces.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Namespaces.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Serializer.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Serializer.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/Serializer.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/Serializer.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/package-info.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/package-info.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/package-info.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/package-info.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ArraysAsListSerializer.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ArraysAsListSerializer.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ArraysAsListSerializer.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ArraysAsListSerializer.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/DefaultSerializers.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/DefaultSerializers.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/DefaultSerializers.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/DefaultSerializers.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ImmutableListSerializer.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ImmutableListSerializer.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ImmutableListSerializer.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ImmutableListSerializer.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ImmutableMapSerializer.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ImmutableMapSerializer.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ImmutableMapSerializer.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ImmutableMapSerializer.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ImmutableSetSerializer.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ImmutableSetSerializer.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/ImmutableSetSerializer.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/ImmutableSetSerializer.java
diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/package-info.java b/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/package-info.java
similarity index 100%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/serializers/package-info.java
rename to third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/serializers/package-info.java
diff --git a/third-party/atomix/utils/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java b/third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java
similarity index 100%
rename from third-party/atomix/utils/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java
rename to third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java
diff --git a/third-party/atomix/utils/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java b/third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java
similarity index 100%
rename from third-party/atomix/utils/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java
rename to third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java
diff --git a/third-party/atomix/utils/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java b/third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java
similarity index 100%
rename from third-party/atomix/utils/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java
rename to third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java
diff --git a/third-party/atomix/utils/pom.xml b/third-party/atomix/utils/pom.xml
deleted file mode 100644
index cf46d877a4..0000000000
--- a/third-party/atomix/utils/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
-  ~ Copyright 2017-2021 Open Networking Foundation
-  ~ Copyright 2023 PANTHEON.tech, s.r.o.
-  ~
-  ~ 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>org.opendaylight.controller</groupId>
-    <artifactId>bundle-parent</artifactId>
-    <version>7.0.5-SNAPSHOT</version>
-    <relativePath>../../../bundle-parent</relativePath>
-  </parent>
-
-  <artifactId>atomix-utils</artifactId>
-  <name>Atomix Utilities</name>
-
-  <properties>
-    <odlparent.checkstyle.skip>true</odlparent.checkstyle.skip>
-    <odlparent.modernizer.skip>true</odlparent.modernizer.skip>
-    <odlparent.spotbugs.skip>true</odlparent.spotbugs.skip>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.esotericsoftware</groupId>
-      <artifactId>kryo</artifactId>
-      <version>4.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>check-license</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <!-- This project has a different license -->
-              <skip>true</skip>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-- 
2.36.6