Simplify handler creation.

ragconnect.base/src/main/jastadd/Navigation.jrag

@@ -61,4 +61,11 @@ aspect Navigation {
   // --- isDefaultMappingDefinition ---
   syn boolean MappingDefinition.isDefaultMappingDefinition() = false;
   eq DefaultMappingDefinition.isDefaultMappingDefinition() = true;
+
+  // --- mragconnect ---
+  inh MRagConnect MHandler.mragconnect();
+  eq MRagConnect.getHandler().mragconnect() = this;
+
+  // --- rootTypeComponents ---
+  syn JastAddList<MTypeComponent> MHandler.rootTypeComponents() = mragconnect().getRootTypeComponents();
 }

ragconnect.base/src/main/jastadd/intermediate/Generation.jadd

@@ -136,6 +136,11 @@ aspect AttributesForMustache {
         result.addRootTypeComponent(child.asTypeComponent().toMustache());
       }
     }
+    // MHandler ::= <ClassName> <Construction> <AttributeName> <FieldName> <InUse:boolean>;
+    result.addHandler(new MHandler("MqttServerHandler", "new MqttServerHandler(\"RagConnectMQTT\")",
+                                   result.mqttHandlerAttribute(), result.mqttHandlerField(), usesMqtt));
+    result.addHandler(new MHandler("RestServerHandler", "new RestServerHandler(\"RagConnectREST\")",
+                                   result.restHandlerAttribute(), result.restHandlerField(), usesRest));
     return result;
   }
 

ragconnect.base/src/main/jastadd/intermediate/MustacheNodes.relast

-MRagConnect ::= ReceiveDefinition:MReceiveDefinition* SendDefinition:MSendDefinition* MappingDefinition:MMappingDefinition* DependencyDefinition:MDependencyDefinition* RootTypeComponent:MTypeComponent* TokenComponent:MTokenComponent*;
+MRagConnect ::= ReceiveDefinition:MReceiveDefinition* SendDefinition:MSendDefinition* MappingDefinition:MMappingDefinition* DependencyDefinition:MDependencyDefinition* RootTypeComponent:MTypeComponent* TokenComponent:MTokenComponent* Handler:MHandler*;
 abstract MEndpointDefinition ::= InnerMappingDefinition:MInnerMappingDefinition*;
 MReceiveDefinition : MEndpointDefinition;
 MSendDefinition : MEndpointDefinition;
@@ -7,6 +7,7 @@ MInnerMappingDefinition;
 MDependencyDefinition;
 MTypeComponent;
 MTokenComponent;
+MHandler ::= <ClassName> <Construction> <AttributeName> <FieldName> <InUse:boolean>;
 
 rel MRagConnect.RagConnect -> RagConnect;
 rel MInnerMappingDefinition.MMappingDefinition -> MMappingDefinition;

ragconnect.base/src/main/resources/MqttHandler.jadd

 import java.io.IOException;
-import java.util.concurrent.TimeUnit;aspect MqttHandler {
+import java.util.concurrent.TimeUnit;
+
+aspect MqttHandler {
 public class MqttServerHandler {
   private final java.util.Map<String, MqttHandler> handlers = new java.util.HashMap<>();
   private long time;

ragconnect.base/src/main/resources/handler.mustache

 aspect RagConnectHandler {
-interface RagConnectHandler<T> {
-  boolean connectReceive(String path, java.util.function.Consumer<T> callback);
-  boolean sendPush(String path, T value);
-  boolean connectSendPull(String path, SupplierWithException<T> supplier);
-}
+{{#Handlers}}
+  {{#InUse}}
+  private {{ClassName}} {{rootNodeName}}.{{FieldName}} = {{{Construction}}};
+  {{#rootTypeComponents}}
+  {{#first}}inh {{ClassName}} ASTNode.{{AttributeName}}();{{/first}}
+  eq {{rootNodeName}}.get{{name}}().{{AttributeName}}() = {{FieldName}};
+  {{/rootTypeComponents}}
+  syn {{ClassName}} {{rootNodeName}}.{{AttributeName}}() = {{FieldName}};
+  {{/InUse}}
+{{/Handlers}}
+  public void {{rootNodeName}}.{{closeMethod}}() {
+    {{#Handlers}}
+    {{#InUse}}{{FieldName}}.close();{{/InUse}}
+    {{/Handlers}}
+  }
 }

ragconnect.base/src/main/resources/mqtt.mustache

 aspect MQTT {
-  private String {{rootNodeName}}.MqttName() { return "RagConnectMQTT"; }
-  private MqttServerHandler {{rootNodeName}}.{{mqttHandlerField}} = new MqttServerHandler(MqttName());
-
   public void {{rootNodeName}}.{{mqttSetupWaitUntilReadyMethod}}(long time, java.util.concurrent.TimeUnit unit) {
     {{mqttHandlerField}}.setupWaitUntilReady(time, unit);
   }
-
-  {{#RootTypeComponents}}
-  {{#first}}inh MqttServerHandler ASTNode.{{mqttHandlerAttribute}}();{{/first}}
-  eq {{rootNodeName}}.get{{name}}().{{mqttHandlerAttribute}}() = {{mqttHandlerField}};
-  {{/RootTypeComponents}}
-  syn MqttServerHandler {{rootNodeName}}.{{mqttHandlerAttribute}}() = {{mqttHandlerField}};
 }

ragconnect.base/src/main/resources/ragconnect.mustache

 {{#usesMqtt}}{{> mqtt}}{{/usesMqtt}}
-{{#usesRest}}{{> rest}}{{/usesRest}}
+{{> handler}}
 aspect ROS2RAG {
-  public void {{rootNodeName}}.{{closeMethod}}() {
-    {{#usesMqtt}}{{mqttHandlerField}}.close();{{/usesMqtt}}
-    {{#usesRest}}{{restHandlerField}}.close();{{/usesRest}}
-  }
   {{#ReceiveDefinitions}}
   {{> receiveDefinition}}
   {{/ReceiveDefinitions}}

ragconnect.base/src/main/resources/rest.mustache

-aspect REST {
-  private String {{rootNodeName}}.RestName() { return "RagConnectREST"; }
-  private RestServerHandler {{rootNodeName}}.{{restHandlerField}} = new RestServerHandler(RestName());
-
-  {{#getRootTypeComponents}}
-  {{#first}}inh RestServerHandler ASTNode.{{restHandlerAttribute}}();{{/first}}
-  eq {{rootNodeName}}.get{{name}}().{{restHandlerAttribute}}() = {{restHandlerField}};
-  {{/getRootTypeComponents}}
-  {{^getRootTypeComponents}}
-  syn RestServerHandler {{rootNodeName}}.{{restHandlerAttribute}}() = {{restHandlerField}};
-  {{/getRootTypeComponents}}
-}