diff --git a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamManagerImpl.java b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamManagerImpl.java index 6c5493563c82..cf6589232c4a 100644 --- a/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamManagerImpl.java +++ b/hedera-node/hedera-app/src/main/java/com/hedera/node/app/blocks/impl/BlockStreamManagerImpl.java @@ -58,7 +58,6 @@ import com.hedera.node.config.types.BlockStreamWriterMode; import com.hedera.node.config.types.DiskNetworkExport; import com.hedera.pbj.runtime.io.buffer.Bytes; -import com.swirlds.common.wiring.tasks.AbstractTask; import com.swirlds.config.api.Configuration; import com.swirlds.platform.state.service.PlatformStateService; import com.swirlds.platform.state.service.schemas.V0540PlatformStateSchema; @@ -90,6 +89,7 @@ import javax.inject.Singleton; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.tasks.AbstractTask; @Singleton public class BlockStreamManagerImpl implements BlockStreamManager { diff --git a/hedera-node/hedera-app/src/main/java/module-info.java b/hedera-node/hedera-app/src/main/java/module-info.java index 8b618d827ca5..fcadff6009eb 100644 --- a/hedera-node/hedera-app/src/main/java/module-info.java +++ b/hedera-node/hedera-app/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + import com.hedera.node.app.config.ServicesConfigExtension; import com.swirlds.config.api.ConfigurationExtension; @@ -42,6 +58,7 @@ requires com.swirlds.merkle; requires com.swirlds.merkledb; requires com.swirlds.virtualmap; + requires org.hiero.wiring.framework; requires com.google.common; requires com.google.protobuf; requires io.grpc.netty; diff --git a/platform-sdk/swirlds-common/src/main/java/module-info.java b/platform-sdk/swirlds-common/src/main/java/module-info.java index 83ab83db9ad0..657c61167bcb 100644 --- a/platform-sdk/swirlds-common/src/main/java/module-info.java +++ b/platform-sdk/swirlds-common/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + module com.swirlds.common { /* Exported packages. This list should remain alphabetized. */ @@ -61,17 +77,6 @@ exports com.swirlds.common.utility.throttle; exports com.swirlds.common.jackson; exports com.swirlds.common.units; - exports com.swirlds.common.wiring; - exports com.swirlds.common.wiring.component; - exports com.swirlds.common.wiring.counters; - exports com.swirlds.common.wiring.model; - exports com.swirlds.common.wiring.schedulers; - exports com.swirlds.common.wiring.schedulers.builders; - exports com.swirlds.common.wiring.tasks; - exports com.swirlds.common.wiring.transformers; - exports com.swirlds.common.wiring.wires; - exports com.swirlds.common.wiring.wires.input; - exports com.swirlds.common.wiring.wires.output; /* Targeted exports */ exports com.swirlds.common.crypto.internal to @@ -140,10 +145,10 @@ com.swirlds.platform.gui; exports com.swirlds.common.startup; exports com.swirlds.common.threading.atomic; - exports com.swirlds.common.wiring.model.diagram; exports com.swirlds.common.concurrent; exports com.swirlds.common.merkle.synchronization.stats; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.base; requires transitive com.swirlds.config.api; requires transitive com.swirlds.logging; @@ -151,7 +156,6 @@ requires transitive com.swirlds.metrics.impl; requires transitive com.fasterxml.jackson.core; requires transitive com.fasterxml.jackson.databind; - requires transitive com.hedera.pbj.runtime; requires transitive io.prometheus.simpleclient; requires transitive lazysodium.java; requires transitive org.apache.logging.log4j; diff --git a/platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/files/hashmap/HalfDiskHashMap.java b/platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/files/hashmap/HalfDiskHashMap.java index 4d746702bb05..20a6f2fbb9a1 100644 --- a/platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/files/hashmap/HalfDiskHashMap.java +++ b/platform-sdk/swirlds-merkledb/src/main/java/com/swirlds/merkledb/files/hashmap/HalfDiskHashMap.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 Hedera Hashgraph, LLC + * Copyright (C) 2021-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import com.hedera.pbj.runtime.io.buffer.BufferedData; import com.hedera.pbj.runtime.io.buffer.Bytes; -import com.swirlds.common.wiring.tasks.AbstractTask; import com.swirlds.config.api.Configuration; import com.swirlds.merkledb.FileStatisticAware; import com.swirlds.merkledb.Snapshotable; @@ -51,6 +50,7 @@ import org.apache.logging.log4j.Logger; import org.eclipse.collections.api.tuple.primitive.IntObjectPair; import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; +import org.hiero.wiring.framework.tasks.AbstractTask; /** * This is a hash map implementation where the bucket index is in RAM and the buckets are on disk. diff --git a/platform-sdk/swirlds-merkledb/src/main/java/module-info.java b/platform-sdk/swirlds-merkledb/src/main/java/module-info.java index 6505d8e34458..1ab90a0f28fc 100644 --- a/platform-sdk/swirlds-merkledb/src/main/java/module-info.java +++ b/platform-sdk/swirlds-merkledb/src/main/java/module-info.java @@ -1,18 +1,17 @@ /* - * (c) 2016-2021 Swirlds, Inc. + * Copyright (C) 2016-2025 Hedera Hashgraph, LLC * - * This software is the confidential and proprietary information of - * Swirlds, Inc. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Swirlds. + * 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 * - * SWIRLDS MAKES NO REPRESENTATIONS OR WARRANTIES ABOUT THE SUITABILITY OF - * THE SOFTWARE, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED - * TO THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE, OR NON-INFRINGEMENT. SWIRLDS SHALL NOT BE LIABLE FOR - * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR - * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. + * 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. */ /** @@ -27,11 +26,12 @@ exports com.swirlds.merkledb.files.hashmap; exports com.swirlds.merkledb.utilities; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.common; requires transitive com.swirlds.config.api; requires transitive com.swirlds.metrics.api; requires transitive com.swirlds.virtualmap; - requires transitive com.hedera.pbj.runtime; + requires transitive org.hiero.wiring.framework; requires com.swirlds.base; requires com.swirlds.config.extensions; requires com.swirlds.logging; diff --git a/platform-sdk/swirlds-platform-core/build.gradle.kts b/platform-sdk/swirlds-platform-core/build.gradle.kts index 7a0d06d2ea97..b7167954999e 100644 --- a/platform-sdk/swirlds-platform-core/build.gradle.kts +++ b/platform-sdk/swirlds-platform-core/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.publish-artifactregistry") diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java index 74a13be51991..b568ab834044 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuilder.java @@ -32,9 +32,6 @@ import com.swirlds.common.crypto.Signature; import com.swirlds.common.notification.NotificationEngine; import com.swirlds.common.platform.NodeId; -import com.swirlds.common.wiring.WiringConfig; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; import com.swirlds.config.api.Configuration; import com.swirlds.platform.SwirldsPlatform; import com.swirlds.platform.consensus.ConsensusSnapshot; @@ -73,6 +70,9 @@ import java.util.function.Consumer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.WiringConfig; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; /** * Builds a {@link SwirldsPlatform} instance. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuildingBlocks.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuildingBlocks.java index 8b8b9e2bafcf..05af08136730 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuildingBlocks.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformBuildingBlocks.java @@ -21,7 +21,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.notification.NotificationEngine; import com.swirlds.common.platform.NodeId; -import com.swirlds.common.wiring.model.WiringModel; import com.swirlds.platform.consensus.ConsensusSnapshot; import com.swirlds.platform.crypto.KeysAndCerts; import com.swirlds.platform.event.PlatformEvent; @@ -46,6 +45,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; +import org.hiero.wiring.framework.model.WiringModel; /** * This record contains core utilities and basic objects needed to build a platform. It should not contain any platform diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java index 53415c3ee9e3..786a64f2ee7f 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/builder/PlatformComponentBuilder.java @@ -103,6 +103,7 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.util.Objects; +import org.hiero.wiring.framework.component.ComponentWiring; /** * The advanced platform builder is responsible for constructing platform components. This class is exposed so that @@ -116,7 +117,7 @@ *
  • A component must not communicate with other components except through the wiring framework * (with a very small number of exceptions due to tech debt that has not yet been paid off).
    • *
  • A component should have an interface and at default implementation.
    • - *
  • A component should use {@link com.swirlds.common.wiring.component.ComponentWiring ComponentWiring} to define + *
  • A component should use {@link ComponentWiring ComponentWiring} to define * wiring API.
    • *
  • The order in which components are constructed should not matter.
    • *
  • A component must not be a static singleton or use static stateful variables in any way.
    • diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramCommand.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramCommand.java index 51b49dbff621..7e22c93d47f1 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramCommand.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,6 @@ import com.swirlds.cli.utility.AbstractCommand; import com.swirlds.cli.utility.SubcommandOf; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.model.diagram.ModelEdgeSubstitution; -import com.swirlds.common.wiring.model.diagram.ModelGroup; -import com.swirlds.common.wiring.model.diagram.ModelManualLink; import com.swirlds.config.api.Configuration; import com.swirlds.config.api.ConfigurationBuilder; import com.swirlds.platform.builder.ApplicationCallbacks; @@ -38,6 +33,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.model.diagram.ModelEdgeSubstitution; +import org.hiero.wiring.framework.model.diagram.ModelGroup; +import org.hiero.wiring.framework.model.diagram.ModelManualLink; import picocli.CommandLine; @CommandLine.Command( diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramLegendCommand.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramLegendCommand.java index 3e2c598b4c35..b440f3ff0bc8 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramLegendCommand.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/cli/DiagramLegendCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,14 +19,6 @@ import com.swirlds.cli.utility.AbstractCommand; import com.swirlds.cli.utility.SubcommandOf; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.model.diagram.ModelEdgeSubstitution; -import com.swirlds.common.wiring.model.diagram.ModelGroup; -import com.swirlds.common.wiring.model.diagram.ModelManualLink; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.SolderType; import com.swirlds.config.api.Configuration; import com.swirlds.config.api.ConfigurationBuilder; import com.swirlds.platform.config.DefaultConfiguration; @@ -35,6 +27,14 @@ import java.util.Base64; import java.util.List; import java.util.Set; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.model.diagram.ModelEdgeSubstitution; +import org.hiero.wiring.framework.model.diagram.ModelGroup; +import org.hiero.wiring.framework.model.diagram.ModelManualLink; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.SolderType; import picocli.CommandLine; @CommandLine.Command( diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/AppNotifier.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/AppNotifier.java index e89714a82116..57efc528e94d 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/AppNotifier.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/AppNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package com.swirlds.platform.components; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.components.appcomm.CompleteStateNotificationWithCleanup; import com.swirlds.platform.listeners.ReconnectCompleteNotification; import com.swirlds.platform.listeners.StateWriteToDiskCompleteNotification; @@ -24,6 +23,7 @@ import com.swirlds.platform.system.state.notifications.StateHashedNotification; import com.swirlds.platform.system.status.PlatformStatus; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * A component that wraps around a notification engine, for sending notifications to the app. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventWindowManager.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventWindowManager.java index f390aa15fb1b..1b6148f24f6b 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventWindowManager.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/EventWindowManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.components; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.internal.ConsensusRound; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * The gateway for disseminating {@link EventWindow} instances to the rest of the platform. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/SavedStateController.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/SavedStateController.java index c3123d3c6293..c613e48d87ae 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/SavedStateController.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/SavedStateController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.components; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.state.signed.ReservedSignedState; import com.swirlds.platform.state.signed.SignedState; import com.swirlds.platform.wiring.components.StateAndRound; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Controls which signed states should be written to disk based on input from other components. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/appcomm/LatestCompleteStateNotifier.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/appcomm/LatestCompleteStateNotifier.java index 76844ddad7a1..b7d5f1a75051 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/appcomm/LatestCompleteStateNotifier.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/appcomm/LatestCompleteStateNotifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.components.appcomm; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.state.signed.ReservedSignedState; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Responsible for notifying the app of the latest complete state. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/consensus/ConsensusEngine.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/consensus/ConsensusEngine.java index 4a7639a1c283..17980312f619 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/consensus/ConsensusEngine.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/components/consensus/ConsensusEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package com.swirlds.platform.components.consensus; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.Consensus; import com.swirlds.platform.consensus.ConsensusSnapshot; import com.swirlds.platform.event.PlatformEvent; @@ -25,6 +24,7 @@ import com.swirlds.platform.system.status.PlatformStatus; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Responsible for adding events to {@link Consensus}. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/config/PlatformConfigurationExtension.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/config/PlatformConfigurationExtension.java index 0f38a026ec14..0c74a28c9d29 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/config/PlatformConfigurationExtension.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/config/PlatformConfigurationExtension.java @@ -27,8 +27,6 @@ import com.swirlds.common.metrics.platform.prometheus.PrometheusConfig; import com.swirlds.common.platform.NodeId; import com.swirlds.common.platform.NodeIdConverter; -import com.swirlds.common.wiring.WiringConfig; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; import com.swirlds.config.api.ConfigurationExtension; import com.swirlds.logging.api.internal.configuration.InternalLoggingConfig; import com.swirlds.merkledb.config.MerkleDbConfig; @@ -50,6 +48,8 @@ import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Set; import org.hiero.event.creator.impl.EventCreationConfig; +import org.hiero.wiring.framework.WiringConfig; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; /** * Registers configuration types for the platform. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/FutureEventBuffer.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/FutureEventBuffer.java index 59eb3d2000ec..1edb3cdbe6fd 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/FutureEventBuffer.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/FutureEventBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package com.swirlds.platform.event; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.wiring.NoInput; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Buffers events from the future (i.e. events with a birth round that is greater than the round that consensus is diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchDetector.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchDetector.java index b1fd50897a8f..0385a02c5de4 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchDetector.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.event.branching; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Detects branching in the hashgraph. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchReporter.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchReporter.java index 5b09594134ad..5f9cba94c9cd 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchReporter.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/branching/BranchReporter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.event.branching; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * This class is responsible for logging and producing metrics when a branch is observed. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/creation/EventCreationManager.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/creation/EventCreationManager.java index 4625c4c07e0f..86029eeaad98 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/creation/EventCreationManager.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/creation/EventCreationManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package com.swirlds.platform.event.creation; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.system.events.UnsignedEvent; @@ -24,6 +23,7 @@ import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Wraps an {@link EventCreator} and provides additional functionality. Will sometimes decide not to create new events diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/deduplication/EventDeduplicator.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/deduplication/EventDeduplicator.java index 7e13c23dedbd..d57a15b0808e 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/deduplication/EventDeduplicator.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/deduplication/EventDeduplicator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,12 +16,12 @@ package com.swirlds.platform.event.deduplication; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.wiring.NoInput; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Deduplicates events. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/hashing/EventHasher.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/hashing/EventHasher.java index 47958ef6844b..1edc87c65959 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/hashing/EventHasher.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/hashing/EventHasher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package com.swirlds.platform.event.hashing; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Hashes events. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/linking/InOrderLinker.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/linking/InOrderLinker.java index 9bb9ec295139..1704b7058730 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/linking/InOrderLinker.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/linking/InOrderLinker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package com.swirlds.platform.event.linking; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.gossip.shadowgraph.Shadowgraph; import com.swirlds.platform.internal.EventImpl; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Links events to their parents. Expects events to be provided in topological order. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/orphan/OrphanBuffer.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/orphan/OrphanBuffer.java index 5870b6c3070b..21a7c8ba94c7 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/orphan/OrphanBuffer.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/orphan/OrphanBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.event.orphan; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Takes as input an unordered stream of {@link PlatformEvent}s and emits a stream diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/InlinePcesWriter.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/InlinePcesWriter.java index 0843f86dd8c8..7853a75cc4f3 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/InlinePcesWriter.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/InlinePcesWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2024 Hedera Hashgraph, LLC + * Copyright (C) 2016-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.event.preconsensus; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * This object is responsible for writing preconsensus events to disk. It differs from {@link PcesWriter} in that it diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesReplayer.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesReplayer.java index a190688c0819..87d308236306 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesReplayer.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesReplayer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ import com.swirlds.common.formatting.UnitFormatter; import com.swirlds.common.io.IOIterator; import com.swirlds.common.utility.throttle.RateLimiter; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.state.signed.ReservedSignedState; import com.swirlds.platform.wiring.NoInput; @@ -40,6 +39,7 @@ import java.util.function.Supplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * This class encapsulates the logic for replaying preconsensus events at boot up time. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesSequencer.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesSequencer.java index 2403568d41d8..71751829199c 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesSequencer.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesSequencer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package com.swirlds.platform.event.preconsensus; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Responsible for assigning stream sequence numbers to events. All events that are written diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesWriter.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesWriter.java index b04cbb44edc3..539cad797609 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesWriter.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/PcesWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2024 Hedera Hashgraph, LLC + * Copyright (C) 2016-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.event.preconsensus; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * This object is responsible for writing preconsensus events to disk. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/durability/RoundDurabilityBuffer.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/durability/RoundDurabilityBuffer.java index 0d9b46c84249..6572879c4b95 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/durability/RoundDurabilityBuffer.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/preconsensus/durability/RoundDurabilityBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.event.preconsensus.durability; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.internal.ConsensusRound; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Instant; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * This component performs a logical "join" operation between states ready to be handled and events that are known to be diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/resubmitter/TransactionResubmitter.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/resubmitter/TransactionResubmitter.java index 8cb430a8f5ac..0c2fff9fd16a 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/resubmitter/TransactionResubmitter.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/resubmitter/TransactionResubmitter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.swirlds.platform.event.resubmitter; import com.hedera.hapi.platform.event.EventTransaction; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * A simple utility responsible for resubmitting stale transactions. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/signing/SelfEventSigner.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/signing/SelfEventSigner.java index e5dd2dfcf1b0..3b81032729a2 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/signing/SelfEventSigner.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/signing/SelfEventSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.event.signing; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.system.events.UnsignedEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Signs self events. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/DefaultStaleEventDetector.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/DefaultStaleEventDetector.java index f26e32dee5df..7b16dd31b00d 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/DefaultStaleEventDetector.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/DefaultStaleEventDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.platform.NodeId; -import com.swirlds.common.wiring.transformers.RoutableData; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.AncientMode; import com.swirlds.platform.event.PlatformEvent; @@ -33,6 +32,7 @@ import java.util.List; import java.util.Objects; import java.util.function.ToLongFunction; +import org.hiero.wiring.framework.transformers.RoutableData; /** * Detects when a self event becomes stale. Note that this detection may not observe a self event go stale if the node diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/StaleEventDetector.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/StaleEventDetector.java index e0fc20c6c439..3589508b44a4 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/StaleEventDetector.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stale/StaleEventDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ package com.swirlds.platform.event.stale; -import com.swirlds.common.wiring.component.InputWireLabel; -import com.swirlds.common.wiring.transformers.RoutableData; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.internal.ConsensusRound; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; +import org.hiero.wiring.framework.transformers.RoutableData; /** * Detects when a self event becomes stale. This utility does not pay attention to events created by other nodes. This diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stream/ConsensusEventStream.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stream/ConsensusEventStream.java index 159d7c55c6a7..6656f62f64d0 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stream/ConsensusEventStream.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/stream/ConsensusEventStream.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ package com.swirlds.platform.event.stream; import com.swirlds.common.stream.RunningEventHashOverride; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.system.events.CesEvent; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Generates event stream files when enableEventStreaming is true, and calculates runningHash for consensus Events. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/EventSignatureValidator.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/EventSignatureValidator.java index 7a93e1b73da2..178ec6c2154a 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/EventSignatureValidator.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/EventSignatureValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.event.validation; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Verifies event signatures diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/InternalEventValidator.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/InternalEventValidator.java index 2330965ab0b7..076534cd83b7 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/InternalEventValidator.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/event/validation/InternalEventValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.event.validation; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Validates that events are internally complete and consistent. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/DefaultTransactionHandler.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/DefaultTransactionHandler.java index 16c3b2386083..e61197f6c9a2 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/DefaultTransactionHandler.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/DefaultTransactionHandler.java @@ -31,7 +31,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.crypto.Hash; import com.swirlds.common.stream.RunningEventHashOverride; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import com.swirlds.platform.components.transaction.system.ScopedSystemTransaction; import com.swirlds.platform.consensus.ConsensusConfig; import com.swirlds.platform.crypto.CryptoStatic; @@ -54,6 +53,7 @@ import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A standard implementation of {@link TransactionHandler}. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionHandler.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionHandler.java index a533c68e1452..49930c5f9b1b 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionHandler.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016-2024 Hedera Hashgraph, LLC + * Copyright (C) 2016-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.swirlds.platform.eventhandling; import com.swirlds.common.stream.RunningEventHashOverride; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.internal.ConsensusRound; import com.swirlds.platform.wiring.components.StateAndRound; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Applies transactions from rounds that have reached consensus to the state diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionPrehandler.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionPrehandler.java index de53d1258ab5..180a84f5e2ca 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionPrehandler.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/eventhandling/TransactionPrehandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.swirlds.platform.eventhandling; import com.hedera.hapi.platform.event.StateSignatureTransaction; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.components.transaction.system.ScopedSystemTransaction; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Performs the prehandling of transactions diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gossip/SyncGossip.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gossip/SyncGossip.java index bbc127c84dac..89b48ae2ea8c 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gossip/SyncGossip.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/gossip/SyncGossip.java @@ -30,9 +30,6 @@ import com.swirlds.common.threading.manager.ThreadManager; import com.swirlds.common.threading.pool.CachedPoolParallelExecutor; import com.swirlds.common.threading.pool.ParallelExecutor; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.Utilities; import com.swirlds.platform.config.BasicConfig; import com.swirlds.platform.config.StateConfig; @@ -98,6 +95,9 @@ import java.util.function.Supplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Boilerplate code for gossip. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/pool/TransactionPool.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/pool/TransactionPool.java index 5f53a15207c5..ef616e316d10 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/pool/TransactionPool.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/pool/TransactionPool.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ package com.swirlds.platform.pool; import com.hedera.hapi.platform.event.StateSignatureTransaction; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.system.status.PlatformStatus; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Coordinates and manages a pool of transactions waiting to be submitted. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/publisher/PlatformPublisher.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/publisher/PlatformPublisher.java index e4d2792e0126..72c89529e515 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/publisher/PlatformPublisher.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/publisher/PlatformPublisher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.publisher; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.ConsensusSnapshot; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * This component is responsible for publishing internal platform data to external subscribers. By default this is not diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hasher/StateHasher.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hasher/StateHasher.java index 63c72d1ef328..88c7abfeae93 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hasher/StateHasher.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hasher/StateHasher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.state.hasher; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.wiring.components.StateAndRound; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Hashes signed states diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hashlogger/HashLogger.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hashlogger/HashLogger.java index 78055ed0d746..eaf49451ee6a 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hashlogger/HashLogger.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/hashlogger/HashLogger.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package com.swirlds.platform.state.hashlogger; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.state.signed.ReservedSignedState; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * This component is responsible for logging the hash of the state each round (for debugging). diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/LatestCompleteStateNexus.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/LatestCompleteStateNexus.java index e98bd1c8b07d..f6f538e5b6ab 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/LatestCompleteStateNexus.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/LatestCompleteStateNexus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.state.nexus; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.state.signed.ReservedSignedState; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * A nexus that holds the latest complete signed state. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/SignedStateNexus.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/SignedStateNexus.java index 4d83c6bf6fbc..67f1c9908630 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/SignedStateNexus.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/nexus/SignedStateNexus.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.swirlds.platform.state.nexus; import com.swirlds.common.utility.Clearable; -import com.swirlds.common.wiring.component.SchedulerLabel; import com.swirlds.platform.consensus.ConsensusConstants; import com.swirlds.platform.state.signed.ReservedSignedState; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.component.SchedulerLabel; /** * A thread-safe container that also manages reservations for a single signed state. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/signed/StateSignatureCollector.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/signed/StateSignatureCollector.java index 7a9493ed3ccb..c06dc3f62200 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/signed/StateSignatureCollector.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/state/signed/StateSignatureCollector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package com.swirlds.platform.state.signed; import com.hedera.hapi.platform.event.StateSignatureTransaction; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.components.transaction.system.ScopedSystemTransaction; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Collects signatures for signed states. This class ensures that all the non-ancient states that are not fully signed diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/events/BirthRoundMigrationShim.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/events/BirthRoundMigrationShim.java index 3bf9e8a47240..3517529c0c27 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/events/BirthRoundMigrationShim.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/events/BirthRoundMigrationShim.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package com.swirlds.platform.system.events; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.event.PlatformEvent; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.component.InputWireLabel; /** * Performs special migration on events during the birth round migration pathway. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/status/StatusStateMachine.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/status/StatusStateMachine.java index 5d3f995f479e..77c6c96c1dc6 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/status/StatusStateMachine.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/system/status/StatusStateMachine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ package com.swirlds.platform.system.status; -import com.swirlds.common.wiring.component.InputWireLabel; import com.swirlds.platform.system.status.actions.PlatformStatusAction; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Instant; +import org.hiero.wiring.framework.component.InputWireLabel; /** * A state machine that processes {@link PlatformStatusAction}s diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformCoordinator.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformCoordinator.java index c424d01ee5be..4b52241faf37 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformCoordinator.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformCoordinator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,8 +17,6 @@ package com.swirlds.platform.wiring; import com.hedera.hapi.platform.event.StateSignatureTransaction; -import com.swirlds.common.wiring.component.ComponentWiring; -import com.swirlds.common.wiring.transformers.RoutableData; import com.swirlds.platform.components.consensus.ConsensusEngine; import com.swirlds.platform.components.transaction.system.ScopedSystemTransaction; import com.swirlds.platform.event.PlatformEvent; @@ -49,6 +47,8 @@ import edu.umd.cs.findbugs.annotations.Nullable; import java.util.List; import java.util.Objects; +import org.hiero.wiring.framework.component.ComponentWiring; +import org.hiero.wiring.framework.transformers.RoutableData; /** * Responsible for coordinating the clearing of the platform wiring objects. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformSchedulersConfig.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformSchedulersConfig.java index 216edb4fb0ae..a715ecaebcfa 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformSchedulersConfig.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformSchedulersConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.wiring; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; import com.swirlds.config.api.ConfigData; import com.swirlds.config.api.ConfigProperty; import java.time.Duration; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; /** * Contains configuration values for the platform schedulers. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformWiring.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformWiring.java index d615e0735408..16944206828a 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformWiring.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/PlatformWiring.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,26 +16,17 @@ package com.swirlds.platform.wiring; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration.DIRECT_THREADSAFE_CONFIGURATION; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration.NO_OP_CONFIGURATION; -import static com.swirlds.common.wiring.wires.SolderType.INJECT; -import static com.swirlds.common.wiring.wires.SolderType.OFFER; import static com.swirlds.platform.event.stale.StaleEventDetectorOutput.SELF_EVENT; import static com.swirlds.platform.event.stale.StaleEventDetectorOutput.STALE_SELF_EVENT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration.DIRECT_THREADSAFE_CONFIGURATION; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration.NO_OP_CONFIGURATION; +import static org.hiero.wiring.framework.wires.SolderType.INJECT; +import static org.hiero.wiring.framework.wires.SolderType.OFFER; import com.hedera.hapi.platform.event.StateSignatureTransaction; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.io.IOIterator; import com.swirlds.common.stream.RunningEventHashOverride; -import com.swirlds.common.wiring.component.ComponentWiring; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; -import com.swirlds.common.wiring.transformers.RoutableData; -import com.swirlds.common.wiring.transformers.WireFilter; -import com.swirlds.common.wiring.transformers.WireTransformer; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.builder.ApplicationCallbacks; import com.swirlds.platform.builder.PlatformComponentBuilder; import com.swirlds.platform.components.AppNotifier; @@ -108,6 +99,15 @@ import java.util.List; import java.util.Objects; import org.hiero.event.creator.impl.EventCreationConfig; +import org.hiero.wiring.framework.component.ComponentWiring; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; +import org.hiero.wiring.framework.transformers.RoutableData; +import org.hiero.wiring.framework.transformers.WireFilter; +import org.hiero.wiring.framework.transformers.WireTransformer; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Encapsulates wiring for {@link com.swirlds.platform.SwirldsPlatform}. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/SignedStateReserver.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/SignedStateReserver.java index d1a9ce83c829..1f67b1272476 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/SignedStateReserver.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/SignedStateReserver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package com.swirlds.platform.wiring; -import com.swirlds.common.wiring.transformers.AdvancedTransformation; import com.swirlds.platform.state.signed.ReservedSignedState; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.transformers.AdvancedTransformation; /** * Manages reservations of a signed state when it needs to be passed to one or more input wires. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundReserver.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundReserver.java index 803b85ca89aa..411d39a74a51 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundReserver.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundReserver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +16,9 @@ package com.swirlds.platform.wiring; -import com.swirlds.common.wiring.transformers.AdvancedTransformation; import com.swirlds.platform.wiring.components.StateAndRound; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.transformers.AdvancedTransformation; /** * Manages reservations of a signed state contained in a {@link StateAndRound} object, when it needs to be passed to one diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundToStateReserver.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundToStateReserver.java index 1da7d97cb6fb..c6ab8c5539ef 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundToStateReserver.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/StateAndRoundToStateReserver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ package com.swirlds.platform.wiring; -import com.swirlds.common.wiring.transformers.AdvancedTransformation; import com.swirlds.platform.state.signed.ReservedSignedState; import com.swirlds.platform.wiring.components.StateAndRound; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.transformers.AdvancedTransformation; /** * Manages reservations of a signed state contained in a {@link StateAndRound} object, when the StateAndRound needs to diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/Gossip.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/Gossip.java index c077c4e48ad7..42fd6ece775a 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/Gossip.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/Gossip.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,15 @@ package com.swirlds.platform.wiring.components; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.system.status.PlatformStatus; import com.swirlds.platform.wiring.NoInput; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Implements gossip with network peers. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/GossipWiring.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/GossipWiring.java index 7b1e0f5231c5..e5c9cd5a24ad 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/GossipWiring.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/GossipWiring.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,6 @@ package com.swirlds.platform.wiring.components; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.system.status.PlatformStatus; @@ -30,6 +24,12 @@ import com.swirlds.platform.wiring.PlatformSchedulersConfig; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Wiring for gossip. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PassThroughWiring.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PassThroughWiring.java index 56cd89c74325..828c139b21b6 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PassThroughWiring.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PassThroughWiring.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,15 @@ package com.swirlds.platform.wiring.components; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Function; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * PassThrough Component Wiring, useful for wiring no-op components with the given scheduler type. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PcesReplayerWiring.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PcesReplayerWiring.java index 9183a1b7d845..c30d45580795 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PcesReplayerWiring.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/PcesReplayerWiring.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,20 +16,20 @@ package com.swirlds.platform.wiring.components; -import static com.swirlds.common.wiring.model.diagram.HyperlinkBuilder.platformCoreHyperlink; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT; +import static org.hiero.wiring.framework.model.diagram.HyperlinkBuilder.platformCoreHyperlink; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT; import com.swirlds.common.io.IOIterator; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.event.preconsensus.PcesReplayer; import com.swirlds.platform.wiring.NoInput; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * The wiring for the {@link PcesReplayer}. diff --git a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/RunningEventHashOverrideWiring.java b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/RunningEventHashOverrideWiring.java index d9f08797d867..7dc18ca1e222 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/RunningEventHashOverrideWiring.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/wiring/components/RunningEventHashOverrideWiring.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,16 @@ package com.swirlds.platform.wiring.components; -import static com.swirlds.common.wiring.model.diagram.HyperlinkBuilder.platformCoreHyperlink; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.model.diagram.HyperlinkBuilder.platformCoreHyperlink; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; import com.swirlds.common.stream.RunningEventHashOverride; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * A wiring object for distributing {@link RunningEventHashOverride}s diff --git a/platform-sdk/swirlds-platform-core/src/main/java/module-info.java b/platform-sdk/swirlds-platform-core/src/main/java/module-info.java index b1e6a8cb2b05..f596d2a26019 100644 --- a/platform-sdk/swirlds-platform-core/src/main/java/module-info.java +++ b/platform-sdk/swirlds-platform-core/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + /** * The Swirlds public API module used by platform applications. */ @@ -137,6 +153,7 @@ requires transitive com.swirlds.state.impl; requires transitive org.hiero.consensus.gossip; requires transitive org.hiero.event.creator; + requires transitive org.hiero.wiring.framework; requires transitive com.fasterxml.jackson.annotation; requires transitive com.fasterxml.jackson.databind; requires transitive info.picocli; diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/components/EventWindowManagerTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/components/EventWindowManagerTests.java index 143c9007fbed..a2ee2b6b3101 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/components/EventWindowManagerTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/components/EventWindowManagerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,13 +22,13 @@ import static org.mockito.Mockito.when; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.component.ComponentWiring; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.internal.ConsensusRound; import java.util.concurrent.atomic.AtomicReference; +import org.hiero.wiring.framework.component.ComponentWiring; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; import org.junit.jupiter.api.Test; public class EventWindowManagerTests { diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stale/StaleEventDetectorTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stale/StaleEventDetectorTests.java index 8965d3fe7f7e..d190d206443a 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stale/StaleEventDetectorTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stale/StaleEventDetectorTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,7 +27,6 @@ import com.swirlds.common.platform.NodeId; import com.swirlds.common.test.fixtures.Randotron; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.transformers.RoutableData; import com.swirlds.config.api.Configuration; import com.swirlds.config.extensions.test.fixtures.TestConfigBuilder; import com.swirlds.platform.consensus.ConsensusSnapshot; @@ -43,6 +42,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.hiero.wiring.framework.transformers.RoutableData; import org.junit.jupiter.api.Test; class StaleEventDetectorTests { diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stream/ConsensusEventStreamTest.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stream/ConsensusEventStreamTest.java index 84a327bcf861..f302fde2d4a5 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stream/ConsensusEventStreamTest.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/event/stream/ConsensusEventStreamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,13 +27,13 @@ import com.swirlds.common.stream.RunningEventHashOverride; import com.swirlds.common.test.fixtures.RandomUtils; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.component.ComponentWiring; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import com.swirlds.platform.system.events.CesEvent; import java.util.List; import java.util.Random; +import org.hiero.wiring.framework.component.ComponentWiring; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/gossip/SimulatedGossipTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/gossip/SimulatedGossipTests.java index 805b957a31fa..6599f08cb955 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/gossip/SimulatedGossipTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/gossip/SimulatedGossipTests.java @@ -16,7 +16,7 @@ package com.swirlds.platform.turtle.gossip; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration.DIRECT_THREADSAFE_CONFIGURATION; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration.DIRECT_THREADSAFE_CONFIGURATION; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; @@ -25,12 +25,6 @@ import com.swirlds.common.platform.NodeId; import com.swirlds.common.test.fixtures.Randotron; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.event.hashing.DefaultEventHasher; import com.swirlds.platform.system.address.AddressBook; @@ -47,6 +41,12 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/runner/TurtleNode.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/runner/TurtleNode.java index aef2e6852293..d34e0f70dce1 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/runner/TurtleNode.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/turtle/runner/TurtleNode.java @@ -29,8 +29,6 @@ import com.swirlds.common.platform.NodeId; import com.swirlds.common.test.fixtures.Randotron; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.DeterministicWiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; import com.swirlds.config.api.Configuration; import com.swirlds.config.extensions.test.fixtures.TestConfigBuilder; import com.swirlds.platform.builder.PlatformBuilder; @@ -49,6 +47,8 @@ import com.swirlds.platform.wiring.PlatformSchedulersConfig_; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Supplier; +import org.hiero.wiring.framework.model.DeterministicWiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; /** * Encapsulates a single node running in a TURTLE network. diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/PlatformWiringTests.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/PlatformWiringTests.java index 930e5cdfd767..dd49e3bcec1e 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/PlatformWiringTests.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/PlatformWiringTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,8 +21,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; import com.swirlds.config.api.ConfigurationBuilder; import com.swirlds.platform.builder.ApplicationCallbacks; import com.swirlds.platform.builder.PlatformBuildingBlocks; @@ -67,6 +65,8 @@ import com.swirlds.platform.system.events.BirthRoundMigrationShim; import com.swirlds.platform.system.status.StatusStateMachine; import java.util.stream.Stream; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; diff --git a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/SignedStateReserverTest.java b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/SignedStateReserverTest.java index 9a9cecda9089..8ae308db5cb1 100644 --- a/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/SignedStateReserverTest.java +++ b/platform-sdk/swirlds-platform-core/src/test/java/com/swirlds/platform/wiring/SignedStateReserverTest.java @@ -23,12 +23,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; import com.swirlds.common.utility.ValueReference; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import com.swirlds.platform.crypto.SignatureVerifier; import com.swirlds.platform.state.PlatformMerkleStateRoot; import com.swirlds.platform.state.signed.ReservedSignedState; @@ -36,6 +30,12 @@ import java.util.List; import java.util.stream.IntStream; import java.util.stream.Stream; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/platform-sdk/swirlds-platform-core/src/testFixtures/java/com/swirlds/platform/test/fixtures/turtle/gossip/SimulatedGossip.java b/platform-sdk/swirlds-platform-core/src/testFixtures/java/com/swirlds/platform/test/fixtures/turtle/gossip/SimulatedGossip.java index f743ee4cac86..4fc1845ffd1b 100644 --- a/platform-sdk/swirlds-platform-core/src/testFixtures/java/com/swirlds/platform/test/fixtures/turtle/gossip/SimulatedGossip.java +++ b/platform-sdk/swirlds-platform-core/src/testFixtures/java/com/swirlds/platform/test/fixtures/turtle/gossip/SimulatedGossip.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,9 +17,6 @@ package com.swirlds.platform.test.fixtures.turtle.gossip; import com.swirlds.common.platform.NodeId; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.platform.consensus.EventWindow; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.gossip.IntakeEventCounter; @@ -29,6 +26,9 @@ import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.Objects; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Simulates the {@link Gossip} subsystem for a group of nodes running on a {@link SimulatedNetwork}. diff --git a/platform-sdk/swirlds-platform-core/src/testFixtures/java/module-info.java b/platform-sdk/swirlds-platform-core/src/testFixtures/java/module-info.java index 9d6da6f48164..93416d8eeece 100644 --- a/platform-sdk/swirlds-platform-core/src/testFixtures/java/module-info.java +++ b/platform-sdk/swirlds-platform-core/src/testFixtures/java/module-info.java @@ -1,4 +1,20 @@ -open module com.swirlds.platform.core.test.fixtures { +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + +module com.swirlds.platform.core.test.fixtures { requires transitive com.hedera.node.hapi; requires transitive com.swirlds.common.test.fixtures; requires transitive com.swirlds.common; @@ -14,6 +30,7 @@ requires com.swirlds.logging; requires com.swirlds.merkledb; requires com.swirlds.state.api.test.fixtures; + requires org.hiero.wiring.framework; requires com.github.spotbugs.annotations; requires org.junit.jupiter.api; requires org.mockito; diff --git a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/com/swirlds/platform/test/consensus/TestIntake.java b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/com/swirlds/platform/test/consensus/TestIntake.java index 5a542e9e40c6..50d957bd9036 100644 --- a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/com/swirlds/platform/test/consensus/TestIntake.java +++ b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/com/swirlds/platform/test/consensus/TestIntake.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022-2024 Hedera Hashgraph, LLC + * Copyright (C) 2022-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +16,13 @@ package com.swirlds.platform.test.consensus; -import static com.swirlds.common.wiring.wires.SolderType.INJECT; import static com.swirlds.platform.consensus.SyntheticSnapshot.GENESIS_SNAPSHOT; import static com.swirlds.platform.event.AncientMode.GENERATION_THRESHOLD; +import static org.hiero.wiring.framework.wires.SolderType.INJECT; import com.swirlds.base.time.Time; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.platform.NodeId; -import com.swirlds.common.wiring.component.ComponentWiring; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.output.OutputWire; import com.swirlds.platform.components.DefaultEventWindowManager; import com.swirlds.platform.components.EventWindowManager; import com.swirlds.platform.components.consensus.ConsensusEngine; @@ -53,6 +47,12 @@ import edu.umd.cs.findbugs.annotations.Nullable; import java.util.LinkedList; import java.util.List; +import org.hiero.wiring.framework.component.ComponentWiring; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * Event intake with consensus and shadowgraph, used for testing diff --git a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/module-info.java b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/module-info.java index 38868fc570e4..b2e949f6552b 100644 --- a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/module-info.java +++ b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/main/java/module-info.java @@ -1,9 +1,26 @@ -open module com.swirlds.platform.test { +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + +module com.swirlds.platform.test { requires transitive com.swirlds.base; requires transitive com.swirlds.common.test.fixtures; requires transitive com.swirlds.common; requires transitive com.swirlds.platform.core.test.fixtures; requires transitive com.swirlds.platform.core; + requires transitive org.hiero.wiring.framework; requires com.hedera.node.hapi; requires com.swirlds.config.api; requires com.swirlds.config.extensions.test.fixtures; diff --git a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/event/preconsensus/PcesReplayerTests.java b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/event/preconsensus/PcesReplayerTests.java index 2d8f8598e387..3324214f6882 100644 --- a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/event/preconsensus/PcesReplayerTests.java +++ b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/src/test/java/com/swirlds/platform/test/event/preconsensus/PcesReplayerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,6 @@ import com.swirlds.common.io.IOIterator; import com.swirlds.common.test.fixtures.Randotron; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import com.swirlds.config.extensions.test.fixtures.TestConfigBuilder; import com.swirlds.platform.event.PlatformEvent; import com.swirlds.platform.event.preconsensus.PcesConfig_; @@ -45,6 +44,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/platform-sdk/swirlds-virtualmap/src/main/java/com/swirlds/virtualmap/internal/hash/VirtualHasher.java b/platform-sdk/swirlds-virtualmap/src/main/java/com/swirlds/virtualmap/internal/hash/VirtualHasher.java index a1ecf0aa3ae3..e1eb5bec7c7b 100644 --- a/platform-sdk/swirlds-virtualmap/src/main/java/com/swirlds/virtualmap/internal/hash/VirtualHasher.java +++ b/platform-sdk/swirlds-virtualmap/src/main/java/com/swirlds/virtualmap/internal/hash/VirtualHasher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2024 Hedera Hashgraph, LLC + * Copyright (C) 2021-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.swirlds.common.crypto.CryptographyHolder; import com.swirlds.common.crypto.Hash; import com.swirlds.common.crypto.HashBuilder; -import com.swirlds.common.wiring.tasks.AbstractTask; import com.swirlds.virtualmap.VirtualKey; import com.swirlds.virtualmap.VirtualMap; import com.swirlds.virtualmap.VirtualValue; @@ -44,6 +43,7 @@ import java.util.function.LongFunction; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.tasks.AbstractTask; /** * Responsible for hashing virtual merkle trees. This class is designed to work both for normal diff --git a/platform-sdk/swirlds-virtualmap/src/main/java/module-info.java b/platform-sdk/swirlds-virtualmap/src/main/java/module-info.java index d748cf6dd691..2818b2882ee6 100644 --- a/platform-sdk/swirlds-virtualmap/src/main/java/module-info.java +++ b/platform-sdk/swirlds-virtualmap/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + /** * A map that implements the FastCopyable interface. */ @@ -17,13 +33,14 @@ com.swirlds.virtualmap.test.fixtures, com.swirlds.platform.core.test.fixtures; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.common; requires transitive com.swirlds.config.api; requires transitive com.swirlds.metrics.api; - requires transitive com.hedera.pbj.runtime; requires com.swirlds.base; requires com.swirlds.config.extensions; requires com.swirlds.logging; + requires org.hiero.wiring.framework; requires java.management; // Test dependency requires org.apache.logging.log4j; requires static transitive com.github.spotbugs.annotations; diff --git a/platform-sdk/wiring-framework/build.gradle.kts b/platform-sdk/wiring-framework/build.gradle.kts new file mode 100644 index 000000000000..f620fe6f5d09 --- /dev/null +++ b/platform-sdk/wiring-framework/build.gradle.kts @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + +plugins { + id("org.hiero.gradle.module.library") + id("org.hiero.gradle.feature.publish-artifactregistry") +} + +description = "Wiring Framework" + +// Remove the following line to enable all 'javac' lint checks that we have turned on by default +// and then fix the reported issues. +tasks.withType().configureEach { + options.compilerArgs.add( + "-Xlint:-exports,-lossy-conversions,-overloads,-dep-ann,-text-blocks,-varargs" + ) +} + +testModuleInfo { + requires("com.swirlds.common.test.fixtures") + requires("com.swirlds.base.test.fixtures") + requires("org.assertj.core") + requires("org.junit.jupiter.api") + requires("org.junit.jupiter.params") + requires("org.mockito") + requiresStatic("com.github.spotbugs.annotations") +} diff --git a/platform-sdk/wiring-framework/src/main/java/module-info.java b/platform-sdk/wiring-framework/src/main/java/module-info.java new file mode 100644 index 000000000000..0dc3a3aba6f8 --- /dev/null +++ b/platform-sdk/wiring-framework/src/main/java/module-info.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * 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. + */ + +module org.hiero.wiring.framework { + exports org.hiero.wiring.framework; + exports org.hiero.wiring.framework.model.diagram; + exports org.hiero.wiring.framework.component; + exports org.hiero.wiring.framework.counters; + exports org.hiero.wiring.framework.model; + exports org.hiero.wiring.framework.schedulers; + exports org.hiero.wiring.framework.schedulers.builders; + exports org.hiero.wiring.framework.schedulers.internal; + exports org.hiero.wiring.framework.tasks; + exports org.hiero.wiring.framework.transformers; + exports org.hiero.wiring.framework.wires; + exports org.hiero.wiring.framework.wires.input; + exports org.hiero.wiring.framework.wires.output; + + requires transitive com.swirlds.base; + requires transitive com.swirlds.common; + requires transitive com.swirlds.config.api; + requires com.swirlds.logging; + requires com.swirlds.metrics.api; + requires org.apache.logging.log4j; + requires static com.github.spotbugs.annotations; +} diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/WiringConfig.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/WiringConfig.java similarity index 97% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/WiringConfig.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/WiringConfig.java index 8c48b3501814..a4e79740ae8d 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/WiringConfig.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/WiringConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring; +package org.hiero.wiring.framework; import com.swirlds.config.api.ConfigData; import com.swirlds.config.api.ConfigProperty; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/ComponentWiring.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/ComponentWiring.java similarity index 95% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/ComponentWiring.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/ComponentWiring.java index 926168ead215..03db793801be 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/ComponentWiring.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/ComponentWiring.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,25 +14,10 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component; - -import static com.swirlds.common.wiring.model.diagram.HyperlinkBuilder.platformCoreHyperlink; - -import com.swirlds.common.wiring.component.internal.FilterToBind; -import com.swirlds.common.wiring.component.internal.InputWireToBind; -import com.swirlds.common.wiring.component.internal.TransformerToBind; -import com.swirlds.common.wiring.component.internal.WiringComponentProxy; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.transformers.RoutableData; -import com.swirlds.common.wiring.transformers.WireFilter; -import com.swirlds.common.wiring.transformers.WireRouter; -import com.swirlds.common.wiring.transformers.WireTransformer; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; +package org.hiero.wiring.framework.component; + +import static org.hiero.wiring.framework.model.diagram.HyperlinkBuilder.platformCoreHyperlink; + import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.reflect.Method; @@ -48,6 +33,21 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.function.ToLongFunction; +import org.hiero.wiring.framework.component.internal.FilterToBind; +import org.hiero.wiring.framework.component.internal.InputWireToBind; +import org.hiero.wiring.framework.component.internal.TransformerToBind; +import org.hiero.wiring.framework.component.internal.WiringComponentProxy; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.transformers.RoutableData; +import org.hiero.wiring.framework.transformers.WireFilter; +import org.hiero.wiring.framework.transformers.WireRouter; +import org.hiero.wiring.framework.transformers.WireTransformer; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * Builds and manages input/output wires for a component. @@ -376,7 +376,7 @@ public OutputWire getSplitOutput() { * address, which are implemented by enum values. *

    * This method should only be used for components which have an output type of - * {@link com.swirlds.common.wiring.transformers.RoutableData RoutableData}. Calling this method more than once with + * {@link RoutableData RoutableData}. Calling this method more than once with * different enum classes will throw. * * @param address an enum value that describes one of the different types of data that can be routed @@ -398,7 +398,7 @@ public , DATA_TYPE> OutputWire * described by a routing address, which are implemented by enum values. *

    * This method should only be used for components which have an output type of - * {@link com.swirlds.common.wiring.transformers.RoutableData List<RoutableData>}. Calling this method more + * {@link RoutableData List<RoutableData>}. Calling this method more * than once with different enum classes will throw. * * @param address an enum value that describes one of the different types of data that can be routed @@ -757,7 +757,7 @@ public void bind(@NonNull final COMPONENT_TYPE component) { /** * Bind to a component. This method is similar to {@link #bind(Object)}, but it allows the component to be created * if and only if we need to bind to it. This method will invoke the supplier if the task scheduler type is anything - * other than a {@link com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType#NO_OP NO_OP} scheduler. + * other than a {@link TaskSchedulerType#NO_OP NO_OP} scheduler. * * @param componentBuilder builds or supplies the component */ diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/InputWireLabel.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/InputWireLabel.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/InputWireLabel.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/InputWireLabel.java index 6fd770311f38..c07f3aac9723 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/InputWireLabel.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/InputWireLabel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component; +package org.hiero.wiring.framework.component; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.annotation.ElementType; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/SchedulerLabel.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/SchedulerLabel.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/SchedulerLabel.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/SchedulerLabel.java index 045a648339bb..5e16a7d52482 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/SchedulerLabel.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/SchedulerLabel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component; +package org.hiero.wiring.framework.component; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.annotation.ElementType; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/FilterToBind.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/FilterToBind.java similarity index 87% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/FilterToBind.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/FilterToBind.java index 9f972f8fcea0..650730184786 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/FilterToBind.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/FilterToBind.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component.internal; +package org.hiero.wiring.framework.component.internal; -import com.swirlds.common.wiring.transformers.WireFilter; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.BiFunction; +import org.hiero.wiring.framework.transformers.WireFilter; /** * A filter and the predicate to bind. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/InputWireToBind.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/InputWireToBind.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/InputWireToBind.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/InputWireToBind.java index 123848595220..84060c3c025b 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/InputWireToBind.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/InputWireToBind.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component.internal; +package org.hiero.wiring.framework.component.internal; -import com.swirlds.common.wiring.wires.input.BindableInputWire; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.function.BiConsumer; import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; +import org.hiero.wiring.framework.wires.input.BindableInputWire; /** * Contains information necessary to bind an input wire when we eventually get the implementation of the component. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/TransformerToBind.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/TransformerToBind.java similarity index 88% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/TransformerToBind.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/TransformerToBind.java index 982099c8c47d..562f1a50c6c9 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/TransformerToBind.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/TransformerToBind.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component.internal; +package org.hiero.wiring.framework.component.internal; -import com.swirlds.common.wiring.transformers.WireTransformer; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.BiFunction; +import org.hiero.wiring.framework.transformers.WireTransformer; /** * A transformer and the transformation to bind to a component. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/WiringComponentProxy.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/WiringComponentProxy.java similarity index 89% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/WiringComponentProxy.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/WiringComponentProxy.java index b751b34dd197..54112ce76e33 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/component/internal/WiringComponentProxy.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/component/internal/WiringComponentProxy.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,16 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component.internal; +package org.hiero.wiring.framework.component.internal; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.util.Objects; +import org.hiero.wiring.framework.component.ComponentWiring; /** - * This dynamic proxy is used by the {@link com.swirlds.common.wiring.component.ComponentWiring} to capture the most + * This dynamic proxy is used by the {@link ComponentWiring} to capture the most * recently invoked method. */ public class WiringComponentProxy implements InvocationHandler { diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/BackpressureObjectCounter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/BackpressureObjectCounter.java similarity index 98% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/BackpressureObjectCounter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/BackpressureObjectCounter.java index 9f14e3971aab..e6549818ded9 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/BackpressureObjectCounter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/BackpressureObjectCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/EmptyBlocker.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/EmptyBlocker.java similarity index 95% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/EmptyBlocker.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/EmptyBlocker.java index 7360668cd9de..2818b30da4d0 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/EmptyBlocker.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/EmptyBlocker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/MultiObjectCounter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/MultiObjectCounter.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/MultiObjectCounter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/MultiObjectCounter.java index 7e50d9500dcc..dc8026420c70 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/MultiObjectCounter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/MultiObjectCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/NoOpObjectCounter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/NoOpObjectCounter.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/NoOpObjectCounter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/NoOpObjectCounter.java index fa03845f6a1c..0ed9080f443a 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/NoOpObjectCounter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/NoOpObjectCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; /** * A counter that doesn't actually count. Saves us from having to do a (counter == null) check in the standard case. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/ObjectCounter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/ObjectCounter.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/ObjectCounter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/ObjectCounter.java index 78c3e83caaa3..f5fd12af9d70 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/ObjectCounter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/ObjectCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; /** * A class that counts the number of objects in various parts of the pipeline. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/StandardObjectCounter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/StandardObjectCounter.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/StandardObjectCounter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/StandardObjectCounter.java index 3cd5915f1637..f040dfe74d96 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/counters/StandardObjectCounter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/counters/StandardObjectCounter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/DeterministicWiringModel.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/DeterministicWiringModel.java similarity index 88% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/DeterministicWiringModel.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/DeterministicWiringModel.java index ba3c21151957..b1f0ccdbb815 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/DeterministicWiringModel.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/DeterministicWiringModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.model.internal.deterministic.DeterministicHeartbeatScheduler; -import com.swirlds.common.wiring.model.internal.deterministic.DeterministicTaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder; -import com.swirlds.common.wiring.wires.output.NoOpOutputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import org.hiero.wiring.framework.model.internal.deterministic.DeterministicHeartbeatScheduler; +import org.hiero.wiring.framework.model.internal.deterministic.DeterministicTaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder; +import org.hiero.wiring.framework.wires.output.NoOpOutputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * A deterministic implementation of a wiring model. Suitable for testing, not intended for production use cases. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/StandardWiringModel.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/StandardWiringModel.java similarity index 86% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/StandardWiringModel.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/StandardWiringModel.java index 75087693dff3..b3c3ac3af5b2 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/StandardWiringModel.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/StandardWiringModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,13 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.SEQUENTIAL; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.SEQUENTIAL_THREAD; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.SEQUENTIAL; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.SEQUENTIAL_THREAD; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.model.diagram.HyperlinkBuilder; -import com.swirlds.common.wiring.model.internal.monitor.HealthMonitor; -import com.swirlds.common.wiring.model.internal.standard.HeartbeatScheduler; -import com.swirlds.common.wiring.model.internal.standard.JvmAnchor; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.builders.internal.StandardTaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.internal.SequentialThreadTaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; @@ -39,6 +29,16 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.ForkJoinPool; +import org.hiero.wiring.framework.model.diagram.HyperlinkBuilder; +import org.hiero.wiring.framework.model.internal.monitor.HealthMonitor; +import org.hiero.wiring.framework.model.internal.standard.HeartbeatScheduler; +import org.hiero.wiring.framework.model.internal.standard.JvmAnchor; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.builders.internal.StandardTaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.internal.SequentialThreadTaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * A standard implementation of a wiring model suitable for production use. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/TraceableWiringModel.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/TraceableWiringModel.java similarity index 89% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/TraceableWiringModel.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/TraceableWiringModel.java index 9820f3b7eca4..9f7f5876717c 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/TraceableWiringModel.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/TraceableWiringModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,26 +14,12 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; - -import static com.swirlds.common.wiring.model.internal.analysis.ModelVertexMetaType.SCHEDULER; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; - -import com.swirlds.common.wiring.model.diagram.ModelEdgeSubstitution; -import com.swirlds.common.wiring.model.diagram.ModelGroup; -import com.swirlds.common.wiring.model.diagram.ModelManualLink; -import com.swirlds.common.wiring.model.internal.analysis.CycleFinder; -import com.swirlds.common.wiring.model.internal.analysis.DirectSchedulerChecks; -import com.swirlds.common.wiring.model.internal.analysis.InputWireChecks; -import com.swirlds.common.wiring.model.internal.analysis.InputWireDescriptor; -import com.swirlds.common.wiring.model.internal.analysis.ModelEdge; -import com.swirlds.common.wiring.model.internal.analysis.ModelVertex; -import com.swirlds.common.wiring.model.internal.analysis.StandardVertex; -import com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.SolderType; +package org.hiero.wiring.framework.model; + +import static org.hiero.wiring.framework.model.internal.analysis.ModelVertexMetaType.SCHEDULER; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; + import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; @@ -43,6 +29,20 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import org.hiero.wiring.framework.model.diagram.ModelEdgeSubstitution; +import org.hiero.wiring.framework.model.diagram.ModelGroup; +import org.hiero.wiring.framework.model.diagram.ModelManualLink; +import org.hiero.wiring.framework.model.internal.analysis.CycleFinder; +import org.hiero.wiring.framework.model.internal.analysis.DirectSchedulerChecks; +import org.hiero.wiring.framework.model.internal.analysis.InputWireChecks; +import org.hiero.wiring.framework.model.internal.analysis.InputWireDescriptor; +import org.hiero.wiring.framework.model.internal.analysis.ModelEdge; +import org.hiero.wiring.framework.model.internal.analysis.ModelVertex; +import org.hiero.wiring.framework.model.internal.analysis.StandardVertex; +import org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.SolderType; /** * Common functionality for wiring model implementations. Has methods for registering information about the topology of diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/WiringModel.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/WiringModel.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/WiringModel.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/WiringModel.java index e848c506faa3..cee4a1bf90a6 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/WiringModel.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/WiringModel.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; import com.swirlds.base.state.Startable; import com.swirlds.base.state.Stoppable; -import com.swirlds.common.wiring.model.diagram.ModelEdgeSubstitution; -import com.swirlds.common.wiring.model.diagram.ModelGroup; -import com.swirlds.common.wiring.model.diagram.ModelManualLink; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; import java.util.List; +import org.hiero.wiring.framework.model.diagram.ModelEdgeSubstitution; +import org.hiero.wiring.framework.model.diagram.ModelGroup; +import org.hiero.wiring.framework.model.diagram.ModelManualLink; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * A wiring model is a collection of task schedulers and the wires connecting them. It can be used to analyze the wiring diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/WiringModelBuilder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/WiringModelBuilder.java similarity index 98% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/WiringModelBuilder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/WiringModelBuilder.java index d47dc00955ad..c5e179bcf7ea 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/WiringModelBuilder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/WiringModelBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; import com.swirlds.common.context.PlatformContext; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/HyperlinkBuilder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/HyperlinkBuilder.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/HyperlinkBuilder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/HyperlinkBuilder.java index 20b74254b1d9..fdeb54443e28 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/HyperlinkBuilder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/HyperlinkBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.diagram; +package org.hiero.wiring.framework.model.diagram; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelEdgeSubstitution.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelEdgeSubstitution.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelEdgeSubstitution.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelEdgeSubstitution.java index c6d8c9239217..c0619d12bcfd 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelEdgeSubstitution.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelEdgeSubstitution.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.diagram; +package org.hiero.wiring.framework.model.diagram; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelGroup.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelGroup.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelGroup.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelGroup.java index b51835b17fe8..6f19994a81a3 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelGroup.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.diagram; +package org.hiero.wiring.framework.model.diagram; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Set; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelManualLink.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelManualLink.java similarity index 90% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelManualLink.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelManualLink.java index 0fa081791686..e100f3efbb37 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/diagram/ModelManualLink.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/diagram/ModelManualLink.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.diagram; +package org.hiero.wiring.framework.model.diagram; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/CycleFinder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/CycleFinder.java similarity index 97% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/CycleFinder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/CycleFinder.java index 1c0bcdebf282..4593a89bf6ff 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/CycleFinder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/CycleFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import static com.swirlds.logging.legacy.LogMarker.EXCEPTION; import static com.swirlds.logging.legacy.LogMarker.STARTUP; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/DirectSchedulerChecks.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/DirectSchedulerChecks.java similarity index 97% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/DirectSchedulerChecks.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/DirectSchedulerChecks.java index 781cd84abc49..d1c78547968e 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/DirectSchedulerChecks.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/DirectSchedulerChecks.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import static com.swirlds.logging.legacy.LogMarker.EXCEPTION; import static com.swirlds.logging.legacy.LogMarker.STARTUP; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Collection; import java.util.Deque; @@ -30,6 +29,7 @@ import java.util.Set; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A utility for checking direct scheduler use. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/GroupVertex.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/GroupVertex.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/GroupVertex.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/GroupVertex.java index 173fcdab33a6..e835a9295350 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/GroupVertex.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/GroupVertex.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.GROUP_COLOR; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.TEXT_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.GROUP_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.TEXT_COLOR; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A vertex that represents a nexted group of vertices. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/InputWireChecks.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/InputWireChecks.java similarity index 95% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/InputWireChecks.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/InputWireChecks.java index 940247559a14..533d4e767d81 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/InputWireChecks.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/InputWireChecks.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import static com.swirlds.logging.legacy.LogMarker.EXCEPTION; import static com.swirlds.logging.legacy.LogMarker.STARTUP; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/InputWireDescriptor.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/InputWireDescriptor.java similarity index 90% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/InputWireDescriptor.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/InputWireDescriptor.java index 4a64fbfd5660..aadbf409ab8d 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/InputWireDescriptor.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/InputWireDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/MermaidNameShortener.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/MermaidNameShortener.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/MermaidNameShortener.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/MermaidNameShortener.java index f8ed5122471c..cb649a1ec33b 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/MermaidNameShortener.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/MermaidNameShortener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.HashMap; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/MermaidStyleManager.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/MermaidStyleManager.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/MermaidStyleManager.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/MermaidStyleManager.java index 38d17cdbbd3e..fc89167efddc 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/MermaidStyleManager.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/MermaidStyleManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelEdge.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelEdge.java similarity index 98% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelEdge.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelEdge.java index 98b0b56794d7..f3ac29137965 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelEdge.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelEdge.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; import static com.swirlds.common.utility.NonCryptographicHashing.hash32; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelVertex.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelVertex.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelVertex.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelVertex.java index d062b75365cc..4ae5c3e1f1ae 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelVertex.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelVertex.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Set; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A vertex in a wiring model. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelVertexMetaType.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelVertexMetaType.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelVertexMetaType.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelVertexMetaType.java index 5953daff3cb3..482dca0746cc 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/ModelVertexMetaType.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/ModelVertexMetaType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; /** * The type of a vertex in a wiring flowchart. Although the original graph will be constructed of SCHEDULER vertices diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/StandardVertex.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/StandardVertex.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/StandardVertex.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/StandardVertex.java index 3c022895d931..1aa84fdf35a1 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/StandardVertex.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/StandardVertex.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.DIRECT_SCHEDULER_COLOR; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.GROUP_COLOR; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.SCHEDULER_COLOR; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.SUBSTITUTION_COLOR; -import static com.swirlds.common.wiring.model.internal.analysis.WiringFlowchart.TEXT_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.DIRECT_SCHEDULER_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.GROUP_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.SCHEDULER_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.SUBSTITUTION_COLOR; +import static org.hiero.wiring.framework.model.internal.analysis.WiringFlowchart.TEXT_COLOR; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.HashSet; import java.util.Objects; import java.util.Set; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A standard vertex in a wiring model. Does not contain sub-vertices. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/WiringFlowchart.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/WiringFlowchart.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/WiringFlowchart.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/WiringFlowchart.java index ab622f11c6a7..9782ccb8c116 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/analysis/WiringFlowchart.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/analysis/WiringFlowchart.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,16 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.analysis; +package org.hiero.wiring.framework.model.internal.analysis; -import static com.swirlds.common.wiring.model.internal.analysis.ModelVertexMetaType.SCHEDULER; -import static com.swirlds.common.wiring.model.internal.analysis.ModelVertexMetaType.SUBSTITUTION; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.CONCURRENT; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.SEQUENTIAL; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.SEQUENTIAL_THREAD; +import static org.hiero.wiring.framework.model.internal.analysis.ModelVertexMetaType.SCHEDULER; +import static org.hiero.wiring.framework.model.internal.analysis.ModelVertexMetaType.SUBSTITUTION; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.CONCURRENT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.SEQUENTIAL; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.SEQUENTIAL_THREAD; -import com.swirlds.common.wiring.model.diagram.ModelEdgeSubstitution; -import com.swirlds.common.wiring.model.diagram.ModelGroup; -import com.swirlds.common.wiring.model.diagram.ModelManualLink; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.Collections; @@ -38,6 +34,10 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import org.hiero.wiring.framework.model.diagram.ModelEdgeSubstitution; +import org.hiero.wiring.framework.model.diagram.ModelGroup; +import org.hiero.wiring.framework.model.diagram.ModelManualLink; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A readable wiring flowchart. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicHeartbeatScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicHeartbeatScheduler.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicHeartbeatScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicHeartbeatScheduler.java index 94b80dab0eec..9adc40c25d82 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicHeartbeatScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicHeartbeatScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.deterministic; +package org.hiero.wiring.framework.model.internal.deterministic; import static com.swirlds.common.utility.CompareTo.isGreaterThanOrEqualTo; import com.swirlds.base.time.Time; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.model.internal.standard.AbstractHeartbeatScheduler; -import com.swirlds.common.wiring.model.internal.standard.HeartbeatTask; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; @@ -30,6 +27,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.model.internal.standard.AbstractHeartbeatScheduler; +import org.hiero.wiring.framework.model.internal.standard.HeartbeatTask; /** * A deterministic implementation of a heartbeat scheduler. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicTaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicTaskScheduler.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicTaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicTaskScheduler.java index a4ed064ff775..567e55cc89d5 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicTaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.deterministic; +package org.hiero.wiring.framework.model.internal.deterministic; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Consumer; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A deterministic implementation of a task scheduler. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicTaskSchedulerBuilder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicTaskSchedulerBuilder.java similarity index 83% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicTaskSchedulerBuilder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicTaskSchedulerBuilder.java index 47335b820f58..4044b008a423 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/deterministic/DeterministicTaskSchedulerBuilder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/deterministic/DeterministicTaskSchedulerBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.deterministic; +package org.hiero.wiring.framework.model.internal.deterministic; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.metrics.extensions.FractionalTimer; import com.swirlds.common.metrics.extensions.NoOpFractionalTimer; -import com.swirlds.common.wiring.model.DeterministicWiringModel; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.internal.AbstractTaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.internal.DirectTaskScheduler; -import com.swirlds.common.wiring.schedulers.internal.NoOpTaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.concurrent.ForkJoinPool; import java.util.function.Consumer; +import org.hiero.wiring.framework.model.DeterministicWiringModel; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.internal.AbstractTaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.internal.DirectTaskScheduler; +import org.hiero.wiring.framework.schedulers.internal.NoOpTaskScheduler; /** * Builds schedulers for a {@link DeterministicWiringModel}. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitor.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitor.java similarity index 95% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitor.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitor.java index 26dcd3cd17e1..8b26517831ef 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitor.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.monitor; +package org.hiero.wiring.framework.model.internal.monitor; import static com.swirlds.common.utility.CompareTo.isGreaterThan; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; @@ -29,6 +27,8 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder; /** * Monitors the health of a wiring model. A healthy wiring model is a model without too much work backed up in queues. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorLogger.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorLogger.java similarity index 95% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorLogger.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorLogger.java index 342f9d285ca8..289040df12ae 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorLogger.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorLogger.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.monitor; +package org.hiero.wiring.framework.model.internal.monitor; import static com.swirlds.common.units.TimeUnit.UNIT_NANOSECONDS; import static com.swirlds.logging.legacy.LogMarker.STARTUP; @@ -22,7 +22,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.utility.CompareTo; import com.swirlds.common.utility.throttle.RateLimitedLogger; -import com.swirlds.common.wiring.schedulers.TaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.util.HashMap; @@ -30,6 +29,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.schedulers.TaskScheduler; /** * Encapsulates logging for the wiring health monitor. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorMetrics.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorMetrics.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorMetrics.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorMetrics.java index 5bc6e54a4152..4ae63a863593 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorMetrics.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorMetrics.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.monitor; +package org.hiero.wiring.framework.model.internal.monitor; import static com.swirlds.common.utility.CompareTo.isLessThan; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/AbstractHeartbeatScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/AbstractHeartbeatScheduler.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/AbstractHeartbeatScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/AbstractHeartbeatScheduler.java index 31e6fdfa40c6..25a260b88b84 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/AbstractHeartbeatScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/AbstractHeartbeatScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.standard; +package org.hiero.wiring.framework.model.internal.standard; -import static com.swirlds.common.wiring.model.diagram.HyperlinkBuilder.platformCommonHyperlink; +import static org.hiero.wiring.framework.model.diagram.HyperlinkBuilder.platformCommonHyperlink; import com.swirlds.base.time.Time; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * A scheduler that produces heartbeats at a specified rate. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/HeartbeatScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/HeartbeatScheduler.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/HeartbeatScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/HeartbeatScheduler.java index 89ec0df32a61..378fcdea49f7 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/HeartbeatScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/HeartbeatScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.standard; +package org.hiero.wiring.framework.model.internal.standard; import com.swirlds.base.time.Time; -import com.swirlds.common.wiring.model.StandardWiringModel; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Timer; +import org.hiero.wiring.framework.model.StandardWiringModel; /** * A scheduler that produces heartbeats at a specified rate. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/HeartbeatTask.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/HeartbeatTask.java similarity index 88% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/HeartbeatTask.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/HeartbeatTask.java index 7a6be4f6f69f..3777137e63a3 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/HeartbeatTask.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/HeartbeatTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.standard; +package org.hiero.wiring.framework.model.internal.standard; import com.swirlds.base.time.Time; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; import java.util.Objects; import java.util.TimerTask; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * A task that produces a heartbeat at a specified rate. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/JvmAnchor.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/JvmAnchor.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/JvmAnchor.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/JvmAnchor.java index c4f17a704644..c28cbadc709d 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/model/internal/standard/JvmAnchor.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/model/internal/standard/JvmAnchor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.standard; +package org.hiero.wiring.framework.model.internal.standard; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/TaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/TaskScheduler.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/TaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/TaskScheduler.java index 470968c78389..e5f6519b3cb0 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/TaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/TaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,24 +14,24 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.schedulers.internal.DefaultSquelcher; -import com.swirlds.common.wiring.schedulers.internal.Squelcher; -import com.swirlds.common.wiring.schedulers.internal.ThrowingSquelcher; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.input.TaskSchedulerInput; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Consumer; import java.util.function.Function; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.schedulers.internal.DefaultSquelcher; +import org.hiero.wiring.framework.schedulers.internal.Squelcher; +import org.hiero.wiring.framework.schedulers.internal.ThrowingSquelcher; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.input.TaskSchedulerInput; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Schedules tasks for a component. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerBuilder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerBuilder.java similarity index 97% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerBuilder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerBuilder.java index 4ef2f99dc7d5..48bad3e84565 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerBuilder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.builders; +package org.hiero.wiring.framework.schedulers.builders; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.schedulers.TaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.Thread.UncaughtExceptionHandler; import java.time.Duration; import java.util.concurrent.ForkJoinPool; import java.util.function.ToLongFunction; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.schedulers.TaskScheduler; /** * A builder for {@link TaskScheduler}s. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerConfigOption.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerConfigOption.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerConfigOption.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerConfigOption.java index 722d79fdd5b6..702c2176bb22 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerConfigOption.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerConfigOption.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.builders; +package org.hiero.wiring.framework.schedulers.builders; /** * Various configuration options for a task scheduler. Note that the task scheduler type uses values from diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerConfiguration.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerConfiguration.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerConfiguration.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerConfiguration.java index b92d92069b0c..dfd10c10883d 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerConfiguration.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.builders; +package org.hiero.wiring.framework.schedulers.builders; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfigOption.BUSY_FRACTION_METRIC; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfigOption.FLUSHABLE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfigOption.SQUELCHABLE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfigOption.UNHANDLED_TASK_METRIC; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfigOption.BUSY_FRACTION_METRIC; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfigOption.FLUSHABLE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfigOption.SQUELCHABLE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfigOption.UNHANDLED_TASK_METRIC; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerType.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerType.java similarity index 97% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerType.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerType.java index 34e20ca69ddf..fefb11a70dd1 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/TaskSchedulerType.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/TaskSchedulerType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.builders; +package org.hiero.wiring.framework.schedulers.builders; /** * Various types of task schedulers. Pass one of these types to {@link TaskSchedulerBuilder#withType(TaskSchedulerType)} diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/internal/AbstractTaskSchedulerBuilder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/internal/AbstractTaskSchedulerBuilder.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/internal/AbstractTaskSchedulerBuilder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/internal/AbstractTaskSchedulerBuilder.java index 9e6ff8c217d6..f5ff1ca36494 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/internal/AbstractTaskSchedulerBuilder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/internal/AbstractTaskSchedulerBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,24 +14,14 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.builders.internal; +package org.hiero.wiring.framework.schedulers.builders.internal; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; import static com.swirlds.logging.legacy.LogMarker.EXCEPTION; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; import com.swirlds.common.context.PlatformContext; -import com.swirlds.common.wiring.counters.BackpressureObjectCounter; -import com.swirlds.common.wiring.counters.MultiObjectCounter; -import com.swirlds.common.wiring.counters.NoOpObjectCounter; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.counters.StandardObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.Thread.UncaughtExceptionHandler; @@ -41,6 +31,16 @@ import java.util.function.ToLongFunction; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.counters.BackpressureObjectCounter; +import org.hiero.wiring.framework.counters.MultiObjectCounter; +import org.hiero.wiring.framework.counters.NoOpObjectCounter; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.counters.StandardObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A builder for {@link TaskScheduler}s. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/internal/StandardTaskSchedulerBuilder.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/internal/StandardTaskSchedulerBuilder.java similarity index 88% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/internal/StandardTaskSchedulerBuilder.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/internal/StandardTaskSchedulerBuilder.java index 563964cceb5e..f58bf6c16911 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/builders/internal/StandardTaskSchedulerBuilder.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/builders/internal/StandardTaskSchedulerBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,29 +14,29 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.builders.internal; +package org.hiero.wiring.framework.schedulers.builders.internal; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.metrics.FunctionGauge; import com.swirlds.common.metrics.extensions.FractionalTimer; import com.swirlds.common.metrics.extensions.NoOpFractionalTimer; import com.swirlds.common.metrics.extensions.StandardFractionalTimer; -import com.swirlds.common.wiring.model.StandardWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.schedulers.internal.ConcurrentTaskScheduler; -import com.swirlds.common.wiring.schedulers.internal.DirectTaskScheduler; -import com.swirlds.common.wiring.schedulers.internal.NoOpTaskScheduler; -import com.swirlds.common.wiring.schedulers.internal.SequentialTaskScheduler; -import com.swirlds.common.wiring.schedulers.internal.SequentialThreadTaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.Objects; import java.util.concurrent.ForkJoinPool; import java.util.function.Supplier; +import org.hiero.wiring.framework.model.StandardWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.schedulers.internal.ConcurrentTaskScheduler; +import org.hiero.wiring.framework.schedulers.internal.DirectTaskScheduler; +import org.hiero.wiring.framework.schedulers.internal.NoOpTaskScheduler; +import org.hiero.wiring.framework.schedulers.internal.SequentialTaskScheduler; +import org.hiero.wiring.framework.schedulers.internal.SequentialThreadTaskScheduler; /** * A builder for {@link TaskScheduler}s. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ConcurrentTask.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ConcurrentTask.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ConcurrentTask.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ConcurrentTask.java index fea8b381e6dd..6cc66afcd2b1 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ConcurrentTask.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ConcurrentTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.tasks.AbstractTask; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.ForkJoinPool; import java.util.function.Consumer; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.tasks.AbstractTask; /** * A task in a {@link ConcurrentTaskScheduler}. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ConcurrentTaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ConcurrentTaskScheduler.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ConcurrentTaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ConcurrentTaskScheduler.java index c1d268ab6f4b..423faaf625fa 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ConcurrentTaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ConcurrentTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.Thread.UncaughtExceptionHandler; import java.util.Objects; import java.util.concurrent.ForkJoinPool; import java.util.function.Consumer; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A {@link TaskScheduler} that permits parallel execution of tasks. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/DefaultSquelcher.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/DefaultSquelcher.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/DefaultSquelcher.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/DefaultSquelcher.java index 66ac98bbd9d1..7c1512d57029 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/DefaultSquelcher.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/DefaultSquelcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/DirectTaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/DirectTaskScheduler.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/DirectTaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/DirectTaskScheduler.java index dee47c7650c7..08e991d2acc1 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/DirectTaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/DirectTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; import com.swirlds.common.metrics.extensions.FractionalTimer; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.Thread.UncaughtExceptionHandler; import java.util.Objects; import java.util.function.Consumer; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A scheduler that performs work immediately on the caller's thread. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/NoOpTaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/NoOpTaskScheduler.java similarity index 85% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/NoOpTaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/NoOpTaskScheduler.java index c15530abb65c..3b0768a62aa4 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/NoOpTaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/NoOpTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.NoOpInputWire; -import com.swirlds.common.wiring.wires.output.NoOpOutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Consumer; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.NoOpInputWire; +import org.hiero.wiring.framework.wires.output.NoOpOutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * A no-op task scheduler that does nothing. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialTask.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialTask.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialTask.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialTask.java index 760e28b337d8..0b7facb31ae4 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialTask.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; import com.swirlds.common.metrics.extensions.FractionalTimer; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.tasks.AbstractTask; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.Thread.UncaughtExceptionHandler; import java.util.concurrent.ForkJoinPool; import java.util.function.Consumer; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.tasks.AbstractTask; /** * A task in a {@link SequentialTaskScheduler}. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialTaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialTaskScheduler.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialTaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialTaskScheduler.java index fe83f2366358..4698a5efdb22 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialTaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; import com.swirlds.common.metrics.extensions.FractionalTimer; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.Thread.UncaughtExceptionHandler; import java.util.Objects; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A {@link TaskScheduler} that guarantees that tasks are executed sequentially in the order they are received. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialThreadTask.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialThreadTask.java similarity index 90% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialThreadTask.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialThreadTask.java index 8a9b2f160897..069d14baa9ef 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialThreadTask.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialThreadTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Consumer; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialThreadTaskScheduler.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialThreadTaskScheduler.java similarity index 95% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialThreadTaskScheduler.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialThreadTaskScheduler.java index f658c1204c4b..524e2affe39c 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/SequentialThreadTaskScheduler.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/SequentialThreadTaskScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; import com.swirlds.base.state.Startable; import com.swirlds.base.state.Stoppable; import com.swirlds.common.metrics.extensions.FractionalTimer; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.lang.Thread.UncaughtExceptionHandler; import java.util.ArrayList; @@ -33,6 +29,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.ToLongFunction; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * A scheduler that performs work sequentially on a dedicated thread. This class has very similar semantics to diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/Squelcher.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/Squelcher.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/Squelcher.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/Squelcher.java index 6ee0affb07b8..05a01f480524 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/Squelcher.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/Squelcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; /** * Manages whether or not tasks scheduled by a given task scheduler should be squelched. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ThrowingSquelcher.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ThrowingSquelcher.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ThrowingSquelcher.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ThrowingSquelcher.java index ada8d41b4754..2e54381322db 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/schedulers/internal/ThrowingSquelcher.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/schedulers/internal/ThrowingSquelcher.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers.internal; +package org.hiero.wiring.framework.schedulers.internal; /** * A squelcher object that does not support squelching. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/tasks/AbstractTask.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/tasks/AbstractTask.java similarity index 96% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/tasks/AbstractTask.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/tasks/AbstractTask.java index cba3654d27de..82e7527712d8 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/tasks/AbstractTask.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/tasks/AbstractTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.tasks; +package org.hiero.wiring.framework.tasks; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.ForkJoinPool; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/AdvancedTransformation.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/AdvancedTransformation.java similarity index 90% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/AdvancedTransformation.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/AdvancedTransformation.java index 1c8d5c21a312..165d6873083e 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/AdvancedTransformation.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/AdvancedTransformation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,15 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * Executes a transformation for an advanced transformer as created by - * {@link com.swirlds.common.wiring.wires.output.OutputWire#buildAdvancedTransformer(AdvancedTransformation)}. + * {@link OutputWire#buildAdvancedTransformer(AdvancedTransformation)}. * * @param the original wire output type * @param the output type of the transformer diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/RoutableData.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/RoutableData.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/RoutableData.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/RoutableData.java index deb9205ab3e8..a80a7b292da1 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/RoutableData.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/RoutableData.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireFilter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireFilter.java similarity index 89% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireFilter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireFilter.java index d1c1f8d0c2e8..e925153c38f1 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireFilter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireFilter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Predicate; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * Filters out data, allowing some objects to pass and blocking others. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireListSplitter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireListSplitter.java similarity index 81% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireListSplitter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireListSplitter.java index ef87407a8a9e..98612ce4be9e 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireListSplitter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireListSplitter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Transforms a list of items to a sequence of individual items. Expects that there will not be any null values in the diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireRouter.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireRouter.java similarity index 87% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireRouter.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireRouter.java index 9b186386687a..da2ad7c5c5d3 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireRouter.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireRouter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; /** * Create a wire router. A wire router takes a single input and splits data into multiple outputs with different diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireTransformer.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireTransformer.java similarity index 89% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireTransformer.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireTransformer.java index 4bd174a722d6..0da8bb7f7809 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/transformers/WireTransformer.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/transformers/WireTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Function; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * Transforms data on a wire from one type to another. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/SolderType.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/SolderType.java similarity index 89% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/SolderType.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/SolderType.java index e8de84ba814f..9bc14b30c531 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/SolderType.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/SolderType.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires; +package org.hiero.wiring.framework.wires; -import com.swirlds.common.wiring.wires.input.InputWire; +import org.hiero.wiring.framework.wires.input.InputWire; /** * The type of solder connection between an output wire and an input wire. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/Bindable.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/Bindable.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/Bindable.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/Bindable.java index ff4acb48cd7a..54045c83efff 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/Bindable.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/Bindable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.input; +package org.hiero.wiring.framework.wires.input; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Consumer; diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/BindableInputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/BindableInputWire.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/BindableInputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/BindableInputWire.java index 8cbf47f9f76d..e0e703b3c418 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/BindableInputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/BindableInputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.input; +package org.hiero.wiring.framework.wires.input; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; /** * An input wire that can be bound to an implementation. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/InputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/InputWire.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/InputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/InputWire.java index 5a0701b38f69..ca80cc36e6b9 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/InputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/InputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.input; +package org.hiero.wiring.framework.wires.input; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Objects; import java.util.function.Consumer; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; /** * An object that can insert work to be handled by a {@link TaskScheduler}. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/NoOpInputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/NoOpInputWire.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/NoOpInputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/NoOpInputWire.java index 3f841ba2623f..f6eb8810d9fc 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/NoOpInputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/NoOpInputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.input; +package org.hiero.wiring.framework.wires.input; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Consumer; import java.util.function.Function; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; /** * An input wire that doesn't actually do anything. When asked to bind a handler, it does nothing. When asked to insert diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/TaskSchedulerInput.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/TaskSchedulerInput.java similarity index 94% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/TaskSchedulerInput.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/TaskSchedulerInput.java index f45af508d8cb..ee3ffe36f125 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/input/TaskSchedulerInput.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/input/TaskSchedulerInput.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.input; +package org.hiero.wiring.framework.wires.input; -import com.swirlds.common.wiring.schedulers.TaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Consumer; +import org.hiero.wiring.framework.schedulers.TaskScheduler; /** * An object that knows how to add data to a {@link TaskScheduler} for processing, and how to forward data to a task diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/NoOpOutputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/NoOpOutputWire.java similarity index 90% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/NoOpOutputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/NoOpOutputWire.java index 193c54c2dae5..c90f00cee8f0 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/NoOpOutputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/NoOpOutputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.output; +package org.hiero.wiring.framework.wires.output; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.transformers.AdvancedTransformation; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.InputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.transformers.AdvancedTransformation; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.InputWire; /** * An output wire that doesn't actually do anything. When asked to solder to another wire, it does nothing. When asked diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/OutputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/OutputWire.java similarity index 92% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/OutputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/OutputWire.java index 00b540dbaf22..887f25fcdc81 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/OutputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/OutputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.output; +package org.hiero.wiring.framework.wires.output; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.transformers.AdvancedTransformation; -import com.swirlds.common.wiring.transformers.WireFilter; -import com.swirlds.common.wiring.transformers.WireListSplitter; -import com.swirlds.common.wiring.transformers.WireTransformer; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.internal.TransformingOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; import java.util.Objects; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.transformers.AdvancedTransformation; +import org.hiero.wiring.framework.transformers.WireFilter; +import org.hiero.wiring.framework.transformers.WireListSplitter; +import org.hiero.wiring.framework.transformers.WireTransformer; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.internal.TransformingOutputWire; /** * Describes the output of a task scheduler. Can be soldered to wire inputs or lambdas. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/StandardOutputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/StandardOutputWire.java similarity index 91% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/StandardOutputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/StandardOutputWire.java index f90d74c3ec5e..1415bdb9fa5b 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/StandardOutputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/StandardOutputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,10 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.output; +package org.hiero.wiring.framework.wires.output; import static com.swirlds.logging.legacy.LogMarker.EXCEPTION; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.wires.output.internal.ForwardingOutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; @@ -27,6 +25,8 @@ import java.util.function.Consumer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.wires.output.internal.ForwardingOutputWire; /** * An output wire that will take data and forward it to its outputs. Output type is the same as the input type. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/internal/ForwardingOutputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/internal/ForwardingOutputWire.java similarity index 87% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/internal/ForwardingOutputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/internal/ForwardingOutputWire.java index 87373447a789..5d7a677f5b50 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/internal/ForwardingOutputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/internal/ForwardingOutputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.output.internal; +package org.hiero.wiring.framework.wires.output.internal; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * An output wire that will take data and forward it to its outputs. diff --git a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/internal/TransformingOutputWire.java b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/internal/TransformingOutputWire.java similarity index 93% rename from platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/internal/TransformingOutputWire.java rename to platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/internal/TransformingOutputWire.java index 4006facc99a4..6fe70d952a78 100644 --- a/platform-sdk/swirlds-common/src/main/java/com/swirlds/common/wiring/wires/output/internal/TransformingOutputWire.java +++ b/platform-sdk/wiring-framework/src/main/java/org/hiero/wiring/framework/wires/output/internal/TransformingOutputWire.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,10 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires.output.internal; +package org.hiero.wiring.framework.wires.output.internal; import static com.swirlds.logging.legacy.LogMarker.EXCEPTION; -import com.swirlds.common.wiring.model.TraceableWiringModel; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.util.ArrayList; @@ -31,6 +27,10 @@ import java.util.function.Function; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hiero.wiring.framework.model.TraceableWiringModel; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; /** * An output wire that transforms data that flows across it. For advanced use cases where diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/TestWiringModelBuilder.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/TestWiringModelBuilder.java similarity index 86% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/TestWiringModelBuilder.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/TestWiringModelBuilder.java index 0887c36e477e..35e203b7399b 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/TestWiringModelBuilder.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/TestWiringModelBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.swirlds.common; +package org.hiero.wiring.framework; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; import edu.umd.cs.findbugs.annotations.NonNull; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; /** * A simple version of a wiring model for scenarios where the wiring model is not needed. diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmark.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmark.java similarity index 90% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmark.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmark.java index 1c44c6d7586b..9a9ea28394a7 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmark.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmark.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.benchmark; +package org.hiero.wiring.framework.benchmark; import static java.util.concurrent.ForkJoinPool.defaultForkJoinWorkerThreadFactory; import static java.util.concurrent.TimeUnit.SECONDS; @@ -22,15 +22,15 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.counters.BackpressureObjectCounter; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; import java.time.Duration; import java.util.concurrent.ForkJoinPool; +import org.hiero.wiring.framework.counters.BackpressureObjectCounter; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; class WiringBenchmark { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEvent.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEvent.java similarity index 91% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEvent.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEvent.java index dcbbb9d1cbde..31f4ea2ee758 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEvent.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.benchmark; +package org.hiero.wiring.framework.benchmark; public final class WiringBenchmarkEvent { private long number = -1; // We'll let the orphan buffer assign this, although I think consensus actually does diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEventPool.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEventPool.java similarity index 92% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEventPool.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEventPool.java index c3096dbb477a..4f1cc250c7d6 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEventPool.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEventPool.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.benchmark; +package org.hiero.wiring.framework.benchmark; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.concurrent.BlockingQueue; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEventVerifier.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEventVerifier.java similarity index 93% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEventVerifier.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEventVerifier.java index 193a5274b799..4038add9929c 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkEventVerifier.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkEventVerifier.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.benchmark; +package org.hiero.wiring.framework.benchmark; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Function; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkGossip.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkGossip.java similarity index 95% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkGossip.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkGossip.java index 58d8d2222e5a..0bbd650c894b 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkGossip.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkGossip.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.benchmark; +package org.hiero.wiring.framework.benchmark; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkTopologicalEventSorter.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkTopologicalEventSorter.java similarity index 94% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkTopologicalEventSorter.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkTopologicalEventSorter.java index ec6da1459c27..4d8edb1143ac 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/benchmark/WiringBenchmarkTopologicalEventSorter.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/benchmark/WiringBenchmarkTopologicalEventSorter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.benchmark; +package org.hiero.wiring.framework.benchmark; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.function.Function; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/builders/TaskSchedulerConfigurationTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/builders/TaskSchedulerConfigurationTests.java similarity index 96% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/builders/TaskSchedulerConfigurationTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/builders/TaskSchedulerConfigurationTests.java index 5ed5da35fca5..c63dc999fbf5 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/builders/TaskSchedulerConfigurationTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/builders/TaskSchedulerConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.swirlds.common.wiring.builders; +package org.hiero.wiring.framework.builders; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; import java.util.Random; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; import org.junit.jupiter.api.Test; class TaskSchedulerConfigurationTests { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/ComponentWiringRouterTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/ComponentWiringRouterTests.java similarity index 96% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/ComponentWiringRouterTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/ComponentWiringRouterTests.java index 921f6aacc6d9..7e2daf4edc9e 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/ComponentWiringRouterTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/ComponentWiringRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component; +package org.hiero.wiring.framework.component; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration.DIRECT_CONFIGURATION; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration.DIRECT_CONFIGURATION; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.transformers.RoutableData; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.transformers.RoutableData; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; class ComponentWiringRouterTests { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/ComponentWiringTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/ComponentWiringTests.java similarity index 98% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/ComponentWiringTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/ComponentWiringTests.java index 08cf47fc904d..b6f5fcc1fecc 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/ComponentWiringTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/ComponentWiringTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component; +package org.hiero.wiring.framework.component; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; @@ -22,16 +22,16 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerConfiguration; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerConfiguration; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/WiringComponentPerformanceTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/WiringComponentPerformanceTests.java similarity index 90% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/WiringComponentPerformanceTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/WiringComponentPerformanceTests.java index d0a40badda9f..4edff7291978 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/component/WiringComponentPerformanceTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/component/WiringComponentPerformanceTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.swirlds.common.wiring.component; +package org.hiero.wiring.framework.component; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/BackpressureObjectCounterTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/BackpressureObjectCounterTests.java similarity index 99% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/BackpressureObjectCounterTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/BackpressureObjectCounterTests.java index e1bbee44c45d..63b4b52a1ffe 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/BackpressureObjectCounterTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/BackpressureObjectCounterTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyTrue; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/MultiObjectCounterTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/MultiObjectCounterTests.java similarity index 98% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/MultiObjectCounterTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/MultiObjectCounterTests.java index 94cfa6563517..78e518657a06 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/MultiObjectCounterTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/MultiObjectCounterTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyTrue; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/NoOpObjectCounterTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/NoOpObjectCounterTests.java similarity index 92% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/NoOpObjectCounterTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/NoOpObjectCounterTests.java index 1a6107768f17..fb580471808d 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/NoOpObjectCounterTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/NoOpObjectCounterTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/StandardObjectCounterTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/StandardObjectCounterTests.java similarity index 97% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/StandardObjectCounterTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/StandardObjectCounterTests.java index e2d51b294ade..91d99833247b 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/counters/StandardObjectCounterTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/counters/StandardObjectCounterTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.counters; +package org.hiero.wiring.framework.counters; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyTrue; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/DeterministicHeartbeatSchedulerTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/DeterministicHeartbeatSchedulerTests.java similarity index 94% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/DeterministicHeartbeatSchedulerTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/DeterministicHeartbeatSchedulerTests.java index 952ba5af0779..32abfe613ab9 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/DeterministicHeartbeatSchedulerTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/DeterministicHeartbeatSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; import static org.junit.jupiter.api.Assertions.assertEquals; import com.swirlds.base.test.fixtures.time.FakeTime; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; import java.time.Duration; import java.time.Instant; import java.util.concurrent.atomic.AtomicLong; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; import org.junit.jupiter.api.Test; public class DeterministicHeartbeatSchedulerTests { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/DeterministicModelTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/DeterministicModelTests.java similarity index 95% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/DeterministicModelTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/DeterministicModelTests.java index 1d41eafdcbd9..807083b4ae78 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/DeterministicModelTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/DeterministicModelTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; import static com.swirlds.common.test.fixtures.RandomUtils.randomInstant; import static com.swirlds.common.utility.NonCryptographicHashing.hash32; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.CONCURRENT; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.SEQUENTIAL; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.SEQUENTIAL_THREAD; import static java.util.concurrent.TimeUnit.MICROSECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.assertj.core.api.Fail.fail; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.CONCURRENT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.DIRECT_THREADSAFE; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.SEQUENTIAL; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.SEQUENTIAL_THREAD; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -37,10 +37,6 @@ import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; import com.swirlds.common.utility.NonCryptographicHashing; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; @@ -50,6 +46,10 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.function.BooleanSupplier; import java.util.function.Function; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/ModelTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/ModelTests.java similarity index 99% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/ModelTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/ModelTests.java index fca40ced6355..ce69e6e6680d 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/ModelTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/ModelTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model; +package org.hiero.wiring.framework.model; import static com.swirlds.common.threading.framework.internal.AbstractQueueThreadConfiguration.UNLIMITED_CAPACITY; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,14 +22,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.List; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; class ModelTests { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorTests.java similarity index 98% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorTests.java index 111380dfc6d6..365e9922de35 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/model/internal/monitor/HealthMonitorTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/model/internal/monitor/HealthMonitorTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.model.internal.monitor; +package org.hiero.wiring.framework.model.internal.monitor; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -26,13 +26,13 @@ import com.swirlds.common.test.fixtures.Randotron; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; import com.swirlds.common.utility.CompareTo; -import com.swirlds.common.wiring.schedulers.TaskScheduler; import edu.umd.cs.findbugs.annotations.NonNull; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import org.hiero.wiring.framework.schedulers.TaskScheduler; import org.junit.jupiter.api.Test; class HealthMonitorTests { diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/ConcurrentTaskSchedulerTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/ConcurrentTaskSchedulerTests.java similarity index 94% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/ConcurrentTaskSchedulerTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/ConcurrentTaskSchedulerTests.java index 81a01a721346..2cbc4ca4ff26 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/ConcurrentTaskSchedulerTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/ConcurrentTaskSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,15 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyTrue; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; import static java.util.concurrent.TimeUnit.MICROSECONDS; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.swirlds.common.TestWiringModelBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Duration; import java.util.Random; @@ -35,6 +31,10 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; +import org.hiero.wiring.framework.TestWiringModelBuilder; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/DefaultSquelcherTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/DefaultSquelcherTests.java similarity index 87% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/DefaultSquelcherTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/DefaultSquelcherTests.java index b51c77236018..b9bae1414bdf 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/DefaultSquelcherTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/DefaultSquelcherTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.swirlds.common.wiring.schedulers.internal.DefaultSquelcher; -import com.swirlds.common.wiring.schedulers.internal.Squelcher; +import org.hiero.wiring.framework.schedulers.internal.DefaultSquelcher; +import org.hiero.wiring.framework.schedulers.internal.Squelcher; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/DirectTaskSchedulerTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/DirectTaskSchedulerTests.java similarity index 93% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/DirectTaskSchedulerTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/DirectTaskSchedulerTests.java index 40ce06942585..15f9910311e9 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/DirectTaskSchedulerTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/DirectTaskSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; import static com.swirlds.common.utility.NonCryptographicHashing.hash32; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.swirlds.common.TestWiringModelBuilder; -import com.swirlds.common.wiring.counters.StandardObjectCounter; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import java.lang.Thread.UncaughtExceptionHandler; import java.time.Duration; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; +import org.hiero.wiring.framework.TestWiringModelBuilder; +import org.hiero.wiring.framework.counters.StandardObjectCounter; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/HeartbeatSchedulerTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/HeartbeatSchedulerTests.java similarity index 95% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/HeartbeatSchedulerTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/HeartbeatSchedulerTests.java index 29ce20f57a6e..2b5e1030bd34 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/HeartbeatSchedulerTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/HeartbeatSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; import static java.util.concurrent.TimeUnit.SECONDS; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,12 +23,12 @@ import com.swirlds.base.test.fixtures.time.FakeTime; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.wires.input.BindableInputWire; import java.time.Duration; import java.time.Instant; import java.util.concurrent.atomic.AtomicLong; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.wires.input.BindableInputWire; import org.junit.jupiter.api.Test; class HeartbeatSchedulerTests { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/schedulers/NoOpTaskSchedulerTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/NoOpTaskSchedulerTests.java similarity index 88% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/schedulers/NoOpTaskSchedulerTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/NoOpTaskSchedulerTests.java index bb65e1144b4a..c73f14bff3a2 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/schedulers/NoOpTaskSchedulerTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/NoOpTaskSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType.NO_OP; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType.NO_OP; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; class NoOpTaskSchedulerTests { diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/SequentialTaskSchedulerTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/SequentialTaskSchedulerTests.java similarity index 99% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/SequentialTaskSchedulerTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/SequentialTaskSchedulerTests.java index 2cbc30150b15..24a370bbecaa 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/SequentialTaskSchedulerTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/SequentialTaskSchedulerTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyTrue; @@ -22,27 +22,18 @@ import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; import static com.swirlds.common.threading.manager.AdHocThreadManager.getStaticThreadManager; import static com.swirlds.common.utility.NonCryptographicHashing.hash32; -import static com.swirlds.common.wiring.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.NANOSECONDS; +import static org.hiero.wiring.framework.schedulers.builders.TaskSchedulerBuilder.UNLIMITED_CAPACITY; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.swirlds.common.TestWiringModelBuilder; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.RandomUtils; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; import com.swirlds.common.threading.framework.config.ThreadConfiguration; -import com.swirlds.common.wiring.counters.BackpressureObjectCounter; -import com.swirlds.common.wiring.counters.ObjectCounter; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.StandardOutputWire; import java.time.Duration; import java.util.HashSet; import java.util.Random; @@ -54,6 +45,15 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; +import org.hiero.wiring.framework.TestWiringModelBuilder; +import org.hiero.wiring.framework.counters.BackpressureObjectCounter; +import org.hiero.wiring.framework.counters.ObjectCounter; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.StandardOutputWire; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/ThrowingSquelcherTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/ThrowingSquelcherTests.java similarity index 84% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/ThrowingSquelcherTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/ThrowingSquelcherTests.java index 7185ef8f527a..e7379db7f9c2 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/schedulers/ThrowingSquelcherTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/schedulers/ThrowingSquelcherTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.swirlds.common.wiring.schedulers; +package org.hiero.wiring.framework.schedulers; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.swirlds.common.wiring.schedulers.internal.Squelcher; -import com.swirlds.common.wiring.schedulers.internal.ThrowingSquelcher; +import org.hiero.wiring.framework.schedulers.internal.Squelcher; +import org.hiero.wiring.framework.schedulers.internal.ThrowingSquelcher; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/transformers/TaskSchedulerTransformersTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/transformers/TaskSchedulerTransformersTests.java similarity index 97% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/transformers/TaskSchedulerTransformersTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/transformers/TaskSchedulerTransformersTests.java index f8a970c7e77e..f06e4dd7ca37 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/transformers/TaskSchedulerTransformersTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/transformers/TaskSchedulerTransformersTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023-2024 Hedera Hashgraph, LLC + * Copyright (C) 2023-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyEquals; import static com.swirlds.common.test.fixtures.AssertionUtils.assertEventuallyTrue; @@ -22,12 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.swirlds.common.TestWiringModelBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.wires.SolderType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import edu.umd.cs.findbugs.annotations.Nullable; import java.lang.Thread.UncaughtExceptionHandler; @@ -39,6 +33,12 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; +import org.hiero.wiring.framework.TestWiringModelBuilder; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.wires.SolderType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; class TaskSchedulerTransformersTests { diff --git a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/transformers/WireRouterTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/transformers/WireRouterTests.java similarity index 92% rename from platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/transformers/WireRouterTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/transformers/WireRouterTests.java index 2d12683a62b6..49aa5a24eafb 100644 --- a/platform-sdk/swirlds-common/src/test/java/com/swirlds/common/wiring/transformers/WireRouterTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/transformers/WireRouterTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package com.swirlds.common.wiring.transformers; +package org.hiero.wiring.framework.transformers; import static com.swirlds.common.test.fixtures.RandomUtils.getRandomPrintSeed; import static org.junit.jupiter.api.Assertions.assertEquals; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.wires.output.OutputWire; import edu.umd.cs.findbugs.annotations.NonNull; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.wires.output.OutputWire; import org.junit.jupiter.api.Test; class WireRouterTests { diff --git a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/wires/OutputWireTests.java b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/wires/OutputWireTests.java similarity index 91% rename from platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/wires/OutputWireTests.java rename to platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/wires/OutputWireTests.java index cacf3edcfc7d..5fb3e2efab1d 100644 --- a/platform-sdk/swirlds-common/src/timingSensitive/java/com/swirlds/common/wiring/wires/OutputWireTests.java +++ b/platform-sdk/wiring-framework/src/test/java/org/hiero/wiring/framework/wires/OutputWireTests.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Hedera Hashgraph, LLC + * Copyright (C) 2024-2025 Hedera Hashgraph, LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,21 +14,21 @@ * limitations under the License. */ -package com.swirlds.common.wiring.wires; +package org.hiero.wiring.framework.wires; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import com.swirlds.common.context.PlatformContext; import com.swirlds.common.test.fixtures.platform.TestPlatformContextBuilder; -import com.swirlds.common.wiring.model.WiringModel; -import com.swirlds.common.wiring.model.WiringModelBuilder; -import com.swirlds.common.wiring.schedulers.TaskScheduler; -import com.swirlds.common.wiring.schedulers.builders.TaskSchedulerType; -import com.swirlds.common.wiring.wires.input.BindableInputWire; -import com.swirlds.common.wiring.wires.input.InputWire; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import org.hiero.wiring.framework.model.WiringModel; +import org.hiero.wiring.framework.model.WiringModelBuilder; +import org.hiero.wiring.framework.schedulers.TaskScheduler; +import org.hiero.wiring.framework.schedulers.builders.TaskSchedulerType; +import org.hiero.wiring.framework.wires.input.BindableInputWire; +import org.hiero.wiring.framework.wires.input.InputWire; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource;