Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

old logging API moved to legacy package #8459

Merged
merged 13 commits into from
Nov 1, 2023
Merged

old logging API moved to legacy package #8459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7a6a7ea
old logging API moved to legacy package
hendrikebbers Sep 8, 2023
0ddfbd8
develop merged
hendrikebbers Sep 11, 2023
e9f0629
build fixed
hendrikebbers Sep 11, 2023
b57e7e1
develop merged
hendrikebbers Sep 25, 2023
deb7016
Merge branch 'develop' into logging-to-legacy
hendrikebbers Oct 2, 2023
1c71899
Merge branch 'develop' into logging-to-legacy
hendrikebbers Oct 3, 2023
e0b471f
BusyTime removed
hendrikebbers Oct 3, 2023
20ff115
Merge remote-tracking branch 'origin/logging-to-legacy' into logging-…
hendrikebbers Oct 3, 2023
d075255
develop merged
hendrikebbers Oct 6, 2023
58d1dd4
Merge branch 'develop' into logging-to-legacy
hendrikebbers Oct 9, 2023
ea027f5
Merge branch 'develop' into logging-to-legacy
timo0 Oct 26, 2023
258fc51
Merge branch 'develop' into logging-to-legacy
timo0 Oct 30, 2023
29d4630
Fix spotless
timo0 Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...service/src/main/java/com/hedera/node/app/service/mono/stream/RecordStreamFileWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import static com.hedera.node.app.hapi.utils.exports.FileCompressionUtils.COMPRESSION_ALGORITHM_EXTENSION;
import static com.swirlds.common.stream.LinkedObjectStreamUtilities.convertInstantToStringWithPadding;
import static com.swirlds.common.stream.LinkedObjectStreamUtilities.generateStreamFileNameFromInstant;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.OBJECT_STREAM;
import static com.swirlds.logging.LogMarker.OBJECT_STREAM_FILE;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.OBJECT_STREAM;
import static com.swirlds.logging.legacy.LogMarker.OBJECT_STREAM_FILE;

import com.google.common.annotations.VisibleForTesting;
import com.google.protobuf.CodedOutputStream;
Expand Down Expand Up @@ -50,7 +50,7 @@
import com.swirlds.common.io.streams.SerializableDataOutputStream;
import com.swirlds.common.stream.Signer;
import com.swirlds.common.stream.internal.LinkedObjectStream;
import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;
import edu.umd.cs.findbugs.annotations.NonNull;
import java.io.BufferedOutputStream;
import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion ...ookTestingTool/src/main/java/com/swirlds/demo/addressbook/AddressBookTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.swirlds.demo.addressbook;

import static com.swirlds.common.io.utility.FileUtils.getAbsolutePath;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.system.BasicSoftwareVersion;
import com.swirlds.common.system.NodeId;
Expand Down
6 changes: 3 additions & 3 deletions ...okTestingTool/src/main/java/com/swirlds/demo/addressbook/AddressBookTestingToolState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
* DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.
*/

import static com.swirlds.logging.LogMarker.DEMO_INFO;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.DEMO_INFO;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;
import static com.swirlds.platform.state.address.AddressBookInitializer.CONFIG_ADDRESS_BOOK_HEADER;
import static com.swirlds.platform.state.address.AddressBookInitializer.CONFIG_ADDRESS_BOOK_USED;
import static com.swirlds.platform.state.address.AddressBookInitializer.STATE_ADDRESS_BOOK_HEADER;
Expand Down
2 changes: 1 addition & 1 deletion ...ncyTestingTool/src/main/java/com/swirlds/demo/consistency/ConsistencyTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.demo.consistency;

import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.system.BasicSoftwareVersion;
import com.swirlds.common.system.NodeId;
Expand Down
4 changes: 2 additions & 2 deletions ...cyTestingTool/src/main/java/com/swirlds/demo/consistency/ConsistencyTestingToolState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.swirlds.demo.consistency;

import static com.swirlds.common.utility.ByteUtils.byteArrayToLong;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.config.StateConfig;
import com.swirlds.common.io.streams.SerializableDataInputStream;
Expand Down
4 changes: 2 additions & 2 deletions ...ncyTestingTool/src/main/java/com/swirlds/demo/consistency/TransactionHandlingHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.swirlds.demo.consistency;

import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...form-apps/tests/ISSTestingTool/src/main/java/com/swirlds/demo/iss/ISSTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.demo.iss;

import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.system.BasicSoftwareVersion;
import com.swirlds.common.system.NodeId;
Expand Down
2 changes: 1 addition & 1 deletion ...orm-apps/tests/ISSTestingTool/src/main/java/com/swirlds/demo/iss/ISSTestingToolState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import static com.swirlds.common.utility.CompareTo.isGreaterThan;
import static com.swirlds.common.utility.CompareTo.isLessThan;
import static com.swirlds.common.utility.NonCryptographicHashing.hash64;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.io.streams.SerializableDataInputStream;
import com.swirlds.common.io.streams.SerializableDataOutputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...sdk/platform-apps/tests/ISSTestingTool/src/main/java/com/swirlds/demo/iss/PlannedIss.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.demo.iss;

import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;

import com.swirlds.common.io.SelfSerializable;
import com.swirlds.common.io.streams.SerializableDataInputStream;
Expand Down
2 changes: 1 addition & 1 deletion ...grationTestingTool/src/main/java/com/swirlds/demo/migration/MigrationTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import com.swirlds.common.system.SwirldState;
import com.swirlds.fcqueue.FCQueueStatistics;
import com.swirlds.gui.model.GuiModel;
import com.swirlds.logging.payloads.ApplicationFinishedPayload;
import com.swirlds.logging.legacy.payload.ApplicationFinishedPayload;
import com.swirlds.merkle.map.MerkleMapMetrics;
import com.swirlds.platform.ParameterProvider;
import java.security.SignatureException;
Expand Down
2 changes: 1 addition & 1 deletion ...sts/PlatformTestingTool/src/main/java/com/swirlds/demo/merkle/map/FCMTransactionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import static com.swirlds.demo.platform.PAYLOAD_TYPE.TYPE_FCM_UPDATE;
import static com.swirlds.demo.platform.PAYLOAD_TYPE.TYPE_FCM_UPDATE_FCQ;
import static com.swirlds.demo.platform.TransactionSubmitter.USE_DEFAULT_TPS;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.merkle.map.test.lifecycle.EntityType.Crypto;
import static com.swirlds.merkle.map.test.lifecycle.EntityType.FCQ;
import static com.swirlds.merkle.map.test.lifecycle.TransactionType.Create;
Expand Down
2 changes: 1 addition & 1 deletion ...tests/PlatformTestingTool/src/main/java/com/swirlds/demo/platform/FCMQueryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.swirlds.demo.platform;

import static com.swirlds.common.metrics.FloatFormats.FORMAT_9_6;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;

import com.swirlds.base.utility.Pair;
import com.swirlds.common.metrics.SpeedometerMetric;
Expand Down
6 changes: 3 additions & 3 deletions .../PlatformTestingTool/src/main/java/com/swirlds/demo/platform/PlatformTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static com.swirlds.common.metrics.FloatFormats.FORMAT_9_6;
import static com.swirlds.common.threading.interrupt.Uninterruptable.abortAndThrowIfInterrupted;
import static com.swirlds.common.threading.manager.AdHocThreadManager.getStaticThreadManager;
import static com.swirlds.logging.LogMarker.DEMO_INFO;
import static com.swirlds.logging.legacy.LogMarker.DEMO_INFO;
import static com.swirlds.merkle.map.test.lifecycle.EntityType.Crypto;
import static com.swirlds.merkle.map.test.lifecycle.SaveExpectedMapHandler.STORAGE_DIRECTORY;
import static com.swirlds.merkle.map.test.lifecycle.SaveExpectedMapHandler.createExpectedMapName;
Expand Down Expand Up @@ -82,8 +82,8 @@
import com.swirlds.fcqueue.FCQueue;
import com.swirlds.fcqueue.FCQueueStatistics;
import com.swirlds.gui.model.GuiModel;
import com.swirlds.logging.payloads.ApplicationFinishedPayload;
import com.swirlds.logging.payloads.CreateTransactionFailedPayload;
import com.swirlds.logging.legacy.payload.ApplicationFinishedPayload;
import com.swirlds.logging.legacy.payload.CreateTransactionFailedPayload;
import com.swirlds.merkle.map.MerkleMap;
import com.swirlds.merkle.map.test.pta.MapKey;
import com.swirlds.merkle.map.test.pta.TransactionRecord;
Expand Down
6 changes: 3 additions & 3 deletions ...PlatformTestingTool/src/main/java/com/swirlds/demo/platform/PlatformTestingToolState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import static com.swirlds.common.units.UnitConstants.NANOSECONDS_TO_MICROSECONDS;
import static com.swirlds.common.utility.CommonUtils.hex;
import static com.swirlds.demo.platform.fs.stresstest.proto.TestTransaction.BodyCase.FCMTRANSACTION;
import static com.swirlds.logging.LogMarker.*;
import static com.swirlds.logging.legacy.LogMarker.*;
import static com.swirlds.merkle.map.test.lifecycle.SaveExpectedMapHandler.*;

import com.fasterxml.jackson.annotation.JsonIgnore;
Expand Down Expand Up @@ -67,8 +67,8 @@
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapKey;
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapValue;
import com.swirlds.demo.virtualmerkle.transaction.handler.VirtualMerkleTransactionHandler;
import com.swirlds.logging.payloads.ApplicationDualStatePayload;
import com.swirlds.logging.payloads.SoftwareVersionPayload;
import com.swirlds.logging.legacy.payload.ApplicationDualStatePayload;
import com.swirlds.logging.legacy.payload.SoftwareVersionPayload;
import com.swirlds.merkle.map.test.lifecycle.EntityType;
import com.swirlds.merkle.map.test.lifecycle.TransactionState;
import com.swirlds.merkle.map.test.lifecycle.TransactionType;
Expand Down
8 changes: 4 additions & 4 deletions ...tests/PlatformTestingTool/src/main/java/com/swirlds/demo/platform/PttTransactionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.swirlds.demo.platform;

import static com.swirlds.logging.LogMarker.DEMO_INFO;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.FREEZE;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.DEMO_INFO;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.FREEZE;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.google.protobuf.ByteString;
import com.swirlds.base.utility.Triple;
Expand Down
6 changes: 3 additions & 3 deletions ...latformTestingTool/src/main/java/com/swirlds/demo/platform/SyntheticBottleneckConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.swirlds.demo.platform;

import static com.swirlds.logging.LogMarker.DEMO_INFO;
import static com.swirlds.logging.legacy.LogMarker.DEMO_INFO;

import com.swirlds.logging.payloads.SyntheticBottleneckFinishPayload;
import com.swirlds.logging.payloads.SyntheticBottleneckStartPayload;
import com.swirlds.logging.legacy.payload.SyntheticBottleneckFinishPayload;
import com.swirlds.logging.legacy.payload.SyntheticBottleneckStartPayload;
import java.util.HashSet;
import java.util.Set;
import org.apache.logging.log4j.LogManager;
Expand Down
2 changes: 1 addition & 1 deletion ...apps/tests/PlatformTestingTool/src/main/java/com/swirlds/demo/platform/nft/NftLedger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.demo.platform.nft;

import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;

import com.swirlds.common.merkle.MerkleInternal;
import com.swirlds.common.merkle.impl.PartialBinaryMerkleInternal;
Expand Down
2 changes: 1 addition & 1 deletion ...s/PlatformTestingTool/src/main/java/com/swirlds/demo/platform/nft/NftQueryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.swirlds.demo.platform.nft;

import static com.swirlds.common.metrics.FloatFormats.FORMAT_9_6;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;

import com.swirlds.common.metrics.SpeedometerMetric;
import com.swirlds.common.system.Platform;
Expand Down
2 changes: 1 addition & 1 deletion ...sts/PlatformTestingTool/src/main/java/com/swirlds/demo/platform/nft/NftSimpleQuerier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.swirlds.demo.platform.nft;

import static com.swirlds.common.metrics.FloatFormats.FORMAT_9_6;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;

import com.swirlds.common.metrics.RunningAverageMetric;
import com.swirlds.common.metrics.SpeedometerMetric;
Expand Down
2 changes: 1 addition & 1 deletion ...ool/src/main/java/com/swirlds/demo/virtualmerkle/state/VirtualMerkleStateInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapKeySerializer;
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapValue;
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapValueSerializer;
import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;
import com.swirlds.merkledb.MerkleDbDataSourceBuilder;
import com.swirlds.merkledb.MerkleDbTableConfig;
import com.swirlds.virtualmap.VirtualMap;
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/swirlds/demo/virtualmerkle/transaction/handler/VirtualMerkleTransactionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapKey;
import com.swirlds.demo.virtualmerkle.map.smartcontracts.data.SmartContractMapValue;
import com.swirlds.demo.virtualmerkle.random.PTTRandom;
import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;
import com.swirlds.merkle.map.test.lifecycle.EntityType;
import com.swirlds.merkle.map.test.lifecycle.TransactionType;
import com.swirlds.merkle.map.test.pta.MapKey;
Expand Down
2 changes: 1 addition & 1 deletion ...TestingTool/src/main/java/com/swirlds/demo/stats/signing/StatsSigningTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static com.swirlds.common.units.UnitConstants.MILLISECONDS_TO_NANOSECONDS;
import static com.swirlds.common.units.UnitConstants.NANOSECONDS_TO_MICROSECONDS;
import static com.swirlds.common.units.UnitConstants.NANOSECONDS_TO_SECONDS;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.metrics.Metrics;
import com.swirlds.common.metrics.SpeedometerMetric;
Expand Down
4 changes: 2 additions & 2 deletions ...estingTool/src/main/java/com/swirlds/demo/stats/signing/StatsSigningTestingToolState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

import static com.swirlds.common.utility.CommonUtils.hex;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.TESTING_EXCEPTIONS_ACCEPTABLE_RECONNECT;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.TESTING_EXCEPTIONS_ACCEPTABLE_RECONNECT;

import com.swirlds.common.crypto.CryptographyHolder;
import com.swirlds.common.crypto.TransactionSignature;
Expand Down
2 changes: 1 addition & 1 deletion ...tsSigningTestingTool/src/main/java/com/swirlds/demo/stats/signing/SttTransactionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.demo.stats.signing;

import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;

import com.swirlds.common.system.NodeId;
import com.swirlds.common.system.transaction.Transaction;
Expand Down
4 changes: 2 additions & 2 deletions ...stingTool/src/main/java/com/swirlds/demo/stats/signing/algorithms/ECSigningAlgorithm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.swirlds.demo.stats.signing.algorithms;

import static com.swirlds.common.utility.CommonUtils.hex;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.crypto.SignatureType;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions ...gTool/src/main/java/com/swirlds/demo/stats/signing/algorithms/X25519SigningAlgorithm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package com.swirlds.demo.stats.signing.algorithms;

import static com.swirlds.common.utility.CommonUtils.hex;
import static com.swirlds.logging.LogMarker.EXCEPTION;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.goterl.lazysodium.LazySodiumJava;
import com.goterl.lazysodium.SodiumJava;
Expand Down
2 changes: 1 addition & 1 deletion .../tests/StressTestingTool/src/main/java/com/swirlds/demo/stress/StressTestingToolMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static com.swirlds.common.units.UnitConstants.MILLISECONDS_TO_NANOSECONDS;
import static com.swirlds.common.units.UnitConstants.NANOSECONDS_TO_MICROSECONDS;
import static com.swirlds.common.units.UnitConstants.NANOSECONDS_TO_SECONDS;
import static com.swirlds.logging.LogMarker.STARTUP;
import static com.swirlds.logging.legacy.LogMarker.STARTUP;

import com.swirlds.common.metrics.Metrics;
import com.swirlds.common.metrics.SpeedometerMetric;
Expand Down
2 changes: 1 addition & 1 deletion platform-sdk/swirlds-cli/src/main/java/com/swirlds/cli/logging/LogProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.swirlds.common.io.utility.FileUtils;
import com.swirlds.common.system.NodeId;
import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.io.BufferedReader;
Expand Down
2 changes: 1 addition & 1 deletion platform-sdk/swirlds-cli/src/main/java/com/swirlds/cli/logging/PlatformStatusLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Example:
* Platform spent 66.0 ms in REPLAYING_EVENTS.
* Now in OBSERVING {"oldStatus":"REPLAYING_EVENTS","newStatus":"OBSERVING"}
* [com.swirlds.logging.payloads.PlatformStatusPayload]
* [com.swirlds.logging.legacy.payload.PlatformStatusPayload]
*/
public class PlatformStatusLog implements FormattableString {
/**
Expand Down
4 changes: 2 additions & 2 deletions platform-sdk/swirlds-cli/src/test/java/com/swirlds/cli/utility/LogLineTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
class LogLineTests {
public static final String testString =
"""
2023-08-04 13:50:09.751 102 INFO PLATFORM_STATUS <<platform: status-state-machine>> PlatformStatusStateMachine: Platform spent 441.0 ms in STARTING_UP. Now in REPLAYING_EVENTS {"oldStatus":"STARTING_UP","newStatus":"REPLAYING_EVENTS"} [com.swirlds.logging.payloads.PlatformStatusPayload]""";
2023-08-04 13:50:09.751 102 INFO PLATFORM_STATUS <<platform: status-state-machine>> PlatformStatusStateMachine: Platform spent 441.0 ms in STARTING_UP. Now in REPLAYING_EVENTS {"oldStatus":"STARTING_UP","newStatus":"REPLAYING_EVENTS"} [com.swirlds.logging.legacy.payload.PlatformStatusPayload]""";

@Test
@DisplayName("Test splitting a log line")
Expand All @@ -45,7 +45,7 @@ void splitLogLine() {
assertEquals("<<platform: status-state-machine>>", logLine.getThreadName());
assertEquals("PlatformStatusStateMachine", logLine.getClassName());
assertEquals(
"Platform spent 441.0 ms in STARTING_UP. Now in REPLAYING_EVENTS {\"oldStatus\":\"STARTING_UP\",\"newStatus\":\"REPLAYING_EVENTS\"} [com.swirlds.logging.payloads.PlatformStatusPayload]",
"Platform spent 441.0 ms in STARTING_UP. Now in REPLAYING_EVENTS {\"oldStatus\":\"STARTING_UP\",\"newStatus\":\"REPLAYING_EVENTS\"} [com.swirlds.logging.legacy.payload.PlatformStatusPayload]",
logLine.getRemainderOfLine().getOriginalPlaintext());
}
}
2 changes: 1 addition & 1 deletion ...dk/swirlds-common/src/main/java/com/swirlds/common/config/sources/MappedConfigSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.common.config.sources;

import static com.swirlds.logging.LogMarker.CONFIG;
import static com.swirlds.logging.legacy.LogMarker.CONFIG;

import com.swirlds.config.api.source.ConfigSource;
import edu.umd.cs.findbugs.annotations.NonNull;
Expand Down
2 changes: 1 addition & 1 deletion ...orm-sdk/swirlds-common/src/main/java/com/swirlds/common/crypto/CryptographyException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.swirlds.common.crypto;

import com.swirlds.common.exceptions.PlatformException;
import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;

public class CryptographyException extends PlatformException {
private static final LogMarker DEFAULT_MARKER = LogMarker.EXCEPTION;
Expand Down
2 changes: 1 addition & 1 deletion ...m-sdk/swirlds-common/src/main/java/com/swirlds/common/crypto/EmptyHashValueException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.common.crypto;

import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;

/**
* Exception caused when provided hash value contains all zeros
Expand Down
2 changes: 1 addition & 1 deletion platform-sdk/swirlds-common/src/main/java/com/swirlds/common/crypto/HashBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.common.crypto;

import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.time.Instant;
Expand Down
2 changes: 1 addition & 1 deletion ...dk/swirlds-common/src/main/java/com/swirlds/common/crypto/InvalidDigestTypeException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.swirlds.common.crypto;

import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;

/**
* Exception caused when Invalid algorithm name was provided
Expand Down
2 changes: 1 addition & 1 deletion ...orm-sdk/swirlds-common/src/main/java/com/swirlds/common/crypto/SerializablePublicKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.swirlds.common.io.SelfSerializable;
import com.swirlds.common.io.streams.SerializableDataInputStream;
import com.swirlds.common.io.streams.SerializableDataOutputStream;
import com.swirlds.logging.LogMarker;
import com.swirlds.logging.legacy.LogMarker;
import java.io.IOException;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
Expand Down
Loading
Loading