#9626 Move v2 package to main package (#9627)

Signed-off-by: Timo Brandstätter <timo@swirldslabs.com>
hashgraph · Nov 2, 2023 · f58572e · f58572e
1 parent b1b815d
commit f58572e
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 42 deletions.
diff --git a/...in/java/com/swirlds/logging/v2/Level.java → .../main/java/com/swirlds/logging/Level.java b/...in/java/com/swirlds/logging/v2/Level.java → .../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/...n/java/com/swirlds/logging/v2/Marker.java → ...main/java/com/swirlds/logging/Marker.java b/...n/java/com/swirlds/logging/v2/Marker.java → ...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/...extensions/emergency/EmergencyLogger.java → ...extensions/emergency/EmergencyLogger.java b/...extensions/emergency/EmergencyLogger.java → ...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/...ns/emergency/EmergencyLoggerProvider.java → ...ns/emergency/EmergencyLoggerProvider.java b/...ns/emergency/EmergencyLoggerProvider.java → ...ns/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/...v2/extensions/emergency/package-info.java → ...ng/extensions/emergency/package-info.java b/...v2/extensions/emergency/package-info.java → ...ng/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/...logging/v2/extensions/event/LogEvent.java → ...ds/logging/extensions/event/LogEvent.java b/...logging/v2/extensions/event/LogEvent.java → ...ds/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/...v2/extensions/event/LogEventConsumer.java → ...ng/extensions/event/LogEventConsumer.java b/...v2/extensions/event/LogEventConsumer.java → ...ng/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/...gging/v2/extensions/event/LogMessage.java → .../logging/extensions/event/LogMessage.java b/...gging/v2/extensions/event/LogMessage.java → .../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/...nsions/event/ParameterizedLogMessage.java → ...nsions/event/ParameterizedLogMessage.java b/...nsions/event/ParameterizedLogMessage.java → ...nsions/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/...v2/extensions/event/SimpleLogMessage.java → ...ng/extensions/event/SimpleLogMessage.java b/...v2/extensions/event/SimpleLogMessage.java → ...ng/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/...ing/v2/extensions/event/package-info.java → ...ogging/extensions/event/package-info.java b/...ing/v2/extensions/event/package-info.java → ...ogging/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/...s/logging/v2/extensions/package-info.java → ...rlds/logging/extensions/package-info.java b/...s/logging/v2/extensions/package-info.java → ...rlds/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/...ternal/emergency/EmergencyLoggerImpl.java → ...ternal/emergency/EmergencyLoggerImpl.java b/...ternal/emergency/EmergencyLoggerImpl.java → ...ternal/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/...g/v2/internal/format/LineBasedFormat.java → ...ging/internal/format/LineBasedFormat.java b/...g/v2/internal/format/LineBasedFormat.java → ...ging/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
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
@@ -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
@@ -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/...k/swirlds-logging/src/test/java/com/swirlds/logging/v2/emergency/EmergencyLoggerTest.java b/...k/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;