Extract the URI addressing scheme out of Transport

Transport carried six fields describing the shape of its URIs, plus the
routing part cache, and spread the parsing of them across the constructor,
init(), sendMessage(), getRoutingPart() and manageCommunicationChannel().

Move them into a new TransportAddressing, which also takes over the three
computations that were inline: deriving the service delimiter count, building
the base URI, and the cached routing part lookup. init() is now one line.

getRoutingPart() stays an overridable method on Transport delegating to the
new class, because SPPBaseTransport overrides it to parse on the protocol
delimiter instead.

The six fields were protected, so this is source and binary incompatible for
any transport outside this repository that read them. The five in this
repository are updated here; nanosat-mo-framework has no references.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

Author: CesarCoelho

transports/transport-file/src/main/java/esa/mo/mal/transport/file/FileTransport.java

@@ -171,7 +171,8 @@ protected String createTransportAddress() throws MALException {
     @Override
     protected Endpoint internalCreateEndpoint(String localName,
             String routingName, Map qosProperties, NamedValueList supplements) throws MALException {
-        return new Endpoint(this, localName, routingName, uriBase + localName, false, supplements);
+        return new Endpoint(this, localName, routingName,
+                addressing.getUriBase() + localName, false, supplements);
     }
 
     @Override

transports/transport-generic/src/main/java/esa/mo/mal/transport/gen/Transport.java

@@ -30,7 +30,6 @@
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.logging.Level;
@@ -79,28 +78,9 @@ public abstract class Transport<I, O> implements MALTransport {
      */
     protected static final Random RANDOM_NAME = new Random();
     /**
-     * The delimiter to use to separate the protocol part from the address part
-     * of the URL.
+     * The shape of the URIs used by this transport, and the parsing of them.
      */
-    protected final String protocolDelim;
-    /**
-     * The delimiter to use to separate the external address part from the
-     * internal object part of the URL.
-     */
-    protected final char serviceDelim;
-    /**
-     * If the protocol delimiter is the same as the service delimiter then we
-     * need a count to find the correct service delimiter.
-     */
-    protected final int serviceDelimCounter;
-    /**
-     * Delimiter to use when holding routing information in a URL
-     */
-    protected final char routingDelim;
-    /**
-     * True if protocol supports the concept of routing.
-     */
-    protected final boolean supportsRouting;
+    protected final TransportAddressing addressing;
     /**
      * True if calls to ourselves should be handled in-process i.e. not via the
      * underlying transport.
@@ -110,10 +90,6 @@ public abstract class Transport<I, O> implements MALTransport {
      * The timeout in seconds to wait for confirmation of delivery.
      */
     protected final int deliveryTimeout;
-    /**
-     * The string used to represent this protocol.
-     */
-    protected final String protocol;
     /**
      * The endpoints created by this transport, indexed by MAL local name and by
      * transport routing name.
@@ -147,14 +123,6 @@ public abstract class Transport<I, O> implements MALTransport {
      * The stream factory used for encoding and decoding messages.
      */
     private final MALElementStreamFactory streamFactory;
-    /**
-     * The base string for URL for this protocol.
-     */
-    protected String uriBase;
-    /**
-     * Map of cachedRoutingParts. This associates a URI to its Routing part.
-     */
-    private final ConcurrentHashMap<String, String> cachedRoutingParts = new ConcurrentHashMap<>();
 
     /**
      * Constructor.
@@ -193,24 +161,14 @@ public Transport(final String protocol,
             final char routingDelim,
             final boolean supportsRouting,
             final java.util.Map properties) throws MALException {
-        this.protocol = protocol;
-        this.supportsRouting = supportsRouting;
-        this.protocolDelim = protocolDelim;
-        this.serviceDelim = serviceDelim;
-        this.routingDelim = routingDelim;
+        this.addressing = new TransportAddressing(protocol, protocolDelim,
+                serviceDelim, routingDelim, supportsRouting);
         this.qosProperties = properties;
 
         streamFactory = MALElementStreamFactory.newFactory(protocol, properties);
         LOGGER.log(Level.FINE, "Created element stream: {0}",
                 streamFactory.getClass().getName());
 
-        if (protocolDelim.contains("" + serviceDelim)) {
-            String replaced = protocolDelim.replace("" + serviceDelim, "");
-            serviceDelimCounter = protocolDelim.length() - replaced.length();
-        } else {
-            serviceDelimCounter = 0;
-        }
-
         // default values
         boolean lInProcessSupport = true;
         int lDeliveryTime = 10;
@@ -241,12 +199,7 @@ public Transport(final String protocol,
      * @throws MALException On error
      */
     public void init() throws MALException {
-        String protocolString = protocol;
-        if (protocol.contains(":")) {
-            protocolString = protocol.substring(0, protocol.indexOf(':'));
-        }
-
-        uriBase = protocolString + protocolDelim + createTransportAddress() + serviceDelim;
+        addressing.initUriBase(createTransportAddress());
     }
 
     @Override
@@ -328,13 +281,13 @@ public void sendMessage(final Object multiSendHandle, final boolean lastForHandl
 
         // get the root URI, (e.g. maltcp://10.0.0.1:61616 )
         String destinationURI = header.getTo().getValue();
-        String remoteRootURI = header.getToURI().getRootURI(serviceDelim, serviceDelimCounter);
+        String remoteRootURI = addressing.getRootURI(header.getToURI());
 
         // first check if its actually a message to ourselves
         String endpointUriPart = getRoutingPart(destinationURI);
 
         if (inProcessSupport
-                && (uriBase.startsWith(remoteRootURI) || remoteRootURI.startsWith(uriBase))
+                && addressing.matchesLocalBase(remoteRootURI)
                 && endpoints.containsRoutingName(endpointUriPart)) {
             LOGGER.log(Level.FINE, "Routing msg internally to: {0}",
                     new Object[]{endpointUriPart});
@@ -622,20 +575,7 @@ protected String getLocalName(String localName, final java.util.Map properties)
      * @return the routing part of the URI
      */
     public String getRoutingPart(String uriValue) {
-        String routingPart = cachedRoutingParts.get(uriValue);
-
-        if (routingPart == null) {
-            final int iFirst = URI.nthIndexOf(uriValue, serviceDelim, serviceDelimCounter);
-            int iSecond = supportsRouting ? uriValue.indexOf(routingDelim) : uriValue.length();
-            if (iSecond < 0) {
-                iSecond = uriValue.length();
-            }
-
-            routingPart = uriValue.substring(iFirst + 1, iSecond);
-            cachedRoutingParts.put(uriValue, routingPart);
-        }
-
-        return routingPart;
+        return addressing.getRoutingPart(uriValue);
     }
 
     /**
@@ -651,7 +591,8 @@ public String getRoutingPart(String uriValue) {
     protected Endpoint internalCreateEndpoint(final String localName,
             final String routingName, final Map qosProperties,
             final NamedValueList supplements) throws MALException {
-        return new Endpoint(this, localName, routingName, uriBase + routingName, supplements);
+        return new Endpoint(this, localName, routingName,
+                addressing.getUriBase() + routingName, supplements);
     }
 
     /**
@@ -679,7 +620,7 @@ public synchronized ConcurrentMessageSender manageCommunicationChannel(GENMessag
                 // this is the first message received form this reception handler
                 // add the remote base URI it is receiving messages from
                 URI sourceURI = msg.getHeader().getFromURI();
-                String sourceRootURI = sourceURI.getRootURI(serviceDelim, serviceDelimCounter);
+                String sourceRootURI = addressing.getRootURI(sourceURI);
                 receptionHandler.setRemoteURI(sourceRootURI);
 
                 //register the communication channel with this URI if needed
@@ -689,7 +630,7 @@ public synchronized ConcurrentMessageSender manageCommunicationChannel(GENMessag
             // outgoing message
             // get target URI
             URI reroutedMsg = this.rerouteMessage(msg);
-            String remoteRootURI = reroutedMsg.getRootURI(serviceDelim, serviceDelimCounter);
+            String remoteRootURI = addressing.getRootURI(reroutedMsg);
             sender = outgoingDataChannelsManager.manageCommunicationChannelOutgoing(msg.getHeader(), remoteRootURI);
         }