diff --git a/build-logic/spotbugs-exclude-test.xml b/build-logic/spotbugs-exclude-test.xml index 9300339854d..69bd45859b2 100644 --- a/build-logic/spotbugs-exclude-test.xml +++ b/build-logic/spotbugs-exclude-test.xml @@ -205,12 +205,12 @@ - + - + diff --git a/build-logic/spotbugs-exclude.xml b/build-logic/spotbugs-exclude.xml index 8dedf42f57e..9c47fb0d08a 100644 --- a/build-logic/spotbugs-exclude.xml +++ b/build-logic/spotbugs-exclude.xml @@ -1450,55 +1450,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/build.gradle.kts b/build.gradle.kts index 45f77e0ff68..34e4e7d7b55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -304,6 +304,35 @@ val rootSelectiveLeafPruneTaskNames = sharedSelectiveLeafPruneTaskNames + setOf("copyResourcesToClasses2", "buildJar", "run", "runLauncher", "printDirs") +val legacyRuntimeAlertsMainPackageDir = + layout.buildDirectory.dir("classes/java/main/network/crypta/node/useralerts") + +val legacyRuntimeAlertsTestPackageDir = + layout.buildDirectory.dir("classes/java/test/network/crypta/node/useralerts") + +// Selective leaf ownership metadata only covers root <-> leaf and leaf <-> leaf moves. +// Root-local package re-homes still need explicit stale-output pruning so non-clean builds and +// branch switches do not keep packaging deleted classes from the old package path. +val pruneLegacyRuntimeAlertsOutputs by + tasks.registering(Delete::class) { + val staleOutputTrees = + listOf( + legacyRuntimeAlertsMainPackageDir, + fileTree(layout.buildDirectory.dir("classes/java/main")) { + include("network/crypta/node/runtime/UserAlertManagerStoreAlertSink*.class") + }, + legacyRuntimeAlertsTestPackageDir, + fileTree(layout.buildDirectory.dir("classes/java/test")) { + include("network/crypta/node/runtime/UserAlertManagerStoreAlertSinkTest*.class") + }, + ) + group = "build" + description = + "Removes stale pre-rehome runtime alert outputs from root build directories on non-clean builds" + outputs.upToDateWhen { false } + delete(staleOutputTrees) + } + internalLeafProjects.forEach { leaf -> leaf.wireSelectiveLeafOutputPruning(pruneSelectiveLeafOutputs, sharedSelectiveLeafPruneTaskNames) leaf.extensions.configure("sonar") { isSkipProject = true } @@ -311,8 +340,14 @@ internalLeafProjects.forEach { leaf -> project.wireSelectiveLeafOutputPruning(pruneSelectiveLeafOutputs, rootSelectiveLeafPruneTaskNames) +project.wireSelectiveLeafOutputPruning( + pruneLegacyRuntimeAlertsOutputs, + rootSelectiveLeafPruneTaskNames, +) + tasks.named("buildJar") { dependsOn(pruneSelectiveLeafOutputs) + dependsOn(pruneLegacyRuntimeAlertsOutputs) dependsOn(internalLeafProjects.map { "${it.path}:classes" }) internalLeafProjects.forEach { leaf -> from(leaf.extensions.getByType(SourceSetContainer::class.java).named("main").map { it.output }) diff --git a/src/main/java/network/crypta/client/async/ClientContext.java b/src/main/java/network/crypta/client/async/ClientContext.java index 5fdb042e224..a4277b33af2 100644 --- a/src/main/java/network/crypta/client/async/ClientContext.java +++ b/src/main/java/network/crypta/client/async/ClientContext.java @@ -15,8 +15,8 @@ import network.crypta.crypt.RandomSource; import network.crypta.node.RequestScheduler; import network.crypta.node.RequestStarterGroup; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.DummyJobRunner; import network.crypta.support.MemoryLimitedJobRunner; import network.crypta.support.PriorityAwareExecutor; diff --git a/src/main/java/network/crypta/clients/fcp/URIFeedMessage.java b/src/main/java/network/crypta/clients/fcp/URIFeedMessage.java index 3468384187a..9ab384bb439 100644 --- a/src/main/java/network/crypta/clients/fcp/URIFeedMessage.java +++ b/src/main/java/network/crypta/clients/fcp/URIFeedMessage.java @@ -33,7 +33,7 @@ * * @see FeedMessage * @see FreenetURI - * @see network.crypta.node.useralerts.DownloadFeedUserAlert + * @see network.crypta.runtime.alerts.DownloadFeedUserAlert */ public class URIFeedMessage extends FeedMessage { /** diff --git a/src/main/java/network/crypta/clients/fcp/WatchFeedsMessage.java b/src/main/java/network/crypta/clients/fcp/WatchFeedsMessage.java index 25cca345752..f712b476a3a 100644 --- a/src/main/java/network/crypta/clients/fcp/WatchFeedsMessage.java +++ b/src/main/java/network/crypta/clients/fcp/WatchFeedsMessage.java @@ -24,7 +24,7 @@ * * * @see network.crypta.clients.fcp.FCPConnectionHandler - * @see network.crypta.node.useralerts.UserAlertManager + * @see network.crypta.runtime.alerts.UserAlertManager */ public class WatchFeedsMessage extends FCPMessage { diff --git a/src/main/java/network/crypta/clients/http/ConfigToadlet.java b/src/main/java/network/crypta/clients/http/ConfigToadlet.java index 382d7a73e1a..d906fcffb02 100644 --- a/src/main/java/network/crypta/clients/http/ConfigToadlet.java +++ b/src/main/java/network/crypta/clients/http/ConfigToadlet.java @@ -13,8 +13,8 @@ import network.crypta.config.WrapperConfig; import network.crypta.l10n.NodeL10n; import network.crypta.node.ProgramDirectory; -import network.crypta.node.useralerts.AbstractUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.AbstractUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.support.HTMLNode; import network.crypta.support.MultiValueTable; import network.crypta.support.URLEncoder; diff --git a/src/main/java/network/crypta/clients/http/CoreHttpShellRuntimeSupport.java b/src/main/java/network/crypta/clients/http/CoreHttpShellRuntimeSupport.java index f1065e842bb..be947924b8d 100644 --- a/src/main/java/network/crypta/clients/http/CoreHttpShellRuntimeSupport.java +++ b/src/main/java/network/crypta/clients/http/CoreHttpShellRuntimeSupport.java @@ -11,7 +11,7 @@ import network.crypta.node.RequestStarter; import network.crypta.node.SecurityLevels.NETWORK_THREAT_LEVEL; import network.crypta.node.SecurityLevels.PHYSICAL_THREAT_LEVEL; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.RuntimePorts; import network.crypta.support.Ticker; diff --git a/src/main/java/network/crypta/clients/http/HttpShellRuntimeSupport.java b/src/main/java/network/crypta/clients/http/HttpShellRuntimeSupport.java index d6ac10eb63a..2dacf4dae3f 100644 --- a/src/main/java/network/crypta/clients/http/HttpShellRuntimeSupport.java +++ b/src/main/java/network/crypta/clients/http/HttpShellRuntimeSupport.java @@ -2,7 +2,7 @@ import java.io.File; import network.crypta.config.Config; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.RuntimePorts; import network.crypta.support.Ticker; diff --git a/src/main/java/network/crypta/clients/http/SimpleToadletServer.java b/src/main/java/network/crypta/clients/http/SimpleToadletServer.java index 733fa89cbec..ed966d164cb 100644 --- a/src/main/java/network/crypta/clients/http/SimpleToadletServer.java +++ b/src/main/java/network/crypta/clients/http/SimpleToadletServer.java @@ -33,7 +33,7 @@ import network.crypta.node.NodeClientCore; import network.crypta.node.PrioRunnable; import network.crypta.node.runtime.SSL; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.RandomnessPort; import network.crypta.runtime.spi.RuntimePorts; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/clients/http/ToadletContext.java b/src/main/java/network/crypta/clients/http/ToadletContext.java index 49511895d37..e1fbb0467dd 100644 --- a/src/main/java/network/crypta/clients/http/ToadletContext.java +++ b/src/main/java/network/crypta/clients/http/ToadletContext.java @@ -6,7 +6,7 @@ import java.time.Instant; import network.crypta.clients.http.FProxyFetchInProgress.REFILTER_POLICY; import network.crypta.clients.http.bookmark.BookmarkManager; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.MultiValueTable; import network.crypta.support.api.Bucket; diff --git a/src/main/java/network/crypta/clients/http/ToadletContextImpl.java b/src/main/java/network/crypta/clients/http/ToadletContextImpl.java index d40e28bdc86..86c477ee325 100644 --- a/src/main/java/network/crypta/clients/http/ToadletContextImpl.java +++ b/src/main/java/network/crypta/clients/http/ToadletContextImpl.java @@ -29,7 +29,7 @@ import network.crypta.clients.http.bookmark.BookmarkManager; import network.crypta.l10n.NodeL10n; import network.crypta.node.runtime.SSL; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLEncoder; import network.crypta.support.HTMLNode; import network.crypta.support.MultiValueTable; diff --git a/src/main/java/network/crypta/clients/http/ToadletRequestServices.java b/src/main/java/network/crypta/clients/http/ToadletRequestServices.java index ff870e334ff..59d18841697 100644 --- a/src/main/java/network/crypta/clients/http/ToadletRequestServices.java +++ b/src/main/java/network/crypta/clients/http/ToadletRequestServices.java @@ -1,7 +1,7 @@ package network.crypta.clients.http; import network.crypta.clients.http.bookmark.BookmarkManager; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; /** * Shared services needed to build per-request {@link ToadletContextImpl} instances. diff --git a/src/main/java/network/crypta/clients/http/UserAlertsToadlet.java b/src/main/java/network/crypta/clients/http/UserAlertsToadlet.java index 170bbf7a900..6b0c5645253 100644 --- a/src/main/java/network/crypta/clients/http/UserAlertsToadlet.java +++ b/src/main/java/network/crypta/clients/http/UserAlertsToadlet.java @@ -7,9 +7,9 @@ import javax.naming.SizeLimitExceededException; import network.crypta.client.HighLevelSimpleClient; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.AbstractNodeToNodeFileOfferUserAlert; -import network.crypta.node.useralerts.NodeToNodeMessageUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.AbstractNodeToNodeFileOfferUserAlert; +import network.crypta.runtime.alerts.NodeToNodeMessageUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.support.HTMLNode; import network.crypta.support.MultiValueTable; import network.crypta.support.api.HTTPRequest; diff --git a/src/main/java/network/crypta/clients/http/WelcomeToadlet.java b/src/main/java/network/crypta/clients/http/WelcomeToadlet.java index 58da911cb78..80cab446d78 100644 --- a/src/main/java/network/crypta/clients/http/WelcomeToadlet.java +++ b/src/main/java/network/crypta/clients/http/WelcomeToadlet.java @@ -22,7 +22,7 @@ import network.crypta.keys.FreenetURI; import network.crypta.l10n.NodeL10n; import network.crypta.node.Version; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.runtime.spi.DarknetConnectionPeerSnapshot; import network.crypta.runtime.spi.WelcomePageSnapshot; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/clients/http/bookmark/BookmarkItem.java b/src/main/java/network/crypta/clients/http/bookmark/BookmarkItem.java index 0cb2e3ee64c..49ab35d818f 100644 --- a/src/main/java/network/crypta/clients/http/bookmark/BookmarkItem.java +++ b/src/main/java/network/crypta/clients/http/bookmark/BookmarkItem.java @@ -8,9 +8,9 @@ import network.crypta.keys.USK; import network.crypta.l10n.NodeL10n; import network.crypta.node.FSParseException; -import network.crypta.node.useralerts.AbstractUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.AbstractUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.SimpleFieldSet; import org.slf4j.Logger; diff --git a/src/main/java/network/crypta/clients/http/bookmark/BookmarkManager.java b/src/main/java/network/crypta/clients/http/bookmark/BookmarkManager.java index 3f113f02d93..54f3133a986 100644 --- a/src/main/java/network/crypta/clients/http/bookmark/BookmarkManager.java +++ b/src/main/java/network/crypta/clients/http/bookmark/BookmarkManager.java @@ -20,7 +20,7 @@ import network.crypta.node.FSParseException; import network.crypta.node.RequestStarter; import network.crypta.node.SemiOrderedShutdownHook; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.SimpleFieldSet; import network.crypta.support.io.FileUtil; import org.slf4j.Logger; diff --git a/src/main/java/network/crypta/node/Announcer.java b/src/main/java/network/crypta/node/Announcer.java index a6378a97453..152e19d4a98 100644 --- a/src/main/java/network/crypta/node/Announcer.java +++ b/src/main/java/network/crypta/node/Announcer.java @@ -17,10 +17,10 @@ import network.crypta.io.comm.PeerParseException; import network.crypta.io.comm.ReferenceSignatureVerificationException; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.AbstractUserEvent; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserEvent; +import network.crypta.runtime.alerts.AbstractUserEvent; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserEvent; import network.crypta.support.ByteArrayWrapper; import network.crypta.support.HTMLNode; import network.crypta.support.ListUtils; diff --git a/src/main/java/network/crypta/node/BandwidthManager.java b/src/main/java/network/crypta/node/BandwidthManager.java index 485d9f50c3b..20405189e6f 100644 --- a/src/main/java/network/crypta/node/BandwidthManager.java +++ b/src/main/java/network/crypta/node/BandwidthManager.java @@ -4,7 +4,7 @@ import network.crypta.compat.BandwidthIndicator; import network.crypta.config.InvalidConfigValueException; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UpgradeConnectionSpeedUserAlert; +import network.crypta.runtime.alerts.UpgradeConnectionSpeedUserAlert; import static java.util.concurrent.TimeUnit.HOURS; import static java.util.concurrent.TimeUnit.SECONDS; diff --git a/src/main/java/network/crypta/node/DarknetPeerNode.java b/src/main/java/network/crypta/node/DarknetPeerNode.java index 21a116e34d5..86ebf3ec27b 100644 --- a/src/main/java/network/crypta/node/DarknetPeerNode.java +++ b/src/main/java/network/crypta/node/DarknetPeerNode.java @@ -35,12 +35,12 @@ import network.crypta.io.xfer.PartiallyReceivedBulk; import network.crypta.keys.FreenetURI; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.AbstractNodeToNodeFileOfferUserAlert; -import network.crypta.node.useralerts.BookmarkFeedUserAlert; -import network.crypta.node.useralerts.DownloadFeedUserAlert; -import network.crypta.node.useralerts.N2NTMUserAlert; -import network.crypta.node.useralerts.NodeToNodeAlertContext; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.AbstractNodeToNodeFileOfferUserAlert; +import network.crypta.runtime.alerts.BookmarkFeedUserAlert; +import network.crypta.runtime.alerts.DownloadFeedUserAlert; +import network.crypta.runtime.alerts.N2NTMUserAlert; +import network.crypta.runtime.alerts.NodeToNodeAlertContext; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.support.Base64; import network.crypta.support.HTMLNode; import network.crypta.support.IllegalBase64Exception; diff --git a/src/main/java/network/crypta/node/IPDetectorManager.java b/src/main/java/network/crypta/node/IPDetectorManager.java index a181a3b50c1..3ab1cb23b57 100644 --- a/src/main/java/network/crypta/node/IPDetectorManager.java +++ b/src/main/java/network/crypta/node/IPDetectorManager.java @@ -22,10 +22,10 @@ import network.crypta.io.comm.FreenetInetAddress; import network.crypta.io.comm.Peer; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.AbstractUserAlert; -import network.crypta.node.useralerts.ProxyUserAlert; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.AbstractUserAlert; +import network.crypta.runtime.alerts.ProxyUserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.runtime.spi.ConnectivityNoticeSnapshot; import network.crypta.support.HTMLEncoder; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/NodeClientCore.java b/src/main/java/network/crypta/node/NodeClientCore.java index 68ce6ba5160..85901d45945 100644 --- a/src/main/java/network/crypta/node/NodeClientCore.java +++ b/src/main/java/network/crypta/node/NodeClientCore.java @@ -22,7 +22,7 @@ import network.crypta.keys.NodeSSK; import network.crypta.node.SecurityLevels.PHYSICAL_THREAT_LEVEL; import network.crypta.node.runtime.LegacyRuntimePorts; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.endpoints.ClientEndpoints; import network.crypta.runtime.endpoints.NodeClientCoreInit; import network.crypta.runtime.endpoints.NodeClientPersistence; diff --git a/src/main/java/network/crypta/node/NodeClientCoreSupport.java b/src/main/java/network/crypta/node/NodeClientCoreSupport.java index 728c48365a1..5a2a813c9d6 100644 --- a/src/main/java/network/crypta/node/NodeClientCoreSupport.java +++ b/src/main/java/network/crypta/node/NodeClientCoreSupport.java @@ -35,11 +35,11 @@ import network.crypta.keys.SSKVerifyException; import network.crypta.l10n.NodeL10n; import network.crypta.node.subsystem.NodeRoutingSubsystem; -import network.crypta.node.useralerts.DatastoreTooSmallAlert; -import network.crypta.node.useralerts.DiskSpaceUserAlert; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.DatastoreTooSmallAlert; +import network.crypta.runtime.alerts.DiskSpaceUserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.endpoints.NodeClientCoreInit; import network.crypta.support.SizeUtil; import network.crypta.support.compress.Compressor; diff --git a/src/main/java/network/crypta/node/NodeIPDetector.java b/src/main/java/network/crypta/node/NodeIPDetector.java index 85943ec3e23..0b14e8c03e4 100644 --- a/src/main/java/network/crypta/node/NodeIPDetector.java +++ b/src/main/java/network/crypta/node/NodeIPDetector.java @@ -24,10 +24,10 @@ import network.crypta.io.comm.FreenetInetAddress; import network.crypta.io.comm.Peer; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.IPUndetectedUserAlert; -import network.crypta.node.useralerts.InvalidAddressOverrideUserAlert; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.IPUndetectedUserAlert; +import network.crypta.runtime.alerts.InvalidAddressOverrideUserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.runtime.spi.ConnectivityNoticeSnapshot; import network.crypta.support.HTMLNode; import network.crypta.support.io.NativeThread; @@ -655,7 +655,7 @@ private String unknownHostError(String value) { private void unregisterInvalidOverrideAlert() { NodeClientCore cc = node.services().clientCore(); if (cc == null) return; - network.crypta.node.useralerts.UserAlertManager alerts = cc.getAlerts(); + network.crypta.runtime.alerts.UserAlertManager alerts = cc.getAlerts(); if (alerts == null) return; alerts.unregister(invalidAddressOverrideAlert); } diff --git a/src/main/java/network/crypta/node/PeerAlertCoordinator.java b/src/main/java/network/crypta/node/PeerAlertCoordinator.java index ba52f21c517..c73a1a74f04 100644 --- a/src/main/java/network/crypta/node/PeerAlertCoordinator.java +++ b/src/main/java/network/crypta/node/PeerAlertCoordinator.java @@ -1,6 +1,6 @@ package network.crypta.node; -import network.crypta.node.useralerts.PeerManagerUserAlert; +import network.crypta.runtime.alerts.PeerManagerUserAlert; /** * Updates and maintains the peer manager user alert based on current roster and status data. diff --git a/src/main/java/network/crypta/node/PeerPersistence.java b/src/main/java/network/crypta/node/PeerPersistence.java index 01d783a7af4..bc68cbf9ee2 100644 --- a/src/main/java/network/crypta/node/PeerPersistence.java +++ b/src/main/java/network/crypta/node/PeerPersistence.java @@ -15,7 +15,7 @@ import java.util.Objects; import network.crypta.io.comm.PeerParseException; import network.crypta.io.comm.ReferenceSignatureVerificationException; -import network.crypta.node.useralerts.DroppedOldPeersUserAlert; +import network.crypta.runtime.alerts.DroppedOldPeersUserAlert; import network.crypta.support.SimpleFieldSet; import network.crypta.support.io.FileUtil; import network.crypta.support.io.NativeThread; diff --git a/src/main/java/network/crypta/node/subsystem/NodeNetworkSubsystem.java b/src/main/java/network/crypta/node/subsystem/NodeNetworkSubsystem.java index ca70ea9d298..1ce7237c9ad 100644 --- a/src/main/java/network/crypta/node/subsystem/NodeNetworkSubsystem.java +++ b/src/main/java/network/crypta/node/subsystem/NodeNetworkSubsystem.java @@ -63,8 +63,8 @@ import network.crypta.node.UptimeEstimator; import network.crypta.node.probe.Listener; import network.crypta.node.probe.Type; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.support.OutputThrottle; import network.crypta.support.PooledExecutor; import network.crypta.support.PrioritizedTicker; diff --git a/src/main/java/network/crypta/node/subsystem/NodeServicesSubsystem.java b/src/main/java/network/crypta/node/subsystem/NodeServicesSubsystem.java index a23b0529796..0e7e8678641 100644 --- a/src/main/java/network/crypta/node/subsystem/NodeServicesSubsystem.java +++ b/src/main/java/network/crypta/node/subsystem/NodeServicesSubsystem.java @@ -10,13 +10,13 @@ import network.crypta.l10n.NodeL10n; import network.crypta.node.Node; import network.crypta.node.NodeInitException; -import network.crypta.node.useralerts.JVMVersionAlert; -import network.crypta.node.useralerts.MeaningfulNodeNameUserAlert; -import network.crypta.node.useralerts.NotEnoughNiceLevelsUserAlert; -import network.crypta.node.useralerts.PeersOffersUserAlert; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.TimeSkewDetectedUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.JVMVersionAlert; +import network.crypta.runtime.alerts.MeaningfulNodeNameUserAlert; +import network.crypta.runtime.alerts.NotEnoughNiceLevelsUserAlert; +import network.crypta.runtime.alerts.PeersOffersUserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.TimeSkewDetectedUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.support.JVMVersion; import network.crypta.support.PriorityAwareExecutor; import network.crypta.support.Ticker; diff --git a/src/main/java/network/crypta/node/subsystem/NodeStorageSubsystem.java b/src/main/java/network/crypta/node/subsystem/NodeStorageSubsystem.java index e4b42d65db4..bd5e2f61aff 100644 --- a/src/main/java/network/crypta/node/subsystem/NodeStorageSubsystem.java +++ b/src/main/java/network/crypta/node/subsystem/NodeStorageSubsystem.java @@ -40,14 +40,14 @@ import network.crypta.node.NodeStoreStatsProvider; import network.crypta.node.SecurityLevels.PHYSICAL_THREAT_LEVEL; import network.crypta.node.SemiOrderedShutdownHook; -import network.crypta.node.runtime.UserAlertManagerStoreAlertSink; import network.crypta.node.stats.DataStoreInstanceType; import network.crypta.node.stats.DataStoreKeyType; import network.crypta.node.stats.DataStoreStats; import network.crypta.node.stats.DataStoreType; import network.crypta.node.stats.NotAvailNodeStoreStats; import network.crypta.node.stats.StoreCallbackStats; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManagerStoreAlertSink; import network.crypta.store.BlockMetadata; import network.crypta.store.CHKStore; import network.crypta.store.FreenetStore; diff --git a/src/main/java/network/crypta/node/updater/NodeUpdateManager.java b/src/main/java/network/crypta/node/updater/NodeUpdateManager.java index 1fc58a06a99..81866c1b40c 100644 --- a/src/main/java/network/crypta/node/updater/NodeUpdateManager.java +++ b/src/main/java/network/crypta/node/updater/NodeUpdateManager.java @@ -33,8 +33,8 @@ import network.crypta.node.RequestClient; import network.crypta.node.RequestStarter; import network.crypta.node.Version; -import network.crypta.node.useralerts.RevocationKeyFoundUserAlert; -import network.crypta.node.useralerts.UpdatedVersionAvailableUserAlert; +import network.crypta.runtime.alerts.RevocationKeyFoundUserAlert; +import network.crypta.runtime.alerts.UpdatedVersionAvailableUserAlert; import network.crypta.support.HTMLNode; import network.crypta.support.api.Bucket; import network.crypta.support.io.BucketTools; diff --git a/src/main/java/network/crypta/node/updater/UpdateOverMandatoryManager.java b/src/main/java/network/crypta/node/updater/UpdateOverMandatoryManager.java index 8fa22ca77b3..db29af684c7 100644 --- a/src/main/java/network/crypta/node/updater/UpdateOverMandatoryManager.java +++ b/src/main/java/network/crypta/node/updater/UpdateOverMandatoryManager.java @@ -56,8 +56,8 @@ import network.crypta.node.RequestClient; import network.crypta.node.RequestStarter; import network.crypta.node.Version; -import network.crypta.node.useralerts.AbstractUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.AbstractUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.support.HTMLNode; import network.crypta.support.ShortBuffer; import network.crypta.support.SizeUtil; diff --git a/src/main/java/network/crypta/node/useralerts/package-info.java b/src/main/java/network/crypta/node/useralerts/package-info.java deleted file mode 100644 index 70d8686c344..00000000000 --- a/src/main/java/network/crypta/node/useralerts/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** - * Status messages generated by the node to indicate various problems. Some of these are embedded in - * various parts of the code, but non-core code should usually use a callback or an exception. - * Alerts can be rendered in various different ways, and are shown to the user in the hope that - * (s)he can fix the problem, or in some cases, to tell them that something is so severely broken - * that Freenet won't work properly. - */ -package network.crypta.node.useralerts; diff --git a/src/main/java/network/crypta/runtime/admin/LegacyQueueCompletionPort.java b/src/main/java/network/crypta/runtime/admin/LegacyQueueCompletionPort.java index eb7d00749c5..33a84865e11 100644 --- a/src/main/java/network/crypta/runtime/admin/LegacyQueueCompletionPort.java +++ b/src/main/java/network/crypta/runtime/admin/LegacyQueueCompletionPort.java @@ -29,9 +29,9 @@ import network.crypta.keys.FreenetURI; import network.crypta.l10n.NodeL10n; import network.crypta.node.NodeClientCore; -import network.crypta.node.useralerts.StoringUserEvent; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserEvent; +import network.crypta.runtime.alerts.StoringUserEvent; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserEvent; import network.crypta.runtime.spi.QueueCompletionPort; import network.crypta.support.HTMLNode; import network.crypta.support.SizeUtil; diff --git a/src/main/java/network/crypta/runtime/admin/LegacyWelcomeActionPort.java b/src/main/java/network/crypta/runtime/admin/LegacyWelcomeActionPort.java index da2a755fb3c..9374dcc7344 100644 --- a/src/main/java/network/crypta/runtime/admin/LegacyWelcomeActionPort.java +++ b/src/main/java/network/crypta/runtime/admin/LegacyWelcomeActionPort.java @@ -6,8 +6,8 @@ import network.crypta.l10n.NodeL10n; import network.crypta.node.BandwidthManager; import network.crypta.node.Node; -import network.crypta.node.useralerts.UpgradeConnectionSpeedUserAlert; -import network.crypta.node.useralerts.UserAlert; +import network.crypta.runtime.alerts.UpgradeConnectionSpeedUserAlert; +import network.crypta.runtime.alerts.UserAlert; import network.crypta.runtime.spi.WelcomeActionPort; import network.crypta.support.Fields; diff --git a/src/main/java/network/crypta/node/useralerts/AbstractNodeToNodeFileOfferUserAlert.java b/src/main/java/network/crypta/runtime/alerts/AbstractNodeToNodeFileOfferUserAlert.java similarity index 98% rename from src/main/java/network/crypta/node/useralerts/AbstractNodeToNodeFileOfferUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/AbstractNodeToNodeFileOfferUserAlert.java index cb19ac95e80..e5d75712b85 100644 --- a/src/main/java/network/crypta/node/useralerts/AbstractNodeToNodeFileOfferUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/AbstractNodeToNodeFileOfferUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; /** * Base class for file-offer user alerts exchanged between nodes. diff --git a/src/main/java/network/crypta/node/useralerts/AbstractUserAlert.java b/src/main/java/network/crypta/runtime/alerts/AbstractUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/AbstractUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/AbstractUserAlert.java index 7ab3d6d8284..303294fe085 100644 --- a/src/main/java/network/crypta/node/useralerts/AbstractUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/AbstractUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.fcp.FCPMessage; import network.crypta.clients.fcp.FeedMessage; diff --git a/src/main/java/network/crypta/node/useralerts/AbstractUserEvent.java b/src/main/java/network/crypta/runtime/alerts/AbstractUserEvent.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/AbstractUserEvent.java rename to src/main/java/network/crypta/runtime/alerts/AbstractUserEvent.java index c53ea9d8496..0f4bad101a7 100644 --- a/src/main/java/network/crypta/node/useralerts/AbstractUserEvent.java +++ b/src/main/java/network/crypta/runtime/alerts/AbstractUserEvent.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; /** * Skeleton base class for user-facing event notifications. diff --git a/src/main/java/network/crypta/node/useralerts/BookmarkFeedUserAlert.java b/src/main/java/network/crypta/runtime/alerts/BookmarkFeedUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/BookmarkFeedUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/BookmarkFeedUserAlert.java index f6e811e1b87..977b491e373 100644 --- a/src/main/java/network/crypta/node/useralerts/BookmarkFeedUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/BookmarkFeedUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/src/main/java/network/crypta/node/useralerts/DatastoreTooSmallAlert.java b/src/main/java/network/crypta/runtime/alerts/DatastoreTooSmallAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/DatastoreTooSmallAlert.java rename to src/main/java/network/crypta/runtime/alerts/DatastoreTooSmallAlert.java index b637f3969cf..9249a09a70e 100644 --- a/src/main/java/network/crypta/node/useralerts/DatastoreTooSmallAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/DatastoreTooSmallAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.fcp.FCPMessage; import network.crypta.clients.fcp.FeedMessage; diff --git a/src/main/java/network/crypta/node/useralerts/DiskSpaceUserAlert.java b/src/main/java/network/crypta/runtime/alerts/DiskSpaceUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/DiskSpaceUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/DiskSpaceUserAlert.java index 513f56a746d..cb9d260037d 100644 --- a/src/main/java/network/crypta/node/useralerts/DiskSpaceUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/DiskSpaceUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import network.crypta.clients.fcp.FCPMessage; diff --git a/src/main/java/network/crypta/node/useralerts/DownloadFeedUserAlert.java b/src/main/java/network/crypta/runtime/alerts/DownloadFeedUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/DownloadFeedUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/DownloadFeedUserAlert.java index 5c6b407fcd1..a92a32dc777 100644 --- a/src/main/java/network/crypta/node/useralerts/DownloadFeedUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/DownloadFeedUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/src/main/java/network/crypta/node/useralerts/DroppedOldPeersUserAlert.java b/src/main/java/network/crypta/runtime/alerts/DroppedOldPeersUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/DroppedOldPeersUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/DroppedOldPeersUserAlert.java index 4235bcd0525..85245d21b49 100644 --- a/src/main/java/network/crypta/node/useralerts/DroppedOldPeersUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/DroppedOldPeersUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import java.time.Instant; diff --git a/src/main/java/network/crypta/node/useralerts/IPUndetectedUserAlert.java b/src/main/java/network/crypta/runtime/alerts/IPUndetectedUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/IPUndetectedUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/IPUndetectedUserAlert.java index ba0a9f92448..85b83abef0c 100644 --- a/src/main/java/network/crypta/node/useralerts/IPUndetectedUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/IPUndetectedUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.config.Option; import network.crypta.config.SubConfig; diff --git a/src/main/java/network/crypta/node/useralerts/InvalidAddressOverrideUserAlert.java b/src/main/java/network/crypta/runtime/alerts/InvalidAddressOverrideUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/InvalidAddressOverrideUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/InvalidAddressOverrideUserAlert.java index 402034e66fa..7e0a4ca3657 100644 --- a/src/main/java/network/crypta/node/useralerts/InvalidAddressOverrideUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/InvalidAddressOverrideUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.config.Option; import network.crypta.config.SubConfig; diff --git a/src/main/java/network/crypta/node/useralerts/JVMVersionAlert.java b/src/main/java/network/crypta/runtime/alerts/JVMVersionAlert.java similarity index 98% rename from src/main/java/network/crypta/node/useralerts/JVMVersionAlert.java rename to src/main/java/network/crypta/runtime/alerts/JVMVersionAlert.java index 6f1d1744976..485636f4115 100644 --- a/src/main/java/network/crypta/node/useralerts/JVMVersionAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/JVMVersionAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/useralerts/MeaningfulNodeNameUserAlert.java b/src/main/java/network/crypta/runtime/alerts/MeaningfulNodeNameUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/MeaningfulNodeNameUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/MeaningfulNodeNameUserAlert.java index d18afd1e3f9..07bd1f82ae1 100644 --- a/src/main/java/network/crypta/node/useralerts/MeaningfulNodeNameUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/MeaningfulNodeNameUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.config.Option; import network.crypta.config.SubConfig; diff --git a/src/main/java/network/crypta/node/useralerts/N2NTMUserAlert.java b/src/main/java/network/crypta/runtime/alerts/N2NTMUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/N2NTMUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/N2NTMUserAlert.java index d4cc37538c2..4c2c79a5624 100644 --- a/src/main/java/network/crypta/node/useralerts/N2NTMUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/N2NTMUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.lang.ref.WeakReference; import java.time.Instant; diff --git a/src/main/java/network/crypta/node/useralerts/NodeToNodeAlertContext.java b/src/main/java/network/crypta/runtime/alerts/NodeToNodeAlertContext.java similarity index 98% rename from src/main/java/network/crypta/node/useralerts/NodeToNodeAlertContext.java rename to src/main/java/network/crypta/runtime/alerts/NodeToNodeAlertContext.java index e0b0c09b8ba..7899fceb6ad 100644 --- a/src/main/java/network/crypta/node/useralerts/NodeToNodeAlertContext.java +++ b/src/main/java/network/crypta/runtime/alerts/NodeToNodeAlertContext.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.node.DarknetPeerNode; diff --git a/src/main/java/network/crypta/node/useralerts/NodeToNodeMessageUserAlert.java b/src/main/java/network/crypta/runtime/alerts/NodeToNodeMessageUserAlert.java similarity index 97% rename from src/main/java/network/crypta/node/useralerts/NodeToNodeMessageUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/NodeToNodeMessageUserAlert.java index 910930d6d68..383999c6330 100644 --- a/src/main/java/network/crypta/node/useralerts/NodeToNodeMessageUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/NodeToNodeMessageUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; /** * Marker interface for user alerts that represent node‑to‑node messages. diff --git a/src/main/java/network/crypta/node/useralerts/NotEnoughNiceLevelsUserAlert.java b/src/main/java/network/crypta/runtime/alerts/NotEnoughNiceLevelsUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/NotEnoughNiceLevelsUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/NotEnoughNiceLevelsUserAlert.java index baef483dea9..9fa5a106c4e 100644 --- a/src/main/java/network/crypta/node/useralerts/NotEnoughNiceLevelsUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/NotEnoughNiceLevelsUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/useralerts/PeerManagerUserAlert.java b/src/main/java/network/crypta/runtime/alerts/PeerManagerUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/PeerManagerUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/PeerManagerUserAlert.java index d76685a00e8..a93773771b7 100644 --- a/src/main/java/network/crypta/node/useralerts/PeerManagerUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/PeerManagerUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.node.NodeStats; diff --git a/src/main/java/network/crypta/node/useralerts/PeersOffersUserAlert.java b/src/main/java/network/crypta/runtime/alerts/PeersOffersUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/PeersOffersUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/PeersOffersUserAlert.java index 02d9757d6eb..54f6d80a582 100644 --- a/src/main/java/network/crypta/node/useralerts/PeersOffersUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/PeersOffersUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import network.crypta.clients.http.complexhtmlnodes.PeerTrustInputForAddPeerBoxNode; diff --git a/src/main/java/network/crypta/node/useralerts/ProxyUserAlert.java b/src/main/java/network/crypta/runtime/alerts/ProxyUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/ProxyUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/ProxyUserAlert.java index 00123d4a57d..8b86332e687 100644 --- a/src/main/java/network/crypta/node/useralerts/ProxyUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/ProxyUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.util.Objects; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/useralerts/RevocationKeyFoundUserAlert.java b/src/main/java/network/crypta/runtime/alerts/RevocationKeyFoundUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/RevocationKeyFoundUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/RevocationKeyFoundUserAlert.java index 995f50ec76e..3527e11de1c 100644 --- a/src/main/java/network/crypta/node/useralerts/RevocationKeyFoundUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/RevocationKeyFoundUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/useralerts/SimpleUserAlert.java b/src/main/java/network/crypta/runtime/alerts/SimpleUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/SimpleUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/SimpleUserAlert.java index af268565672..f60b2db8792 100644 --- a/src/main/java/network/crypta/node/useralerts/SimpleUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/SimpleUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/useralerts/StoringUserEvent.java b/src/main/java/network/crypta/runtime/alerts/StoringUserEvent.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/StoringUserEvent.java rename to src/main/java/network/crypta/runtime/alerts/StoringUserEvent.java index ceb481febdd..0aff26c821f 100644 --- a/src/main/java/network/crypta/node/useralerts/StoringUserEvent.java +++ b/src/main/java/network/crypta/runtime/alerts/StoringUserEvent.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.util.Iterator; import java.util.Map; diff --git a/src/main/java/network/crypta/node/useralerts/TimeSkewDetectedUserAlert.java b/src/main/java/network/crypta/runtime/alerts/TimeSkewDetectedUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/TimeSkewDetectedUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/TimeSkewDetectedUserAlert.java index dd11fd45ab4..58de051a9aa 100644 --- a/src/main/java/network/crypta/node/useralerts/TimeSkewDetectedUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/TimeSkewDetectedUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLNode; diff --git a/src/main/java/network/crypta/node/useralerts/UpdatedVersionAvailableUserAlert.java b/src/main/java/network/crypta/runtime/alerts/UpdatedVersionAvailableUserAlert.java similarity index 98% rename from src/main/java/network/crypta/node/useralerts/UpdatedVersionAvailableUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/UpdatedVersionAvailableUserAlert.java index 19c2c3d7768..dde99434d4b 100644 --- a/src/main/java/network/crypta/node/useralerts/UpdatedVersionAvailableUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/UpdatedVersionAvailableUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import network.crypta.l10n.NodeL10n; @@ -34,7 +34,7 @@ * * @see network.crypta.node.updater.NodeUpdateManager * @see network.crypta.support.HTMLNode - * @see network.crypta.node.useralerts.UserAlert + * @see network.crypta.runtime.alerts.UserAlert */ public class UpdatedVersionAvailableUserAlert extends AbstractUserAlert { private static final Logger LOG = LoggerFactory.getLogger(UpdatedVersionAvailableUserAlert.class); @@ -291,7 +291,7 @@ private String getUpdateScriptName() { /** * Returns the alert priority used for ordering and emphasis. * - *

The value maps to {@link network.crypta.node.useralerts.UserAlert} severity constants and + *

The value maps to {@link network.crypta.runtime.alerts.UserAlert} severity constants and * reflects urgency based on updater state. Urgent updates may be classified as critical to ensure * visibility. * diff --git a/src/main/java/network/crypta/node/useralerts/UpgradeConnectionSpeedUserAlert.java b/src/main/java/network/crypta/runtime/alerts/UpgradeConnectionSpeedUserAlert.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/UpgradeConnectionSpeedUserAlert.java rename to src/main/java/network/crypta/runtime/alerts/UpgradeConnectionSpeedUserAlert.java index a5028d19698..e72c9e7fd27 100644 --- a/src/main/java/network/crypta/node/useralerts/UpgradeConnectionSpeedUserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/UpgradeConnectionSpeedUserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.http.wizardsteps.BandwidthLimit; import network.crypta.l10n.NodeL10n; diff --git a/src/main/java/network/crypta/node/useralerts/UserAlert.java b/src/main/java/network/crypta/runtime/alerts/UserAlert.java similarity index 98% rename from src/main/java/network/crypta/node/useralerts/UserAlert.java rename to src/main/java/network/crypta/runtime/alerts/UserAlert.java index ff0297e2c9f..a0f168f7b0d 100644 --- a/src/main/java/network/crypta/node/useralerts/UserAlert.java +++ b/src/main/java/network/crypta/runtime/alerts/UserAlert.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.fcp.FCPMessage; import network.crypta.support.HTMLNode; @@ -26,7 +26,7 @@ *

  • External propagation: {@link #getFCPMessage()} for FCP subscribers. * * - * @see network.crypta.node.useralerts.UserAlertManager + * @see network.crypta.runtime.alerts.UserAlertManager * @see network.crypta.clients.fcp.FeedMessage */ public interface UserAlert { diff --git a/src/main/java/network/crypta/node/useralerts/UserAlertManager.java b/src/main/java/network/crypta/runtime/alerts/UserAlertManager.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/UserAlertManager.java rename to src/main/java/network/crypta/runtime/alerts/UserAlertManager.java index 0b5689e7771..bb14d267501 100644 --- a/src/main/java/network/crypta/node/useralerts/UserAlertManager.java +++ b/src/main/java/network/crypta/runtime/alerts/UserAlertManager.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.IOException; import java.io.StringWriter; diff --git a/src/main/java/network/crypta/node/runtime/UserAlertManagerStoreAlertSink.java b/src/main/java/network/crypta/runtime/alerts/UserAlertManagerStoreAlertSink.java similarity index 96% rename from src/main/java/network/crypta/node/runtime/UserAlertManagerStoreAlertSink.java rename to src/main/java/network/crypta/runtime/alerts/UserAlertManagerStoreAlertSink.java index e57bf8d0744..c2324fb3660 100644 --- a/src/main/java/network/crypta/node/runtime/UserAlertManagerStoreAlertSink.java +++ b/src/main/java/network/crypta/runtime/alerts/UserAlertManagerStoreAlertSink.java @@ -1,10 +1,7 @@ -package network.crypta.node.runtime; +package network.crypta.runtime.alerts; import java.util.Objects; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.AbstractUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; import network.crypta.store.alerts.StoreAlertSink; import network.crypta.store.alerts.StoreMaintenanceAlertKind; import network.crypta.store.alerts.StoreMaintenanceAlertSource; diff --git a/src/main/java/network/crypta/node/useralerts/UserEvent.java b/src/main/java/network/crypta/runtime/alerts/UserEvent.java similarity index 99% rename from src/main/java/network/crypta/node/useralerts/UserEvent.java rename to src/main/java/network/crypta/runtime/alerts/UserEvent.java index dadd9f5f569..398e3c6c6dc 100644 --- a/src/main/java/network/crypta/node/useralerts/UserEvent.java +++ b/src/main/java/network/crypta/runtime/alerts/UserEvent.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; /** * A {@code UserEvent} represents a discrete, user‑visible occurrence emitted by the node, such as diff --git a/src/main/java/network/crypta/runtime/alerts/package-info.java b/src/main/java/network/crypta/runtime/alerts/package-info.java new file mode 100644 index 00000000000..c424eefefb7 --- /dev/null +++ b/src/main/java/network/crypta/runtime/alerts/package-info.java @@ -0,0 +1,11 @@ +/** + * Transitional runtime/operator-facing alerts cluster. + * + *

    This package groups the legacy user-alert types while they are being re-homed under a neutral + * runtime package. The classes still collaborate with daemon-local state and remain responsible for + * the same alert rendering, sorting, and subscription behavior as before. + * + *

    The ownership change is intentionally behavioral no-op only: existing daemon-local + * integrations, alert lifecycles, and operator-facing semantics are preserved. + */ +package network.crypta.runtime.alerts; diff --git a/src/main/java/network/crypta/runtime/endpoints/ClientEndpoints.java b/src/main/java/network/crypta/runtime/endpoints/ClientEndpoints.java index 438b47848d6..79c2526c5fd 100644 --- a/src/main/java/network/crypta/runtime/endpoints/ClientEndpoints.java +++ b/src/main/java/network/crypta/runtime/endpoints/ClientEndpoints.java @@ -8,8 +8,8 @@ import network.crypta.node.Node; import network.crypta.node.NodeClientCore; import network.crypta.node.NodeClientCoreSupport; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.RuntimePorts; import network.crypta.support.io.TempBucketFactory; diff --git a/src/test/java/network/crypta/client/async/ClientContextTest.java b/src/test/java/network/crypta/client/async/ClientContextTest.java index cf7ffabf5a8..d7b5b0a9094 100644 --- a/src/test/java/network/crypta/client/async/ClientContextTest.java +++ b/src/test/java/network/crypta/client/async/ClientContextTest.java @@ -17,8 +17,8 @@ import network.crypta.crypt.MasterSecret; import network.crypta.crypt.RandomSource; import network.crypta.node.ClientContextResources; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.DummyJobRunner; import network.crypta.support.MemoryLimitedJobRunner; import network.crypta.support.PriorityAwareExecutor; diff --git a/src/test/java/network/crypta/clients/fcp/CoreFcpMessageRuntimeSupportTest.java b/src/test/java/network/crypta/clients/fcp/CoreFcpMessageRuntimeSupportTest.java index f5afd8e697f..2449ec08145 100644 --- a/src/test/java/network/crypta/clients/fcp/CoreFcpMessageRuntimeSupportTest.java +++ b/src/test/java/network/crypta/clients/fcp/CoreFcpMessageRuntimeSupportTest.java @@ -8,7 +8,7 @@ import network.crypta.node.probe.Listener; import network.crypta.node.probe.Type; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; diff --git a/src/test/java/network/crypta/clients/http/BrowserTestToadletTest.java b/src/test/java/network/crypta/clients/http/BrowserTestToadletTest.java index f6836a9b3a9..52e907c3bda 100644 --- a/src/test/java/network/crypta/clients/http/BrowserTestToadletTest.java +++ b/src/test/java/network/crypta/clients/http/BrowserTestToadletTest.java @@ -3,7 +3,7 @@ import java.net.URI; import java.util.Arrays; import network.crypta.client.HighLevelSimpleClient; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.api.HTTPRequest; import org.junit.jupiter.api.Test; diff --git a/src/test/java/network/crypta/clients/http/ChatForumsToadletTest.java b/src/test/java/network/crypta/clients/http/ChatForumsToadletTest.java index 418016608e2..039804d22ca 100644 --- a/src/test/java/network/crypta/clients/http/ChatForumsToadletTest.java +++ b/src/test/java/network/crypta/clients/http/ChatForumsToadletTest.java @@ -4,7 +4,7 @@ import java.net.URI; import network.crypta.client.HighLevelSimpleClient; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.api.HTTPRequest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/network/crypta/clients/http/ConfigToadletTest.java b/src/test/java/network/crypta/clients/http/ConfigToadletTest.java index d040e2b6822..9c8e2e87cd8 100644 --- a/src/test/java/network/crypta/clients/http/ConfigToadletTest.java +++ b/src/test/java/network/crypta/clients/http/ConfigToadletTest.java @@ -18,8 +18,8 @@ import network.crypta.config.WrapperConfig; import network.crypta.l10n.NodeL10n; import network.crypta.node.ProgramDirectory; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.ConfigPort; import network.crypta.runtime.spi.LifecyclePort; import network.crypta.runtime.spi.TransferAccessPort; diff --git a/src/test/java/network/crypta/clients/http/ConnectivityToadletTest.java b/src/test/java/network/crypta/clients/http/ConnectivityToadletTest.java index 6a1a1131da1..49e27ca1452 100644 --- a/src/test/java/network/crypta/clients/http/ConnectivityToadletTest.java +++ b/src/test/java/network/crypta/clients/http/ConnectivityToadletTest.java @@ -6,7 +6,7 @@ import java.util.List; import network.crypta.client.HighLevelSimpleClient; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.ConnectivityGapSnapshot; import network.crypta.runtime.spi.ConnectivityListenerPortSnapshot; import network.crypta.runtime.spi.ConnectivityNoticeSnapshot; diff --git a/src/test/java/network/crypta/clients/http/ContentFilterToadletTest.java b/src/test/java/network/crypta/clients/http/ContentFilterToadletTest.java index 5ed8389bf86..0aa2bbba146 100644 --- a/src/test/java/network/crypta/clients/http/ContentFilterToadletTest.java +++ b/src/test/java/network/crypta/clients/http/ContentFilterToadletTest.java @@ -18,7 +18,7 @@ import network.crypta.client.filter.ContentFilterRequest; import network.crypta.client.filter.FilterOperation; import network.crypta.client.filter.UnsafeContentTypeException; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.MultiValueTable; import network.crypta.support.api.Bucket; diff --git a/src/test/java/network/crypta/clients/http/CoreHttpShellRuntimeSupportTest.java b/src/test/java/network/crypta/clients/http/CoreHttpShellRuntimeSupportTest.java index 56ce081c496..595e6e1f5a7 100644 --- a/src/test/java/network/crypta/clients/http/CoreHttpShellRuntimeSupportTest.java +++ b/src/test/java/network/crypta/clients/http/CoreHttpShellRuntimeSupportTest.java @@ -19,7 +19,7 @@ import network.crypta.node.SecurityLevels; import network.crypta.node.subsystem.NodeNetworkSubsystem; import network.crypta.node.subsystem.NodeServicesSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.endpoints.ClientEndpoints; import network.crypta.runtime.spi.RuntimePorts; import network.crypta.support.Ticker; diff --git a/src/test/java/network/crypta/clients/http/DarknetAddRefToadletTest.java b/src/test/java/network/crypta/clients/http/DarknetAddRefToadletTest.java index 3007d2b0947..5a182e86cd0 100644 --- a/src/test/java/network/crypta/clients/http/DarknetAddRefToadletTest.java +++ b/src/test/java/network/crypta/clients/http/DarknetAddRefToadletTest.java @@ -158,8 +158,8 @@ void handleMethodGET_whenInstallersMissing_rendersHtmlPage() throws Exception { PageMaker pageMaker = mock(PageMaker.class); when(ctx.getPageMaker()).thenReturn(pageMaker); when(pageMaker.getPageNode(anyString(), eq(ctx))).thenReturn(page); - network.crypta.node.useralerts.UserAlertManager alertManager = - mock(network.crypta.node.useralerts.UserAlertManager.class); + network.crypta.runtime.alerts.UserAlertManager alertManager = + mock(network.crypta.runtime.alerts.UserAlertManager.class); when(ctx.getAlertManager()).thenReturn(alertManager); when(alertManager.createSummary()).thenReturn(new HTMLNode("#", "summary")); @@ -285,8 +285,8 @@ private void stubPageRendering(HTMLNode content) { PageMaker pageMaker = mock(PageMaker.class); when(ctx.getPageMaker()).thenReturn(pageMaker); when(pageMaker.getPageNode(anyString(), eq(ctx))).thenReturn(page); - network.crypta.node.useralerts.UserAlertManager alertManager = - mock(network.crypta.node.useralerts.UserAlertManager.class); + network.crypta.runtime.alerts.UserAlertManager alertManager = + mock(network.crypta.runtime.alerts.UserAlertManager.class); when(ctx.getAlertManager()).thenReturn(alertManager); when(alertManager.createSummary()).thenReturn(new HTMLNode("#", "summary")); diff --git a/src/test/java/network/crypta/clients/http/DecodeToadletTest.java b/src/test/java/network/crypta/clients/http/DecodeToadletTest.java index 5232ab36640..dab153e6a89 100644 --- a/src/test/java/network/crypta/clients/http/DecodeToadletTest.java +++ b/src/test/java/network/crypta/clients/http/DecodeToadletTest.java @@ -2,7 +2,7 @@ import java.net.URI; import network.crypta.client.HighLevelSimpleClient; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.api.HTTPRequest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/network/crypta/clients/http/FileInsertWizardToadletTest.java b/src/test/java/network/crypta/clients/http/FileInsertWizardToadletTest.java index 9fe1224a400..5aa0fe65c39 100644 --- a/src/test/java/network/crypta/clients/http/FileInsertWizardToadletTest.java +++ b/src/test/java/network/crypta/clients/http/FileInsertWizardToadletTest.java @@ -6,7 +6,7 @@ import java.net.URI; import java.time.Instant; import network.crypta.client.HighLevelSimpleClient; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.SecurityLevelsPort; import network.crypta.runtime.spi.SecurityLevelsSnapshot; import network.crypta.runtime.spi.SecurityNetworkThreatLevel; @@ -330,7 +330,7 @@ public boolean checkFullAccess(Toadlet toadlet) { } @Override - public network.crypta.node.useralerts.UserAlertManager getAlertManager() { + public network.crypta.runtime.alerts.UserAlertManager getAlertManager() { UserAlertManager manager = mock(UserAlertManager.class); when(manager.createSummary()).thenReturn(new HTMLNode("div")); when(manager.createSummary(true)).thenReturn(new HTMLNode("div")); diff --git a/src/test/java/network/crypta/clients/http/HTTPRequestImplTest.java b/src/test/java/network/crypta/clients/http/HTTPRequestImplTest.java index df822367d70..b50b979ef12 100644 --- a/src/test/java/network/crypta/clients/http/HTTPRequestImplTest.java +++ b/src/test/java/network/crypta/clients/http/HTTPRequestImplTest.java @@ -284,7 +284,7 @@ public boolean checkFullAccess(Toadlet toadlet) { } @Override - public network.crypta.node.useralerts.UserAlertManager getAlertManager() { + public network.crypta.runtime.alerts.UserAlertManager getAlertManager() { throw new UnsupportedOperationException(); } diff --git a/src/test/java/network/crypta/clients/http/InsertFreesiteToadletTest.java b/src/test/java/network/crypta/clients/http/InsertFreesiteToadletTest.java index 3cf77c1bc56..63f01272149 100644 --- a/src/test/java/network/crypta/clients/http/InsertFreesiteToadletTest.java +++ b/src/test/java/network/crypta/clients/http/InsertFreesiteToadletTest.java @@ -4,7 +4,7 @@ import java.nio.charset.StandardCharsets; import network.crypta.client.HighLevelSimpleClient; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.api.HTTPRequest; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/network/crypta/clients/http/PageMakerTest.java b/src/test/java/network/crypta/clients/http/PageMakerTest.java index 357100d6aef..2cacbd298f2 100644 --- a/src/test/java/network/crypta/clients/http/PageMakerTest.java +++ b/src/test/java/network/crypta/clients/http/PageMakerTest.java @@ -1,6 +1,6 @@ package network.crypta.clients.http; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.PageChromeSnapshot; import network.crypta.runtime.spi.SecurityNetworkThreatLevel; import network.crypta.runtime.spi.SecurityPhysicalThreatLevel; diff --git a/src/test/java/network/crypta/clients/http/QueueToadletPostDownloadTest.java b/src/test/java/network/crypta/clients/http/QueueToadletPostDownloadTest.java index 892328eb37e..68a21879184 100644 --- a/src/test/java/network/crypta/clients/http/QueueToadletPostDownloadTest.java +++ b/src/test/java/network/crypta/clients/http/QueueToadletPostDownloadTest.java @@ -37,7 +37,7 @@ import network.crypta.node.ProgramDirectory; import network.crypta.node.RequestStarterGroup; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.DarknetConnectionsPort; import network.crypta.runtime.spi.DarknetMessagingPort; import network.crypta.runtime.spi.QueueCompletionPort; diff --git a/src/test/java/network/crypta/clients/http/QueueToadletPostInsertTest.java b/src/test/java/network/crypta/clients/http/QueueToadletPostInsertTest.java index 82ccfc888b5..b5335b69efa 100644 --- a/src/test/java/network/crypta/clients/http/QueueToadletPostInsertTest.java +++ b/src/test/java/network/crypta/clients/http/QueueToadletPostInsertTest.java @@ -35,7 +35,7 @@ import network.crypta.node.ProgramDirectory; import network.crypta.node.RequestStarterGroup; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.DarknetConnectionsPort; import network.crypta.runtime.spi.DarknetMessagingPort; import network.crypta.runtime.spi.QueueBrowserUploadInsertRequest; diff --git a/src/test/java/network/crypta/clients/http/QueueToadletPostMutationTest.java b/src/test/java/network/crypta/clients/http/QueueToadletPostMutationTest.java index 1e8facd7b59..536fc015349 100644 --- a/src/test/java/network/crypta/clients/http/QueueToadletPostMutationTest.java +++ b/src/test/java/network/crypta/clients/http/QueueToadletPostMutationTest.java @@ -34,7 +34,7 @@ import network.crypta.node.ProgramDirectory; import network.crypta.node.RequestStarterGroup; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.DarknetConnectionsPort; import network.crypta.runtime.spi.DarknetMessagingPort; import network.crypta.runtime.spi.QueueCompletionPort; diff --git a/src/test/java/network/crypta/clients/http/QueueToadletRecommendTest.java b/src/test/java/network/crypta/clients/http/QueueToadletRecommendTest.java index 0c61cff7cf2..53df823df13 100644 --- a/src/test/java/network/crypta/clients/http/QueueToadletRecommendTest.java +++ b/src/test/java/network/crypta/clients/http/QueueToadletRecommendTest.java @@ -37,7 +37,7 @@ import network.crypta.node.ProgramDirectory; import network.crypta.node.RequestStarterGroup; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.DarknetConnectionPeerSnapshot; import network.crypta.runtime.spi.DarknetConnectionsPort; import network.crypta.runtime.spi.DarknetMessagingPort; diff --git a/src/test/java/network/crypta/clients/http/QueueToadletTest.java b/src/test/java/network/crypta/clients/http/QueueToadletTest.java index 55cfa49456f..c15730f7fa6 100644 --- a/src/test/java/network/crypta/clients/http/QueueToadletTest.java +++ b/src/test/java/network/crypta/clients/http/QueueToadletTest.java @@ -5,7 +5,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Path; import network.crypta.client.HighLevelSimpleClient; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.DarknetConnectionsPort; import network.crypta.runtime.spi.DarknetMessagingPort; import network.crypta.runtime.spi.QueueCompletionPort; diff --git a/src/test/java/network/crypta/clients/http/SimpleHelpToadletTest.java b/src/test/java/network/crypta/clients/http/SimpleHelpToadletTest.java index 510ed4849ae..7b9e814003a 100644 --- a/src/test/java/network/crypta/clients/http/SimpleHelpToadletTest.java +++ b/src/test/java/network/crypta/clients/http/SimpleHelpToadletTest.java @@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicReference; import network.crypta.client.HighLevelSimpleClient; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.api.HTTPRequest; import org.junit.jupiter.api.Test; diff --git a/src/test/java/network/crypta/clients/http/SimpleToadletServerTest.java b/src/test/java/network/crypta/clients/http/SimpleToadletServerTest.java index 5990ec1265f..c46df15d249 100644 --- a/src/test/java/network/crypta/clients/http/SimpleToadletServerTest.java +++ b/src/test/java/network/crypta/clients/http/SimpleToadletServerTest.java @@ -17,7 +17,7 @@ import network.crypta.io.SSLNetworkInterface; import network.crypta.node.NodeClientCore; import network.crypta.node.RequestStarter; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.endpoints.ClientEndpoints; import network.crypta.runtime.spi.RandomnessPort; import network.crypta.runtime.spi.RuntimePorts; diff --git a/src/test/java/network/crypta/clients/http/StatisticsToadletTest.java b/src/test/java/network/crypta/clients/http/StatisticsToadletTest.java index 02504efa8cf..2473d69e3e2 100644 --- a/src/test/java/network/crypta/clients/http/StatisticsToadletTest.java +++ b/src/test/java/network/crypta/clients/http/StatisticsToadletTest.java @@ -4,7 +4,7 @@ import java.net.URI; import java.nio.charset.StandardCharsets; import network.crypta.client.HighLevelSimpleClient; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.StatisticsPageSnapshot; import network.crypta.runtime.spi.StatisticsPort; import network.crypta.support.HTMLNode; diff --git a/src/test/java/network/crypta/clients/http/ToadletContextImplTest.java b/src/test/java/network/crypta/clients/http/ToadletContextImplTest.java index dba868ea6c0..39ca832648c 100644 --- a/src/test/java/network/crypta/clients/http/ToadletContextImplTest.java +++ b/src/test/java/network/crypta/clients/http/ToadletContextImplTest.java @@ -13,7 +13,7 @@ import java.util.Locale; import java.util.Map; import network.crypta.clients.http.bookmark.BookmarkManager; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.MultiValueTable; import network.crypta.support.api.BucketFactory; import network.crypta.support.api.HTTPRequest; diff --git a/src/test/java/network/crypta/clients/http/UserAlertsToadletTest.java b/src/test/java/network/crypta/clients/http/UserAlertsToadletTest.java index 35d3484c3ae..33f1c04c3e9 100644 --- a/src/test/java/network/crypta/clients/http/UserAlertsToadletTest.java +++ b/src/test/java/network/crypta/clients/http/UserAlertsToadletTest.java @@ -4,10 +4,10 @@ import javax.naming.SizeLimitExceededException; import network.crypta.client.HighLevelSimpleClient; import network.crypta.clients.fcp.FCPMessage; -import network.crypta.node.useralerts.AbstractNodeToNodeFileOfferUserAlert; -import network.crypta.node.useralerts.NodeToNodeMessageUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.AbstractNodeToNodeFileOfferUserAlert; +import network.crypta.runtime.alerts.NodeToNodeMessageUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.MultiValueTable; import network.crypta.support.api.HTTPRequest; diff --git a/src/test/java/network/crypta/clients/http/WelcomeToadletTest.java b/src/test/java/network/crypta/clients/http/WelcomeToadletTest.java index 66c1f8f22d5..7b152b0cc67 100644 --- a/src/test/java/network/crypta/clients/http/WelcomeToadletTest.java +++ b/src/test/java/network/crypta/clients/http/WelcomeToadletTest.java @@ -10,8 +10,8 @@ import network.crypta.client.HighLevelSimpleClient; import network.crypta.clients.http.PageMaker.RenderParameters; import network.crypta.clients.http.bookmark.BookmarkItem; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.DarknetConnectionPeerSnapshot; import network.crypta.runtime.spi.DarknetConnectionsPort; import network.crypta.runtime.spi.LifecyclePort; diff --git a/src/test/java/network/crypta/clients/http/bookmark/BookmarkCategoryTest.java b/src/test/java/network/crypta/clients/http/bookmark/BookmarkCategoryTest.java index 467affb85f6..ea81a9f6624 100644 --- a/src/test/java/network/crypta/clients/http/bookmark/BookmarkCategoryTest.java +++ b/src/test/java/network/crypta/clients/http/bookmark/BookmarkCategoryTest.java @@ -4,7 +4,7 @@ import java.util.List; import network.crypta.keys.FreenetURI; import network.crypta.node.FSParseException; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.SimpleFieldSet; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/network/crypta/clients/http/bookmark/BookmarkItemTest.java b/src/test/java/network/crypta/clients/http/bookmark/BookmarkItemTest.java index 303699fd985..298fb31b818 100644 --- a/src/test/java/network/crypta/clients/http/bookmark/BookmarkItemTest.java +++ b/src/test/java/network/crypta/clients/http/bookmark/BookmarkItemTest.java @@ -5,8 +5,8 @@ import java.util.stream.Stream; import network.crypta.keys.FreenetURI; import network.crypta.keys.USK; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.SimpleFieldSet; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/network/crypta/clients/http/bookmark/BookmarkManagerTest.java b/src/test/java/network/crypta/clients/http/bookmark/BookmarkManagerTest.java index 9d1c8a9177d..2f9e534c9a9 100644 --- a/src/test/java/network/crypta/clients/http/bookmark/BookmarkManagerTest.java +++ b/src/test/java/network/crypta/clients/http/bookmark/BookmarkManagerTest.java @@ -11,7 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger; import network.crypta.keys.FreenetURI; import network.crypta.keys.USK; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.SimpleFieldSet; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/network/crypta/node/AnnouncerTest.java b/src/test/java/network/crypta/node/AnnouncerTest.java index 25ae6d87558..1152487970d 100644 --- a/src/test/java/network/crypta/node/AnnouncerTest.java +++ b/src/test/java/network/crypta/node/AnnouncerTest.java @@ -7,8 +7,8 @@ import java.util.List; import network.crypta.node.updater.NodeUpdateManager; import network.crypta.node.updater.UpdateOverMandatoryManager; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.PriorityAwareExecutor; import network.crypta.support.SimpleFieldSet; import network.crypta.support.Ticker; diff --git a/src/test/java/network/crypta/node/BandwidthManagerTest.java b/src/test/java/network/crypta/node/BandwidthManagerTest.java index 77167172589..b30d32f66b4 100644 --- a/src/test/java/network/crypta/node/BandwidthManagerTest.java +++ b/src/test/java/network/crypta/node/BandwidthManagerTest.java @@ -5,8 +5,8 @@ import network.crypta.config.PersistentConfig; import network.crypta.config.SubConfig; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.SizeUtil; import network.crypta.support.Ticker; diff --git a/src/test/java/network/crypta/node/IPDetectorManagerTest.java b/src/test/java/network/crypta/node/IPDetectorManagerTest.java index 84ea5019d68..c8015fa152c 100644 --- a/src/test/java/network/crypta/node/IPDetectorManagerTest.java +++ b/src/test/java/network/crypta/node/IPDetectorManagerTest.java @@ -282,17 +282,17 @@ void addConnectionTypeBox_whenProxyAlertValid_renders() throws Exception { // Provide a client core + alerts that can render NodeClientCore core = mock(NodeClientCore.class); - network.crypta.node.useralerts.UserAlertManager alerts = - mock(network.crypta.node.useralerts.UserAlertManager.class); + network.crypta.runtime.alerts.UserAlertManager alerts = + mock(network.crypta.runtime.alerts.UserAlertManager.class); when(core.getAlerts()).thenReturn(alerts); when(node.services().clientCore()).thenReturn(core); when(alerts.renderAlert(any())).thenReturn(new HTMLNode("div")); // Install a ProxyUserAlert with an underlying always-valid alert via reflection - network.crypta.node.useralerts.ProxyUserAlert proxy = - new network.crypta.node.useralerts.ProxyUserAlert(alerts, false); + network.crypta.runtime.alerts.ProxyUserAlert proxy = + new network.crypta.runtime.alerts.ProxyUserAlert(alerts, false); proxy.setAlert( - new network.crypta.node.useralerts.UserAlert() { + new network.crypta.runtime.alerts.UserAlert() { @Override public boolean userCanDismiss() { return true; diff --git a/src/test/java/network/crypta/node/NodeClientCoreSupportTest.java b/src/test/java/network/crypta/node/NodeClientCoreSupportTest.java index ae4b2cbf1fa..e269b5b01fd 100644 --- a/src/test/java/network/crypta/node/NodeClientCoreSupportTest.java +++ b/src/test/java/network/crypta/node/NodeClientCoreSupportTest.java @@ -26,11 +26,11 @@ import network.crypta.keys.SSKBlock; import network.crypta.keys.SSKEncodeException; import network.crypta.keys.SSKVerifyException; -import network.crypta.node.useralerts.DatastoreTooSmallAlert; -import network.crypta.node.useralerts.DiskSpaceUserAlert; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.DatastoreTooSmallAlert; +import network.crypta.runtime.alerts.DiskSpaceUserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.SimpleReadOnlyArrayBucket; import network.crypta.support.compress.Compressor; import network.crypta.support.compress.InvalidCompressionCodecException; diff --git a/src/test/java/network/crypta/node/NodeClientCoreTest.java b/src/test/java/network/crypta/node/NodeClientCoreTest.java index 797c2bfdbfc..6498e46e5c7 100644 --- a/src/test/java/network/crypta/node/NodeClientCoreTest.java +++ b/src/test/java/network/crypta/node/NodeClientCoreTest.java @@ -21,7 +21,7 @@ import network.crypta.node.SecurityLevels.PHYSICAL_THREAT_LEVEL; import network.crypta.node.runtime.LegacyRuntimePorts; import network.crypta.node.subsystem.NodeServicesSubsystem; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.endpoints.ClientEndpoints; import network.crypta.runtime.endpoints.NodeClientPersistence; import network.crypta.runtime.spi.RuntimePorts; diff --git a/src/test/java/network/crypta/node/NodeIPDetectorTest.java b/src/test/java/network/crypta/node/NodeIPDetectorTest.java index ee60ee4ad54..4b47752a47d 100644 --- a/src/test/java/network/crypta/node/NodeIPDetectorTest.java +++ b/src/test/java/network/crypta/node/NodeIPDetectorTest.java @@ -14,9 +14,9 @@ import network.crypta.config.SubConfig; import network.crypta.io.comm.FreenetInetAddress; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.InvalidAddressOverrideUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.InvalidAddressOverrideUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.PriorityAwareExecutor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/network/crypta/node/PeerAlertCoordinatorTest.java b/src/test/java/network/crypta/node/PeerAlertCoordinatorTest.java index d7eb01f1af9..9beb28d90d3 100644 --- a/src/test/java/network/crypta/node/PeerAlertCoordinatorTest.java +++ b/src/test/java/network/crypta/node/PeerAlertCoordinatorTest.java @@ -2,9 +2,9 @@ import java.lang.reflect.Field; import network.crypta.node.updater.NodeUpdateManager; -import network.crypta.node.useralerts.PeerManagerUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.PeerManagerUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; diff --git a/src/test/java/network/crypta/node/subsystem/NodeConfigManagerTest.java b/src/test/java/network/crypta/node/subsystem/NodeConfigManagerTest.java index 5b7df8cba67..951186180dc 100644 --- a/src/test/java/network/crypta/node/subsystem/NodeConfigManagerTest.java +++ b/src/test/java/network/crypta/node/subsystem/NodeConfigManagerTest.java @@ -10,8 +10,8 @@ import network.crypta.config.SubConfig; import network.crypta.node.Node; import network.crypta.node.ProgramDirectory; -import network.crypta.node.useralerts.MeaningfulNodeNameUserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.MeaningfulNodeNameUserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.SimpleFieldSet; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/network/crypta/node/subsystem/NodeServicesSubsystemTest.java b/src/test/java/network/crypta/node/subsystem/NodeServicesSubsystemTest.java index 08fec420e4a..eb8509563e7 100644 --- a/src/test/java/network/crypta/node/subsystem/NodeServicesSubsystemTest.java +++ b/src/test/java/network/crypta/node/subsystem/NodeServicesSubsystemTest.java @@ -11,14 +11,14 @@ import network.crypta.node.NodeInitException; import network.crypta.node.diagnostics.DefaultNodeDiagnostics; import network.crypta.node.updater.NodeUpdateManager; -import network.crypta.node.useralerts.JVMVersionAlert; -import network.crypta.node.useralerts.MeaningfulNodeNameUserAlert; -import network.crypta.node.useralerts.NotEnoughNiceLevelsUserAlert; -import network.crypta.node.useralerts.PeersOffersUserAlert; -import network.crypta.node.useralerts.SimpleUserAlert; -import network.crypta.node.useralerts.TimeSkewDetectedUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.JVMVersionAlert; +import network.crypta.runtime.alerts.MeaningfulNodeNameUserAlert; +import network.crypta.runtime.alerts.NotEnoughNiceLevelsUserAlert; +import network.crypta.runtime.alerts.PeersOffersUserAlert; +import network.crypta.runtime.alerts.SimpleUserAlert; +import network.crypta.runtime.alerts.TimeSkewDetectedUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.JVMVersion; import network.crypta.support.PriorityAwareExecutor; import network.crypta.support.Ticker; diff --git a/src/test/java/network/crypta/node/subsystem/NodeStorageSubsystemTest.java b/src/test/java/network/crypta/node/subsystem/NodeStorageSubsystemTest.java index bccfd3f7bef..e3bd8212b8b 100644 --- a/src/test/java/network/crypta/node/subsystem/NodeStorageSubsystemTest.java +++ b/src/test/java/network/crypta/node/subsystem/NodeStorageSubsystemTest.java @@ -13,8 +13,8 @@ import network.crypta.node.NodeInitException; import network.crypta.node.ProgramDirectory; import network.crypta.node.SecurityLevels; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.store.CHKStore; import network.crypta.store.FreenetStore; import network.crypta.store.saltedhash.SaltedHashFreenetStore; diff --git a/src/test/java/network/crypta/node/updater/NodeUpdateManagerTest.java b/src/test/java/network/crypta/node/updater/NodeUpdateManagerTest.java index ebd771cf0a4..4e40d0bf439 100644 --- a/src/test/java/network/crypta/node/updater/NodeUpdateManagerTest.java +++ b/src/test/java/network/crypta/node/updater/NodeUpdateManagerTest.java @@ -34,8 +34,8 @@ import network.crypta.node.PeerNode; import network.crypta.node.ProgramDirectory; import network.crypta.node.Version; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.HTMLNode; import network.crypta.support.SimpleFieldSet; import network.crypta.support.io.ArrayBucket; diff --git a/src/test/java/network/crypta/node/updater/UpdateOverMandatoryManagerTest.java b/src/test/java/network/crypta/node/updater/UpdateOverMandatoryManagerTest.java index ac0e905f769..535497571dc 100644 --- a/src/test/java/network/crypta/node/updater/UpdateOverMandatoryManagerTest.java +++ b/src/test/java/network/crypta/node/updater/UpdateOverMandatoryManagerTest.java @@ -12,7 +12,7 @@ import network.crypta.node.NodeClientCore; import network.crypta.node.PeerNode; import network.crypta.node.PeerTransport; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.Ticker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -161,8 +161,8 @@ void handleAnnounce_whenRevocationKeyMatches_expectPeerClaimedAndAlertRegistered verify(updateManager, times(1)).peerClaimsKeyBlown(); // An alert is registered exactly once for the first matching announcement - ArgumentCaptor alertCaptor = - ArgumentCaptor.forClass(network.crypta.node.useralerts.UserAlert.class); + ArgumentCaptor alertCaptor = + ArgumentCaptor.forClass(network.crypta.runtime.alerts.UserAlert.class); verify(alertManager, times(1)).register(alertCaptor.capture()); assertNotNull(alertCaptor.getValue(), "Alert instance must be non-null"); diff --git a/src/test/java/network/crypta/runtime/admin/LegacyQueueCompletionPortTest.java b/src/test/java/network/crypta/runtime/admin/LegacyQueueCompletionPortTest.java index 3d9c460869f..8a8cd008db4 100644 --- a/src/test/java/network/crypta/runtime/admin/LegacyQueueCompletionPortTest.java +++ b/src/test/java/network/crypta/runtime/admin/LegacyQueueCompletionPortTest.java @@ -36,8 +36,8 @@ import network.crypta.node.NodeClientCore; import network.crypta.node.ProgramDirectory; import network.crypta.node.subsystem.NodeNetworkSubsystem; -import network.crypta.node.useralerts.UserAlertManager; -import network.crypta.node.useralerts.UserEvent; +import network.crypta.runtime.alerts.UserAlertManager; +import network.crypta.runtime.alerts.UserEvent; import network.crypta.runtime.endpoints.ClientEndpoints; import network.crypta.support.MemoryLimitedJobRunner; import network.crypta.support.PriorityAwareExecutor; diff --git a/src/test/java/network/crypta/runtime/admin/LegacyWelcomeActionPortTest.java b/src/test/java/network/crypta/runtime/admin/LegacyWelcomeActionPortTest.java index 007fb2bc7b0..3cc1bb48faf 100644 --- a/src/test/java/network/crypta/runtime/admin/LegacyWelcomeActionPortTest.java +++ b/src/test/java/network/crypta/runtime/admin/LegacyWelcomeActionPortTest.java @@ -6,9 +6,9 @@ import network.crypta.node.Node; import network.crypta.node.NodeStarter; import network.crypta.node.updater.NodeUpdateManager; -import network.crypta.node.useralerts.UpgradeConnectionSpeedUserAlert; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UpgradeConnectionSpeedUserAlert; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.support.Ticker; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/network/crypta/node/useralerts/BookmarkFeedUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/BookmarkFeedUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/BookmarkFeedUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/BookmarkFeedUserAlertTest.java index e21efae713b..d37a0b51d5a 100644 --- a/src/test/java/network/crypta/node/useralerts/BookmarkFeedUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/BookmarkFeedUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.lang.ref.WeakReference; import java.net.MalformedURLException; diff --git a/src/test/java/network/crypta/node/useralerts/DatastoreTooSmallAlertTest.java b/src/test/java/network/crypta/runtime/alerts/DatastoreTooSmallAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/DatastoreTooSmallAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/DatastoreTooSmallAlertTest.java index 0f2b7271ce9..2f361890f35 100644 --- a/src/test/java/network/crypta/node/useralerts/DatastoreTooSmallAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/DatastoreTooSmallAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.nio.file.Path; import network.crypta.clients.fcp.FCPMessage; diff --git a/src/test/java/network/crypta/node/useralerts/DiskSpaceUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/DiskSpaceUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/DiskSpaceUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/DiskSpaceUserAlertTest.java index 3262c5d85ed..1d0e768b0c8 100644 --- a/src/test/java/network/crypta/node/useralerts/DiskSpaceUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/DiskSpaceUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import network.crypta.clients.fcp.FCPMessage; diff --git a/src/test/java/network/crypta/node/useralerts/DownloadFeedUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/DownloadFeedUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/DownloadFeedUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/DownloadFeedUserAlertTest.java index d7b90fa0dea..f8559a53d2a 100644 --- a/src/test/java/network/crypta/node/useralerts/DownloadFeedUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/DownloadFeedUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.lang.ref.WeakReference; import java.net.MalformedURLException; diff --git a/src/test/java/network/crypta/node/useralerts/DroppedOldPeersUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/DroppedOldPeersUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/DroppedOldPeersUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/DroppedOldPeersUserAlertTest.java index 5024fedeb24..d7220948ed6 100644 --- a/src/test/java/network/crypta/node/useralerts/DroppedOldPeersUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/DroppedOldPeersUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import java.time.Instant; diff --git a/src/test/java/network/crypta/node/useralerts/IPUndetectedUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/IPUndetectedUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/IPUndetectedUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/IPUndetectedUserAlertTest.java index 2a0304b0081..7235f743e77 100644 --- a/src/test/java/network/crypta/node/useralerts/IPUndetectedUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/IPUndetectedUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.util.concurrent.TimeUnit; import network.crypta.config.Option; diff --git a/src/test/java/network/crypta/node/useralerts/InvalidAddressOverrideUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/InvalidAddressOverrideUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/InvalidAddressOverrideUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/InvalidAddressOverrideUserAlertTest.java index c406bd246c5..be161f4c583 100644 --- a/src/test/java/network/crypta/node/useralerts/InvalidAddressOverrideUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/InvalidAddressOverrideUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.config.Option; import network.crypta.config.PersistentConfig; diff --git a/src/test/java/network/crypta/node/useralerts/JVMVersionAlertTest.java b/src/test/java/network/crypta/runtime/alerts/JVMVersionAlertTest.java similarity index 98% rename from src/test/java/network/crypta/node/useralerts/JVMVersionAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/JVMVersionAlertTest.java index a89b2ed05b8..0ec5a5ba329 100644 --- a/src/test/java/network/crypta/node/useralerts/JVMVersionAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/JVMVersionAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLNode; diff --git a/src/test/java/network/crypta/node/useralerts/MeaningfulNodeNameUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/MeaningfulNodeNameUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/MeaningfulNodeNameUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/MeaningfulNodeNameUserAlertTest.java index d07c27368fa..133d253c5c4 100644 --- a/src/test/java/network/crypta/node/useralerts/MeaningfulNodeNameUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/MeaningfulNodeNameUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.util.List; import network.crypta.config.Option; diff --git a/src/test/java/network/crypta/node/useralerts/N2NTMUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/N2NTMUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/N2NTMUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/N2NTMUserAlertTest.java index 2606a4405d1..c27f085ccdb 100644 --- a/src/test/java/network/crypta/node/useralerts/N2NTMUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/N2NTMUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import java.lang.ref.WeakReference; diff --git a/src/test/java/network/crypta/node/useralerts/NotEnoughNiceLevelsUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/NotEnoughNiceLevelsUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/NotEnoughNiceLevelsUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/NotEnoughNiceLevelsUserAlertTest.java index def279fd02d..257962e14d0 100644 --- a/src/test/java/network/crypta/node/useralerts/NotEnoughNiceLevelsUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/NotEnoughNiceLevelsUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.l10n.NodeL10n; import network.crypta.support.HTMLEncoder; diff --git a/src/test/java/network/crypta/node/useralerts/PeerManagerUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/PeerManagerUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/PeerManagerUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/PeerManagerUserAlertTest.java index 86b8824b613..dd6958f7cef 100644 --- a/src/test/java/network/crypta/node/useralerts/PeerManagerUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/PeerManagerUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.lang.reflect.Field; import java.util.function.Consumer; diff --git a/src/test/java/network/crypta/node/useralerts/PeersOffersUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/PeersOffersUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/PeersOffersUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/PeersOffersUserAlertTest.java index e3219c7fcd2..5a556c7bbf5 100644 --- a/src/test/java/network/crypta/node/useralerts/PeersOffersUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/PeersOffersUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/src/test/java/network/crypta/node/useralerts/ProxyUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/ProxyUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/ProxyUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/ProxyUserAlertTest.java index 39b48ef552b..a6d1f202080 100644 --- a/src/test/java/network/crypta/node/useralerts/ProxyUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/ProxyUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.support.HTMLNode; import org.junit.jupiter.api.Test; diff --git a/src/test/java/network/crypta/node/useralerts/RevocationKeyFoundUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/RevocationKeyFoundUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/RevocationKeyFoundUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/RevocationKeyFoundUserAlertTest.java index 6e8fa887426..63f68dd083d 100644 --- a/src/test/java/network/crypta/node/useralerts/RevocationKeyFoundUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/RevocationKeyFoundUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import network.crypta.l10n.BaseL10n.LANGUAGE; diff --git a/src/test/java/network/crypta/node/useralerts/SimpleUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/SimpleUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/SimpleUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/SimpleUserAlertTest.java index 26a921094c0..a64de8d134b 100644 --- a/src/test/java/network/crypta/node/useralerts/SimpleUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/SimpleUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.fcp.FCPMessage; import network.crypta.l10n.NodeL10n; diff --git a/src/test/java/network/crypta/node/useralerts/TimeSkewDetectedUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/TimeSkewDetectedUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/TimeSkewDetectedUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/TimeSkewDetectedUserAlertTest.java index 059217b6c60..e83ac4cfb98 100644 --- a/src/test/java/network/crypta/node/useralerts/TimeSkewDetectedUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/TimeSkewDetectedUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.fcp.FCPMessage; import network.crypta.l10n.NodeL10n; diff --git a/src/test/java/network/crypta/node/useralerts/UpdatedVersionAvailableUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/UpdatedVersionAvailableUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/UpdatedVersionAvailableUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/UpdatedVersionAvailableUserAlertTest.java index e9a17eb50e4..5d813e2e116 100644 --- a/src/test/java/network/crypta/node/useralerts/UpdatedVersionAvailableUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/UpdatedVersionAvailableUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.File; import java.io.IOException; diff --git a/src/test/java/network/crypta/node/useralerts/UpgradeConnectionSpeedUserAlertTest.java b/src/test/java/network/crypta/runtime/alerts/UpgradeConnectionSpeedUserAlertTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/UpgradeConnectionSpeedUserAlertTest.java rename to src/test/java/network/crypta/runtime/alerts/UpgradeConnectionSpeedUserAlertTest.java index 00a08a8b954..ad3936a5f2f 100644 --- a/src/test/java/network/crypta/node/useralerts/UpgradeConnectionSpeedUserAlertTest.java +++ b/src/test/java/network/crypta/runtime/alerts/UpgradeConnectionSpeedUserAlertTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import network.crypta.clients.http.wizardsteps.BandwidthLimit; import network.crypta.config.Option; diff --git a/src/test/java/network/crypta/node/runtime/UserAlertManagerStoreAlertSinkTest.java b/src/test/java/network/crypta/runtime/alerts/UserAlertManagerStoreAlertSinkTest.java similarity index 98% rename from src/test/java/network/crypta/node/runtime/UserAlertManagerStoreAlertSinkTest.java rename to src/test/java/network/crypta/runtime/alerts/UserAlertManagerStoreAlertSinkTest.java index 3f13660107a..454ab2f5a4c 100644 --- a/src/test/java/network/crypta/node/runtime/UserAlertManagerStoreAlertSinkTest.java +++ b/src/test/java/network/crypta/runtime/alerts/UserAlertManagerStoreAlertSinkTest.java @@ -1,12 +1,10 @@ -package network.crypta.node.runtime; +package network.crypta.runtime.alerts; import java.lang.reflect.Method; import network.crypta.l10n.BaseL10n.LANGUAGE; import network.crypta.l10n.BaseL10n; import network.crypta.l10n.L10nTestUtils; import network.crypta.l10n.NodeL10n; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; import network.crypta.store.alerts.StoreMaintenanceAlertKind; import network.crypta.store.alerts.StoreMaintenanceAlertSource; import network.crypta.support.HTMLNode; diff --git a/src/test/java/network/crypta/node/useralerts/UserAlertManagerTest.java b/src/test/java/network/crypta/runtime/alerts/UserAlertManagerTest.java similarity index 99% rename from src/test/java/network/crypta/node/useralerts/UserAlertManagerTest.java rename to src/test/java/network/crypta/runtime/alerts/UserAlertManagerTest.java index 094195ffd30..e94dac97c0b 100644 --- a/src/test/java/network/crypta/node/useralerts/UserAlertManagerTest.java +++ b/src/test/java/network/crypta/runtime/alerts/UserAlertManagerTest.java @@ -1,4 +1,4 @@ -package network.crypta.node.useralerts; +package network.crypta.runtime.alerts; import java.io.StringReader; import java.lang.reflect.Method; diff --git a/src/test/java/network/crypta/runtime/endpoints/ClientEndpointsTest.java b/src/test/java/network/crypta/runtime/endpoints/ClientEndpointsTest.java index e5657a96f1f..b2308b271fd 100644 --- a/src/test/java/network/crypta/runtime/endpoints/ClientEndpointsTest.java +++ b/src/test/java/network/crypta/runtime/endpoints/ClientEndpointsTest.java @@ -8,8 +8,8 @@ import network.crypta.node.Node; import network.crypta.node.NodeClientCore; import network.crypta.node.NodeClientCoreSupport; -import network.crypta.node.useralerts.UserAlert; -import network.crypta.node.useralerts.UserAlertManager; +import network.crypta.runtime.alerts.UserAlert; +import network.crypta.runtime.alerts.UserAlertManager; import network.crypta.runtime.spi.RuntimePorts; import network.crypta.support.io.TempBucketFactory; import org.junit.jupiter.api.Test;