Skip to content

Commit 26de77b

Browse files
authored
feat: platform component builder (#12499)
Signed-off-by: Cody Littley <[email protected]>
1 parent 7308e1b commit 26de77b

File tree

16 files changed

+577
-198
lines changed

16 files changed

+577
-198
lines changed

hedera-node/hedera-app/src/main/java/com/hedera/node/app/ServicesMain.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
import static com.swirlds.common.io.utility.FileUtils.getAbsolutePath;
2020
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
21-
import static com.swirlds.platform.PlatformBuilder.DEFAULT_SETTINGS_FILE_NAME;
22-
import static com.swirlds.platform.PlatformBuilder.buildPlatformContext;
21+
import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_CONFIG_FILE_NAME;
22+
import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_SETTINGS_FILE_NAME;
23+
import static com.swirlds.platform.builder.PlatformBuilder.buildPlatformContext;
2324
import static com.swirlds.platform.system.SystemExitCode.CONFIGURATION_ERROR;
2425
import static com.swirlds.platform.system.SystemExitCode.NODE_ADDRESS_MISMATCH;
2526
import static com.swirlds.platform.system.SystemExitUtils.exitSystem;
@@ -37,7 +38,7 @@
3738
import com.swirlds.config.extensions.sources.SystemEnvironmentConfigSource;
3839
import com.swirlds.config.extensions.sources.SystemPropertiesConfigSource;
3940
import com.swirlds.platform.CommandLineArgs;
40-
import com.swirlds.platform.PlatformBuilder;
41+
import com.swirlds.platform.builder.PlatformBuilder;
4142
import com.swirlds.platform.config.legacy.ConfigurationException;
4243
import com.swirlds.platform.config.legacy.LegacyConfigProperties;
4344
import com.swirlds.platform.config.legacy.LegacyConfigPropertiesLoader;
@@ -128,7 +129,7 @@ public static void main(final String... args) throws Exception {
128129

129130
// Determine which node to run locally
130131
// Load config.txt address book file and parse address book
131-
final AddressBook addressBook = loadAddressBook(PlatformBuilder.DEFAULT_CONFIG_FILE_NAME);
132+
final AddressBook addressBook = loadAddressBook(DEFAULT_CONFIG_FILE_NAME);
132133
// parse command line arguments
133134
final CommandLineArgs commandLineArgs = CommandLineArgs.parse(args);
134135

@@ -160,7 +161,7 @@ public static void main(final String... args) throws Exception {
160161
buildPlatformContext(config, getAbsolutePath(DEFAULT_SETTINGS_FILE_NAME), selfId);
161162

162163
final PlatformBuilder builder =
163-
new PlatformBuilder(Hedera.APP_NAME, Hedera.SWIRLD_NAME, version, hedera::newState, selfId);
164+
PlatformBuilder.create(Hedera.APP_NAME, Hedera.SWIRLD_NAME, version, hedera::newState, selfId);
164165

165166
builder.withPreviousSoftwareVersionClassId(0x6f2b1bc2df8cbd0bL /* SerializableSemVers.CLASS_ID */);
166167
builder.withPlatformContext(platformContext);

hedera-node/test-clients/src/main/java/com/hedera/services/bdd/junit/InProcessHapiTestNode.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.hedera.services.bdd.junit;
1818

19-
import static com.swirlds.platform.PlatformBuilder.DEFAULT_CONFIG_FILE_NAME;
20-
import static com.swirlds.platform.PlatformBuilder.DEFAULT_SETTINGS_FILE_NAME;
19+
import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_CONFIG_FILE_NAME;
20+
import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_SETTINGS_FILE_NAME;
2121
import static com.swirlds.platform.system.status.PlatformStatus.BEHIND;
2222
import static com.swirlds.platform.system.status.PlatformStatus.FREEZE_COMPLETE;
2323
import static com.swirlds.platform.system.status.PlatformStatus.RECONNECT_COMPLETE;
@@ -31,7 +31,7 @@
3131
import com.swirlds.common.constructable.ConstructableRegistry;
3232
import com.swirlds.common.platform.NodeId;
3333
import com.swirlds.config.api.ConfigurationBuilder;
34-
import com.swirlds.platform.PlatformBuilder;
34+
import com.swirlds.platform.builder.PlatformBuilder;
3535
import com.swirlds.platform.system.Platform;
3636
import com.swirlds.platform.system.status.PlatformStatus;
3737
import com.swirlds.platform.util.BootstrapUtils;
@@ -407,7 +407,7 @@ public void run() {
407407

408408
hedera = new Hedera(cr);
409409

410-
final PlatformBuilder builder = new PlatformBuilder(
410+
final PlatformBuilder builder = PlatformBuilder.create(
411411
Hedera.APP_NAME,
412412
Hedera.SWIRLD_NAME,
413413
hedera.getSoftwareVersion(),

platform-sdk/swirlds-platform-core/src/main/java/com/swirlds/platform/Browser.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import static com.swirlds.common.io.utility.FileUtils.getAbsolutePath;
2020
import static com.swirlds.common.threading.manager.AdHocThreadManager.getStaticThreadManager;
2121
import static com.swirlds.logging.legacy.LogMarker.EXCEPTION;
22-
import static com.swirlds.platform.PlatformBuilder.DEFAULT_CONFIG_FILE_NAME;
23-
import static com.swirlds.platform.PlatformBuilder.DEFAULT_SETTINGS_FILE_NAME;
24-
import static com.swirlds.platform.StaticPlatformBuilder.LOG4J_FILE_NAME;
22+
import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_CONFIG_FILE_NAME;
23+
import static com.swirlds.platform.builder.PlatformBuildConstants.DEFAULT_SETTINGS_FILE_NAME;
24+
import static com.swirlds.platform.builder.PlatformBuildConstants.LOG4J_FILE_NAME;
2525
import static com.swirlds.platform.gui.internal.BrowserWindowManager.addPlatforms;
2626
import static com.swirlds.platform.gui.internal.BrowserWindowManager.getStateHierarchy;
2727
import static com.swirlds.platform.gui.internal.BrowserWindowManager.moveBrowserWindowToFront;
@@ -40,6 +40,7 @@
4040
import com.swirlds.config.api.Configuration;
4141
import com.swirlds.config.api.ConfigurationBuilder;
4242
import com.swirlds.metrics.api.Metrics;
43+
import com.swirlds.platform.builder.PlatformBuilder;
4344
import com.swirlds.platform.config.PathsConfig;
4445
import com.swirlds.platform.crypto.CryptoConstants;
4546
import com.swirlds.platform.gui.GuiEventStorage;
@@ -206,7 +207,7 @@ private static void launchUnhandled(@NonNull final CommandLineArgs commandLineAr
206207
configBuilder.withConfigDataType(configType);
207208
}
208209

209-
final PlatformBuilder builder = new PlatformBuilder(
210+
final PlatformBuilder builder = PlatformBuilder.create(
210211
appMain.getClass().getName(),
211212
appDefinition.getSwirldName(),
212213
appMain.getSoftwareVersion(),

0 commit comments

Comments
 (0)