From c57b98c89efa2710b2f68ec902a25921c5559772 Mon Sep 17 00:00:00 2001
From: Hellblazer <hellblazer@me.com>
Date: Sun, 23 Apr 2023 11:16:10 -0700
Subject: [PATCH] router cleanup

---
 .../salesforce/apollo/archipelago/Router.java | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/memberships/src/main/java/com/salesforce/apollo/archipelago/Router.java b/memberships/src/main/java/com/salesforce/apollo/archipelago/Router.java
index 6a4b362a7..851a4408f 100644
--- a/memberships/src/main/java/com/salesforce/apollo/archipelago/Router.java
+++ b/memberships/src/main/java/com/salesforce/apollo/archipelago/Router.java
@@ -25,6 +25,14 @@
  */
 public interface Router {
 
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_TO_ID_SERVER = "com.salesforce.apollo.archipeligo.to.id.server";
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_CONTEXT_ID_SERVER = "com.salesforce.apollo.archipeligo.context.id.server";
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_FROM_ID_SERVER = "com.salesforce.apollo.archipeligo.from.id.server";
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_TO_ID = "com.salesforce.apollo.archipeligo.to.id";
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_CONTEXT_ID = "com.salesforce.apollo.archipeligo.context.id";
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_FROM_ID = "com.salesforce.apollo.archipeligo.from.id";
+    public static final String COM_SALESFORCE_APOLLO_ARCHIPELIGO_FROM_ID_CLIENT = "com.salesforce.apollo.archipeligo.from.id.client";
+
     @FunctionalInterface
     interface ClientConnector<Client> {
         Client connect(Member to);
@@ -36,16 +44,16 @@ default String routing() {
         }
     }
 
-    Context.Key<Digest>  CLIENT_CLIENT_ID_KEY   = Context.key("com.salesforce.apollo.archipeligo.from.id.client");
-    Metadata.Key<String> METADATA_CLIENT_ID_KEY = Metadata.Key.of("com.salesforce.apollo.archipeligo.from.id",
+    Context.Key<Digest>  CLIENT_CLIENT_ID_KEY   = Context.key(COM_SALESFORCE_APOLLO_ARCHIPELIGO_FROM_ID_CLIENT);
+    Metadata.Key<String> METADATA_CLIENT_ID_KEY = Metadata.Key.of(COM_SALESFORCE_APOLLO_ARCHIPELIGO_FROM_ID,
                                                                   Metadata.ASCII_STRING_MARSHALLER);
-    Metadata.Key<String> METADATA_CONTEXT_KEY   = Metadata.Key.of("com.salesforce.apollo.archipeligo.context.id",
+    Metadata.Key<String> METADATA_CONTEXT_KEY   = Metadata.Key.of(COM_SALESFORCE_APOLLO_ARCHIPELIGO_CONTEXT_ID,
                                                                   Metadata.ASCII_STRING_MARSHALLER);
-    Metadata.Key<String> METADATA_TARGET_KEY    = Metadata.Key.of("com.salesforce.apollo.archipeligo.to.id",
+    Metadata.Key<String> METADATA_TARGET_KEY    = Metadata.Key.of(COM_SALESFORCE_APOLLO_ARCHIPELIGO_TO_ID,
                                                                   Metadata.ASCII_STRING_MARSHALLER);
-    Context.Key<Digest>  SERVER_CLIENT_ID_KEY   = Context.key("com.salesforce.apollo.archipeligo.from.id.server");
-    Context.Key<Digest>  SERVER_CONTEXT_KEY     = Context.key("com.salesforce.apollo.archipeligo.context.id.server");
-    Context.Key<Digest>  SERVER_TARGET_KEY      = Context.key("com.salesforce.apollo.archipeligo.to.id.server");
+    Context.Key<Digest>  SERVER_CLIENT_ID_KEY   = Context.key(COM_SALESFORCE_APOLLO_ARCHIPELIGO_FROM_ID_SERVER);
+    Context.Key<Digest>  SERVER_CONTEXT_KEY     = Context.key(COM_SALESFORCE_APOLLO_ARCHIPELIGO_CONTEXT_ID_SERVER);
+    Context.Key<Digest>  SERVER_TARGET_KEY      = Context.key(COM_SALESFORCE_APOLLO_ARCHIPELIGO_TO_ID_SERVER);
 
     void close(Duration await);