diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/Level.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/Level.java similarity index 90% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/Level.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/Level.java index f594916885de..f13994f649c3 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/Level.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/Level.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.swirlds.logging.v2; +package com.swirlds.logging; -import com.swirlds.logging.v2.extensions.emergency.EmergencyLogger; -import com.swirlds.logging.v2.extensions.emergency.EmergencyLoggerProvider; +import com.swirlds.logging.extensions.emergency.EmergencyLogger; +import com.swirlds.logging.extensions.emergency.EmergencyLoggerProvider; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/Marker.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/Marker.java similarity index 97% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/Marker.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/Marker.java index 3217364bd982..be642c11f23f 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/Marker.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/Marker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.logging.v2; +package com.swirlds.logging; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/EmergencyLogger.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/EmergencyLogger.java similarity index 92% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/EmergencyLogger.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/EmergencyLogger.java index f84ceb4dec36..fca4dc32160a 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/EmergencyLogger.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/EmergencyLogger.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.emergency; +package com.swirlds.logging.extensions.emergency; -import com.swirlds.logging.v2.Level; -import com.swirlds.logging.v2.extensions.event.LogEvent; +import com.swirlds.logging.Level; +import com.swirlds.logging.extensions.event.LogEvent; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/EmergencyLoggerProvider.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/EmergencyLoggerProvider.java similarity index 90% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/EmergencyLoggerProvider.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/EmergencyLoggerProvider.java index 4fbc1e7254e2..2b735c79ba3c 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/EmergencyLoggerProvider.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/EmergencyLoggerProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.emergency; +package com.swirlds.logging.extensions.emergency; -import com.swirlds.logging.v2.internal.emergency.EmergencyLoggerImpl; +import com.swirlds.logging.internal.emergency.EmergencyLoggerImpl; import edu.umd.cs.findbugs.annotations.NonNull; /** diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/package-info.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/package-info.java similarity index 83% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/package-info.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/package-info.java index 578e653a49b9..c613bf0ef124 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/emergency/package-info.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/emergency/package-info.java @@ -3,4 +3,4 @@ * extensions of the logging api) for logging. The emergency logger does not depend on the logging API and is defined in * a bulletproof way. */ -package com.swirlds.logging.v2.extensions.emergency; +package com.swirlds.logging.extensions.emergency; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogEvent.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogEvent.java similarity index 97% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogEvent.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogEvent.java index 7f544a8dbe16..1b2e030dd473 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogEvent.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogEvent.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.event; +package com.swirlds.logging.extensions.event; -import com.swirlds.logging.v2.Level; -import com.swirlds.logging.v2.Marker; +import com.swirlds.logging.Level; +import com.swirlds.logging.Marker; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Instant; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogEventConsumer.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogEventConsumer.java similarity index 92% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogEventConsumer.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogEventConsumer.java index 3adce42fea7a..022119fe7437 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogEventConsumer.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogEventConsumer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.event; +package com.swirlds.logging.extensions.event; -import com.swirlds.logging.v2.Level; +import com.swirlds.logging.Level; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Consumer; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogMessage.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogMessage.java similarity index 96% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogMessage.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogMessage.java index fd9b7ad4d1db..44f5cb6696f2 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/LogMessage.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/LogMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.event; +package com.swirlds.logging.extensions.event; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/ParameterizedLogMessage.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/ParameterizedLogMessage.java similarity index 98% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/ParameterizedLogMessage.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/ParameterizedLogMessage.java index 68178621f798..60ee5a2990d5 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/ParameterizedLogMessage.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/ParameterizedLogMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.event; +package com.swirlds.logging.extensions.event; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/SimpleLogMessage.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/SimpleLogMessage.java similarity index 95% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/SimpleLogMessage.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/SimpleLogMessage.java index 95d98710e00e..942dade79cb2 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/SimpleLogMessage.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/SimpleLogMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.logging.v2.extensions.event; +package com.swirlds.logging.extensions.event; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/package-info.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/package-info.java similarity index 80% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/package-info.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/package-info.java index 7eb629a8dd98..7feffb978f43 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/event/package-info.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/event/package-info.java @@ -2,4 +2,4 @@ * This package contains the API for the logging events. This is the used as the basic data model of the logging API and * must be used by any extension to handle or provide logging events. */ -package com.swirlds.logging.v2.extensions.event; +package com.swirlds.logging.extensions.event; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/package-info.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/package-info.java similarity index 79% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/package-info.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/package-info.java index 54bd0a0ae5a0..781582f1e020 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/extensions/package-info.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/extensions/package-info.java @@ -2,4 +2,4 @@ * This package (and all subpackages) contains the extension API of the logging framework. That API can be used to * create custom providers or handlers. */ -package com.swirlds.logging.v2.extensions; +package com.swirlds.logging.extensions; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/internal/emergency/EmergencyLoggerImpl.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/internal/emergency/EmergencyLoggerImpl.java similarity index 97% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/internal/emergency/EmergencyLoggerImpl.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/internal/emergency/EmergencyLoggerImpl.java index c1dbfd2b95ca..fb206840797b 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/internal/emergency/EmergencyLoggerImpl.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/internal/emergency/EmergencyLoggerImpl.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.swirlds.logging.v2.internal.emergency; +package com.swirlds.logging.internal.emergency; -import com.swirlds.logging.v2.Level; -import com.swirlds.logging.v2.extensions.emergency.EmergencyLogger; -import com.swirlds.logging.v2.extensions.event.LogEvent; -import com.swirlds.logging.v2.internal.format.LineBasedFormat; +import com.swirlds.logging.Level; +import com.swirlds.logging.extensions.emergency.EmergencyLogger; +import com.swirlds.logging.extensions.event.LogEvent; +import com.swirlds.logging.internal.format.LineBasedFormat; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.io.PrintStream; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/internal/format/LineBasedFormat.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/internal/format/LineBasedFormat.java similarity index 94% rename from platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/internal/format/LineBasedFormat.java rename to platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/internal/format/LineBasedFormat.java index b8cd7827bd6e..90cd2020fbfe 100644 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/internal/format/LineBasedFormat.java +++ b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/internal/format/LineBasedFormat.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.swirlds.logging.v2.internal.format; - -import com.swirlds.logging.v2.Level; -import com.swirlds.logging.v2.Marker; -import com.swirlds.logging.v2.extensions.emergency.EmergencyLogger; -import com.swirlds.logging.v2.extensions.emergency.EmergencyLoggerProvider; -import com.swirlds.logging.v2.extensions.event.LogEvent; -import com.swirlds.logging.v2.extensions.event.LogMessage; +package com.swirlds.logging.internal.format; + +import com.swirlds.logging.Level; +import com.swirlds.logging.Marker; +import com.swirlds.logging.extensions.emergency.EmergencyLogger; +import com.swirlds.logging.extensions.emergency.EmergencyLoggerProvider; +import com.swirlds.logging.extensions.event.LogEvent; +import com.swirlds.logging.extensions.event.LogMessage; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.io.PrintWriter; diff --git a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/package-info.java b/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/package-info.java deleted file mode 100644 index e7255950f0fa..000000000000 --- a/platform-sdk/swirlds-logging/src/main/java/com/swirlds/logging/v2/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * This package contains the private API of the logging framework. - */ -package com.swirlds.logging.v2; diff --git a/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/LevelTest.java b/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/LevelTest.java index 882ec872e108..e32d86531bea 100644 --- a/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/LevelTest.java +++ b/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/LevelTest.java @@ -20,6 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.swirlds.logging.Level; import org.junit.jupiter.api.Test; class LevelTest { diff --git a/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/MarkerTest.java b/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/MarkerTest.java index 860f8c50b870..5d3e7285723b 100644 --- a/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/MarkerTest.java +++ b/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/MarkerTest.java @@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; +import com.swirlds.logging.Marker; import org.junit.jupiter.api.Test; public class MarkerTest { diff --git a/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/emergency/EmergencyLoggerTest.java b/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/emergency/EmergencyLoggerTest.java index 754ceb579a2d..90e4f4733d74 100644 --- a/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/emergency/EmergencyLoggerTest.java +++ b/platform-sdk/swirlds-logging/src/test/java/com/swirlds/logging/v2/emergency/EmergencyLoggerTest.java @@ -23,11 +23,11 @@ import com.swirlds.base.test.fixtures.io.SystemErrProvider; import com.swirlds.base.test.fixtures.io.WithSystemError; import com.swirlds.base.test.fixtures.io.WithSystemOut; -import com.swirlds.logging.v2.Level; -import com.swirlds.logging.v2.Marker; -import com.swirlds.logging.v2.extensions.event.LogEvent; -import com.swirlds.logging.v2.extensions.event.LogMessage; -import com.swirlds.logging.v2.internal.emergency.EmergencyLoggerImpl; +import com.swirlds.logging.Level; +import com.swirlds.logging.Marker; +import com.swirlds.logging.extensions.event.LogEvent; +import com.swirlds.logging.extensions.event.LogMessage; +import com.swirlds.logging.internal.emergency.EmergencyLoggerImpl; import jakarta.inject.Inject; import java.time.Instant; import java.util.List;