refactor(runtime-alerts): Re-home legacy alert package

build-logic/spotbugs-exclude-test.xml

@@ -205,12 +205,12 @@
   </Match>
   <Match>
     <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME"/>
-    <Class name="network.crypta.node.useralerts.DiskSpaceUserAlertTest"/>
+    <Class name="network.crypta.runtime.alerts.DiskSpaceUserAlertTest"/>
     <Method name="basic_properties_areConsistent"/>
   </Match>
   <Match>
     <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME"/>
-    <Class name="network.crypta.node.useralerts.DiskSpaceUserAlertTest"/>
+    <Class name="network.crypta.runtime.alerts.DiskSpaceUserAlertTest"/>
     <Method name="isValid_boolean_noop_doesNotChangeValidity"/>
   </Match>
 </FindBugsFilter>

build-logic/spotbugs-exclude.xml

@@ -1450,55 +1450,55 @@
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.AbstractUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.AbstractUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.AbstractUserAlert$Body"/>
+    <Class name="network.crypta.runtime.alerts.AbstractUserAlert$Body"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.BookmarkFeedUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.BookmarkFeedUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.DatastoreTooSmallAlert"/>
+    <Class name="network.crypta.runtime.alerts.DatastoreTooSmallAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.DiskSpaceUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.DiskSpaceUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.DownloadFeedUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.DownloadFeedUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.IPUndetectedUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.IPUndetectedUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.InvalidAddressOverrideUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.InvalidAddressOverrideUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.MeaningfulNodeNameUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.MeaningfulNodeNameUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.NodeToNodeAlertContext"/>
+    <Class name="network.crypta.runtime.alerts.NodeToNodeAlertContext"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.PeerManagerUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.PeerManagerUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.UpdatedVersionAvailableUserAlert"/>
+    <Class name="network.crypta.runtime.alerts.UpdatedVersionAvailableUserAlert"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>
-    <Class name="network.crypta.node.useralerts.UserAlertManager"/>
+    <Class name="network.crypta.runtime.alerts.UserAlertManager"/>
   </Match>
   <Match>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2"/>

build.gradle.kts

@@ -304,15 +304,50 @@ 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<org.sonarqube.gradle.SonarExtension>("sonar") { isSkipProject = true }
 }
 
 project.wireSelectiveLeafOutputPruning(pruneSelectiveLeafOutputs, rootSelectiveLeafPruneTaskNames)
 
+project.wireSelectiveLeafOutputPruning(
+  pruneLegacyRuntimeAlertsOutputs,
+  rootSelectiveLeafPruneTaskNames,
+)
+
 tasks.named<org.gradle.jvm.tasks.Jar>("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 })

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;

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 {
   /**

src/main/java/network/crypta/clients/fcp/WatchFeedsMessage.java

@@ -24,7 +24,7 @@
  * </ul>
  *
  * @see network.crypta.clients.fcp.FCPConnectionHandler
- * @see network.crypta.node.useralerts.UserAlertManager
+ * @see network.crypta.runtime.alerts.UserAlertManager
  */
 public class WatchFeedsMessage extends FCPMessage {
 

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;

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;
 

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;
 

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;

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;

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;

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.

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);
     }

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.

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;