From 6eec1f70c314d2d615624e1571d8a73c276582f8 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 2 Mar 2023 11:57:45 +0100 Subject: [PATCH] Eliminate io.atomix.storage package This package hosts only two classes, move them to storage.journal and tighten Export-Package instruction. JIRA: CONTROLLER-2071 Change-Id: Ifdd0c7a8dff5fb310d4a44d2e0c3dd71033689ab Signed-off-by: Robert Varga --- .../akka/segjournal/DataJournalV0.java | 2 +- .../akka/segjournal/SegmentedFileJournal.java | 2 +- .../segjournal/SegmentedJournalActor.java | 2 +- .../segjournal/SegmentedFileJournalTest.java | 2 +- third-party/atomix/storage/pom.xml | 4 ++-- .../FileChannelJournalSegmentReader.java | 1 - .../FileChannelJournalSegmentWriter.java | 1 - .../storage/journal/JournalSegment.java | 2 -- .../journal/MappableJournalSegmentReader.java | 1 - .../journal/MappableJournalSegmentWriter.java | 1 - .../journal/MappedJournalSegmentWriter.java | 1 - .../storage/journal/SegmentedJournal.java | 2 -- .../{ => journal}/StorageException.java | 2 +- .../storage/{ => journal}/StorageLevel.java | 2 +- .../java/io/atomix/storage/package-info.java | 20 ------------------- .../storage/journal/AbstractJournalTest.java | 1 - .../storage/journal/DiskJournalTest.java | 2 -- .../storage/journal/MappedJournalTest.java | 2 -- .../storage/journal/MemoryJournalTest.java | 2 -- 19 files changed, 8 insertions(+), 44 deletions(-) rename third-party/atomix/storage/src/main/java/io/atomix/storage/{ => journal}/StorageException.java (97%) rename third-party/atomix/storage/src/main/java/io/atomix/storage/{ => journal}/StorageLevel.java (96%) delete mode 100644 third-party/atomix/storage/src/main/java/io/atomix/storage/package-info.java diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java index 3203d66171..567a080793 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/DataJournalV0.java @@ -13,11 +13,11 @@ import akka.actor.ActorSystem; import akka.persistence.AtomicWrite; import akka.persistence.PersistentRepr; import com.codahale.metrics.Histogram; -import io.atomix.storage.StorageLevel; import io.atomix.storage.journal.Indexed; import io.atomix.storage.journal.SegmentedJournal; import io.atomix.storage.journal.SegmentedJournalReader; import io.atomix.storage.journal.SegmentedJournalWriter; +import io.atomix.storage.journal.StorageLevel; import io.atomix.utils.serializer.Namespace; import java.io.File; import java.io.Serializable; diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java index 8efb2db3ab..617353ec9f 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournal.java @@ -18,8 +18,8 @@ import akka.persistence.PersistentRepr; import akka.persistence.journal.japi.AsyncWriteJournal; import com.typesafe.config.Config; import com.typesafe.config.ConfigMemorySize; -import io.atomix.storage.StorageLevel; import io.atomix.storage.journal.SegmentedJournal; +import io.atomix.storage.journal.StorageLevel; import java.io.File; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedJournalActor.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedJournalActor.java index d440cbed1c..74fdf2387e 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedJournalActor.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/main/java/org/opendaylight/controller/akka/segjournal/SegmentedJournalActor.java @@ -20,10 +20,10 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.Timer; import com.google.common.base.MoreObjects; import com.google.common.base.Stopwatch; -import io.atomix.storage.StorageLevel; import io.atomix.storage.journal.Indexed; import io.atomix.storage.journal.SegmentedJournal; import io.atomix.storage.journal.SegmentedJournalWriter; +import io.atomix.storage.journal.StorageLevel; import io.atomix.utils.serializer.Namespace; import java.io.File; import java.util.ArrayList; diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java b/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java index 92a8b001d1..6bd1a8f97e 100644 --- a/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java +++ b/opendaylight/md-sal/sal-akka-segmented-journal/src/test/java/org/opendaylight/controller/akka/segjournal/SegmentedFileJournalTest.java @@ -24,7 +24,7 @@ import akka.persistence.AtomicWrite; import akka.persistence.PersistentRepr; import akka.testkit.CallingThreadDispatcher; import akka.testkit.javadsl.TestKit; -import io.atomix.storage.StorageLevel; +import io.atomix.storage.journal.StorageLevel; import java.io.File; import java.io.IOException; import java.io.Serializable; diff --git a/third-party/atomix/storage/pom.xml b/third-party/atomix/storage/pom.xml index 0650152143..ee6aa905a3 100644 --- a/third-party/atomix/storage/pom.xml +++ b/third-party/atomix/storage/pom.xml @@ -89,8 +89,8 @@ - io.atomix.storage.*, - io.atomix.utils.*, + io.atomix.storage.journal.*, + io.atomix.utils.serializer.*, com.esotericsoftware.kryo.*;version=4.0.2 diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java index eb0ddeebba..8ce9498f6c 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java @@ -15,7 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageException; import io.atomix.storage.journal.index.JournalIndex; import io.atomix.storage.journal.index.Position; import io.atomix.utils.serializer.Namespace; diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java index e9f28e34bd..b885c1a026 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java @@ -16,7 +16,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.serializer.Namespace; diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java index 767c35eff3..d282b57526 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java @@ -16,8 +16,6 @@ package io.atomix.storage.journal; import com.google.common.collect.Sets; -import io.atomix.storage.StorageException; -import io.atomix.storage.StorageLevel; import io.atomix.storage.journal.index.JournalIndex; import io.atomix.storage.journal.index.SparseJournalIndex; import io.atomix.utils.serializer.Namespace; diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java index a48184a355..304e88b5ff 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java @@ -15,7 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageException; import io.atomix.storage.journal.index.JournalIndex; import io.atomix.utils.serializer.Namespace; diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java index 1ca892496b..81211e296c 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java @@ -15,7 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageException; import io.atomix.storage.journal.index.JournalIndex; import io.atomix.utils.serializer.Namespace; 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 212ce29442..7eca961103 100644 --- 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 @@ -16,7 +16,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.serializer.Namespace; diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java index fb79665033..4fb4a7459f 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java @@ -30,8 +30,6 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentSkipListMap; import com.google.common.collect.Sets; -import io.atomix.storage.StorageException; -import io.atomix.storage.StorageLevel; import io.atomix.utils.serializer.Namespace; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/StorageException.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageException.java similarity index 97% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/StorageException.java rename to third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageException.java index 46333ff788..f7060e8387 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/StorageException.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.atomix.storage; +package io.atomix.storage.journal; /** * Log exception. diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/StorageLevel.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageLevel.java similarity index 96% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/StorageLevel.java rename to third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageLevel.java index 7fe3e364a3..230fbb5ad0 100644 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/StorageLevel.java +++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageLevel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.atomix.storage; +package io.atomix.storage.journal; /** * Storage level configuration values which control how logs are stored on disk or in memory. diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/package-info.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/package-info.java deleted file mode 100644 index 0704f64e8c..0000000000 --- a/third-party/atomix/storage/src/main/java/io/atomix/storage/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2018-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 managing storage objects. - */ -package io.atomix.storage; diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java index e9284a5c54..3c9597fa7c 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java @@ -15,7 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageLevel; import io.atomix.utils.serializer.Namespace; import org.junit.After; import org.junit.Before; diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java index 6a48f9a983..e0161aee17 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java @@ -15,8 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageLevel; - /** * Disk journal test. */ diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java index 053c98238b..fefee271db 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java @@ -15,8 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageLevel; - /** * Memory mapped journal test. */ diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java index 61c58a93ec..bfe835ab9d 100644 --- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java +++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java @@ -15,8 +15,6 @@ */ package io.atomix.storage.journal; -import io.atomix.storage.StorageLevel; - /** * Memory journal test. */ -- 2.36.6