Skip to content
Snippets Groups Projects
Commit 29847fd7 authored by René Schöne's avatar René Schöne
Browse files

More cleanup

parent 875191d8
No related branches found
No related tags found
No related merge requests found
Pipeline #7592 passed
...@@ -5,9 +5,6 @@ Design considerations ...@@ -5,9 +5,6 @@ Design considerations
aspect AttributesForMustache { aspect AttributesForMustache {
// --- MRagConnect --- // --- MRagConnect ---
eq MRagConnect.getChild().mqttHandlerAttribute() = mqttHandlerAttribute();
eq MRagConnect.getChild().restHandlerAttribute() = restHandlerAttribute();
eq MRagConnect.getChild().mqttHandlerField() = mqttHandlerField();
eq MRagConnect.getRootTypeComponent(int i).isFirst() = i == 0; eq MRagConnect.getRootTypeComponent(int i).isFirst() = i == 0;
syn String MRagConnect.closeMethod() = "ragconnectCloseConnections"; syn String MRagConnect.closeMethod() = "ragconnectCloseConnections";
...@@ -25,20 +22,17 @@ aspect AttributesForMustache { ...@@ -25,20 +22,17 @@ aspect AttributesForMustache {
syn String MEndpointDefinition.firstInputVarName(); syn String MEndpointDefinition.firstInputVarName();
eq MEndpointDefinition.getInnerMappingDefinition(int i).isLast() = i == getNumInnerMappingDefinition() - 1; eq MEndpointDefinition.getInnerMappingDefinition(int i).isLast() = i == getNumInnerMappingDefinition() - 1;
eq MEndpointDefinition.getInnerMappingDefinition().resultVarPrefix() = resultVarPrefix(); eq MEndpointDefinition.getInnerMappingDefinition(int i).inputVarName() = i == 0 ? firstInputVarName() : getInnerMappingDefinition(i - 1).outputVarName();
eq MEndpointDefinition.getInnerMappingDefinition(int i).inputVarName() = i == 0 ? firstInputVarName() : resultVarPrefix() + getInnerMappingDefinition(i - 1).methodName();
syn String MEndpointDefinition.connectParameterName() = "uriString"; syn String MEndpointDefinition.connectParameterName() = "uriString";
syn String MEndpointDefinition.connectMethod() = "connect" + tokenName(); syn String MEndpointDefinition.connectMethod() = "connect" + tokenName();
syn TokenComponent MEndpointDefinition.token() = endpointDef().getToken(); syn TokenComponent MEndpointDefinition.token() = endpointDef().getToken();
syn boolean MEndpointDefinition.alwaysApply() = endpointDef().getAlwaysApply(); syn boolean MEndpointDefinition.alwaysApply() = endpointDef().getAlwaysApply();
syn String MEndpointDefinition.resultVarPrefix() = "result"; // we do not need "_" here, because methodName begins with one
syn String MEndpointDefinition.parentTypeName() = token().containingTypeDecl().getName(); syn String MEndpointDefinition.parentTypeName() = token().containingTypeDecl().getName();
syn String MEndpointDefinition.tokenName() = token().getName(); syn String MEndpointDefinition.tokenName() = token().getName();
syn MInnerMappingDefinition MEndpointDefinition.lastDefinition() = getInnerMappingDefinition(getNumInnerMappingDefinition() - 1); syn MInnerMappingDefinition MEndpointDefinition.lastDefinition() = getInnerMappingDefinition(getNumInnerMappingDefinition() - 1);
syn String MEndpointDefinition.lastDefinitionToType() = lastDefinition().toType(); syn String MEndpointDefinition.lastDefinitionToType() = lastDefinition().toType();
syn String MEndpointDefinition.lastDefinitionName() = lastDefinition().methodName(); syn String MEndpointDefinition.lastResult() = lastDefinition().outputVarName();
syn String MEndpointDefinition.lastResult() = resultVarPrefix() + lastDefinitionName();
syn String MEndpointDefinition.condition() { syn String MEndpointDefinition.condition() {
if (lastDefinition().mappingDef().getToType().isArray()) { if (lastDefinition().mappingDef().getToType().isArray()) {
return "java.util.Arrays.equals(" + preemptiveExpectedValue() + ", " + lastResult() + ")"; return "java.util.Arrays.equals(" + preemptiveExpectedValue() + ", " + lastResult() + ")";
...@@ -54,11 +48,11 @@ aspect AttributesForMustache { ...@@ -54,11 +48,11 @@ aspect AttributesForMustache {
// --- MInnerMappingDefinition --- // --- MInnerMappingDefinition ---
inh boolean MInnerMappingDefinition.isLast(); inh boolean MInnerMappingDefinition.isLast();
inh String MInnerMappingDefinition.resultVarPrefix();
inh String MInnerMappingDefinition.inputVarName(); inh String MInnerMappingDefinition.inputVarName();
syn String MInnerMappingDefinition.toType() = mappingDef().getToType().prettyPrint(); syn String MInnerMappingDefinition.toType() = mappingDef().getToType().prettyPrint();
syn String MInnerMappingDefinition.methodName() = getMMappingDefinition().methodName(); syn String MInnerMappingDefinition.methodName() = getMMappingDefinition().methodName();
syn MappingDefinition MInnerMappingDefinition.mappingDef() = getMMappingDefinition().getMappingDefinition(); syn MappingDefinition MInnerMappingDefinition.mappingDef() = getMMappingDefinition().getMappingDefinition();
syn String MInnerMappingDefinition.outputVarName() = "result" + methodName(); // we do not need "_" in between here, because methodName begins with one
// --- MReceiveDefinition --- // --- MReceiveDefinition ---
eq MReceiveDefinition.preemptiveExpectedValue() = "get" + tokenName() + "()"; eq MReceiveDefinition.preemptiveExpectedValue() = "get" + tokenName() + "()";
...@@ -96,8 +90,6 @@ aspect AttributesForMustache { ...@@ -96,8 +90,6 @@ aspect AttributesForMustache {
// --- MTypeComponent --- // --- MTypeComponent ---
syn String MTypeComponent.name() = getTypeComponent().getName(); syn String MTypeComponent.name() = getTypeComponent().getName();
inh String MTypeComponent.mqttHandlerAttribute();
inh String MTypeComponent.mqttHandlerField();
inh boolean MTypeComponent.isFirst(); inh boolean MTypeComponent.isFirst();
// --- MTokenComponent --- // --- MTokenComponent ---
...@@ -138,7 +130,6 @@ aspect AttributesForMustache { ...@@ -138,7 +130,6 @@ aspect AttributesForMustache {
return result; return result;
} }
//MInnerMappingDefinition.MappingDefinition -> MappingDefinition;
protected void MEndpointDefinition.addInnerMappings() { protected void MEndpointDefinition.addInnerMappings() {
for (MappingDefinition def : endpointDef().effectiveMappings()) { for (MappingDefinition def : endpointDef().effectiveMappings()) {
MInnerMappingDefinition inner = new MInnerMappingDefinition(); MInnerMappingDefinition inner = new MInnerMappingDefinition();
...@@ -146,33 +137,39 @@ aspect AttributesForMustache { ...@@ -146,33 +137,39 @@ aspect AttributesForMustache {
addInnerMappingDefinition(inner); addInnerMappingDefinition(inner);
} }
} }
syn lazy MReceiveDefinition ReceiveTokenEndpointDefinition.toMustache() { syn lazy MReceiveDefinition ReceiveTokenEndpointDefinition.toMustache() {
MReceiveDefinition result = new MReceiveDefinition(); MReceiveDefinition result = new MReceiveDefinition();
result.setReceiveTokenEndpointDefinition(this); result.setReceiveTokenEndpointDefinition(this);
result.addInnerMappings(); result.addInnerMappings();
return result; return result;
} }
syn lazy MSendDefinition SendTokenEndpointDefinition.toMustache() { syn lazy MSendDefinition SendTokenEndpointDefinition.toMustache() {
MSendDefinition result = new MSendDefinition(); MSendDefinition result = new MSendDefinition();
result.setSendTokenEndpointDefinition(this); result.setSendTokenEndpointDefinition(this);
result.addInnerMappings(); result.addInnerMappings();
return result; return result;
} }
syn lazy MMappingDefinition MappingDefinition.toMustache() { syn lazy MMappingDefinition MappingDefinition.toMustache() {
MMappingDefinition result = new MMappingDefinition(); MMappingDefinition result = new MMappingDefinition();
result.setMappingDefinition(this); result.setMappingDefinition(this);
return result; return result;
} }
syn lazy MDependencyDefinition DependencyDefinition.toMustache() { syn lazy MDependencyDefinition DependencyDefinition.toMustache() {
MDependencyDefinition result = new MDependencyDefinition(); MDependencyDefinition result = new MDependencyDefinition();
result.setDependencyDefinition(this); result.setDependencyDefinition(this);
return result; return result;
} }
syn lazy MTypeComponent TypeComponent.toMustache() { syn lazy MTypeComponent TypeComponent.toMustache() {
MTypeComponent result = new MTypeComponent(); MTypeComponent result = new MTypeComponent();
result.setTypeComponent(this); result.setTypeComponent(this);
return result; return result;
} }
syn lazy MTokenComponent TokenComponent.toMustache() { syn lazy MTokenComponent TokenComponent.toMustache() {
MTokenComponent result = new MTokenComponent(); MTokenComponent result = new MTokenComponent();
result.setTokenComponent(this); result.setTokenComponent(this);
...@@ -184,7 +181,6 @@ aspect AttributesForMustache { ...@@ -184,7 +181,6 @@ aspect AttributesForMustache {
} }
aspect AspectGeneration { aspect AspectGeneration {
// --- rootNodeName --- // --- rootNodeName ---
syn String ASTNode.rootNodeName() = rootNode.getName(); syn String ASTNode.rootNodeName() = rootNode.getName();
......
...@@ -70,15 +70,13 @@ aspect MustacheNodesToYAML { ...@@ -70,15 +70,13 @@ aspect MustacheNodesToYAML {
result.addKeyValuePair("connectMethod", StringElement.of(connectMethod())); result.addKeyValuePair("connectMethod", StringElement.of(connectMethod()));
result.addKeyValuePair("connectParameterName", StringElement.of(connectParameterName())); result.addKeyValuePair("connectParameterName", StringElement.of(connectParameterName()));
result.addKeyValuePair("lastDefinitionToType", StringElement.of(lastDefinitionToType())); result.addKeyValuePair("lastDefinitionToType", StringElement.of(lastDefinitionToType()));
result.addKeyValuePair("resultVarPrefix", StringElement.of(resultVarPrefix()));
result.addKeyValuePair("lastDefinitionName", StringElement.of(lastDefinitionName()));
result.addKeyValuePair("preemptiveReturn", StringElement.of(preemptiveReturn())); result.addKeyValuePair("preemptiveReturn", StringElement.of(preemptiveReturn()));
result.addKeyValuePair("alwaysApply", ValueElement.of(alwaysApply())); result.addKeyValuePair("alwaysApply", ValueElement.of(alwaysApply()));
result.addKeyValuePair("condition", StringElement.of( result.addKeyValuePair("condition", StringElement.of(
condition().replace("\"", "\\\"").replace("\n", "\\n"))); condition().replace("\"", "\\\"").replace("\n", "\\n")));
result.addKeyValuePair("lastResult", StringElement.of(lastResult())); result.addKeyValuePair("lastResult", StringElement.of(lastResult()));
result.addKeyValuePair("InnerMappingDefinitions", innerMappingDefinitionsAsListElement());
result.addKeyValuePair("tokenName", StringElement.of(tokenName())); result.addKeyValuePair("tokenName", StringElement.of(tokenName()));
result.addKeyValuePair("InnerMappingDefinitions", innerMappingDefinitionsAsListElement());
return result; return result;
} }
...@@ -147,6 +145,7 @@ aspect MustacheNodesToYAML { ...@@ -147,6 +145,7 @@ aspect MustacheNodesToYAML {
inner.addKeyValuePair("toType", StringElement.of(def.toType())); inner.addKeyValuePair("toType", StringElement.of(def.toType()));
inner.addKeyValuePair("methodName", StringElement.of(def.methodName())); inner.addKeyValuePair("methodName", StringElement.of(def.methodName()));
inner.addKeyValuePair("inputVarName", StringElement.of(def.inputVarName())); inner.addKeyValuePair("inputVarName", StringElement.of(def.inputVarName()));
inner.addKeyValuePair("outputVarName", StringElement.of(def.outputVarName()));
inner.addKeyValuePair("last", ValueElement.of(def.isLast())); inner.addKeyValuePair("last", ValueElement.of(def.isLast()));
innerMappingDefinitions.addElement(inner); innerMappingDefinitions.addElement(inner);
} }
......
{{lastDefinitionToType}} {{resultVarPrefix}}{{lastDefinitionName}}; {{lastDefinitionToType}} {{lastResult}};
try { try {
{{#InnerMappingDefinitions}} {{#InnerMappingDefinitions}}
{{^last}}{{toType}} {{/last}}{{resultVarPrefix}}{{methodName}} = {{methodName}}({{inputVarName}}); {{^last}}{{toType}} {{/last}}{{outputVarName}} = {{methodName}}({{inputVarName}});
{{/InnerMappingDefinitions}} {{/InnerMappingDefinitions}}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment