Eliminate atomix.utils.memory

There is only one user of BufferCleaner, move this class an eliminate
the now empty package.

JIRA: CONTROLLER-2071
Change-Id: I4ab2e49ad2671fb2cf917223605b0c7e6309c69f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/third-party/atomix/storage/pom.xml b/third-party/atomix/storage/pom.xml
index fa3145c91ff298ea1cbe115b9d87308ef3b6fd54..d404373c07e72bf0d4827628e76b3e0ab47c49a7 100644 (file)
--- a/third-party/atomix/storage/pom.xml
+++ b/third-party/atomix/storage/pom.xml
@@ -52,7 +52,7 @@
               io.atomix.storage.*
             </Export-Package>
             <Import-Package>
-              !sun.nio.ch,!sun.misc,*
+              sun.nio.ch;resolution:=optional,sun.misc;resolution:=optional,*
             </Import-Package>
           </instructions>
         </configuration>

diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/BufferCleaner.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java
similarity index 99%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/memory/BufferCleaner.java
rename to third-party/atomix/storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java
index 120c559484113fc691770bc0079069c60e5d8016..519525256441ad2d8d894b3cbb8dbe838294866f 100644 (file)
--- a/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/BufferCleaner.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.utils.memory;
+package io.atomix.storage.journal;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/Cleaner.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Cleaner.java
similarity index 95%
rename from third-party/atomix/utils/src/main/java/io/atomix/utils/memory/Cleaner.java
rename to third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Cleaner.java
index f0027c32bd01d1d4b3d41fe5de06b13a17d2558e..1a1b124bf7cef71f8f8dfeb252f98358793ba739 100644 (file)
--- a/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/Cleaner.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Cleaner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.utils.memory;
+package io.atomix.storage.journal;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java
index 82838f9063bc2dee474081897947458718d5c2fc..212ce29442a454333ff14618442adbc421f689d1 100644 (file)
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java
@@ -18,7 +18,6 @@ package io.atomix.storage.journal;
 import com.esotericsoftware.kryo.KryoException;
 import io.atomix.storage.StorageException;
 import io.atomix.storage.journal.index.JournalIndex;
-import io.atomix.utils.memory.BufferCleaner;
 import io.atomix.utils.serializer.Namespace;
 
 import java.io.IOException;

diff --git a/third-party/atomix/utils/pom.xml b/third-party/atomix/utils/pom.xml
index eefdd393b089ca76260b4335e121af355fb397ef..cf46d877a4996a7cce708944cc65722f068d500c 100644 (file)
--- a/third-party/atomix/utils/pom.xml
+++ b/third-party/atomix/utils/pom.xml
@@ -56,21 +56,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              io.atomix.utils.*
-            </Export-Package>
-            <Import-Package>
-              sun.nio.ch;resolution:=optional,sun.misc;resolution:=optional,*
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <executions>

diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/package-info.java b/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/package-info.java
deleted file mode 100644 (file)
index 6827ff8..0000000
--- a/third-party/atomix/utils/src/main/java/io/atomix/utils/memory/package-info.java
+++ /dev/null
@@ -1,20 +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.
- */
-
-/**
- * Provides classes and interfaces for performing low-level on- and off-heap memory management.
- */
-package io.atomix.utils.memory;