diff --git a/src/main/jastadd/Analysis.jrag b/src/main/jastadd/Analysis.jrag index 623a3f0ad8c0457d8d0606bf70dea0adfea89ea4..30159bc3149d419953be27e9a0801faa46acdde3 100644 --- a/src/main/jastadd/Analysis.jrag +++ b/src/main/jastadd/Analysis.jrag @@ -1,13 +1,14 @@ aspect Analysis { // --- lookupTokenEndpointDefinition --- - inh TokenEndpointDefinition TokenEndpointDefinition.lookupTokenEndpointDefinition(TokenComponent token); - eq RagConnect.getEndpointDefinition().lookupTokenEndpointDefinition(TokenComponent token) { + inh java.util.List<TokenEndpointDefinition> TokenEndpointDefinition.lookupTokenEndpointDefinitions(TokenComponent token); + eq RagConnect.getEndpointDefinition().lookupTokenEndpointDefinitions(TokenComponent token) { + java.util.List<TokenEndpointDefinition> result = new java.util.ArrayList<>(); for (EndpointDefinition def : getEndpointDefinitionList()) { if (def.isTokenEndpointDefinition() && def.asTokenEndpointDefinition().getToken().equals(token)) { - return def.asTokenEndpointDefinition(); + result.add(def.asTokenEndpointDefinition()); } } - return null; + return result; } // --- lookupDependencyDefinition --- @@ -22,6 +23,70 @@ aspect Analysis { } // --- isAlreadyDefined --- - syn boolean TokenEndpointDefinition.isAlreadyDefined() = lookupTokenEndpointDefinition(getToken()) != this; + syn boolean TokenEndpointDefinition.isAlreadyDefined() { + java.util.List<TokenEndpointDefinition> definitions = lookupTokenEndpointDefinitions(getToken()); + java.util.Set<String> protocols = definitions + .stream() + .map(TokenEndpointDefinition::protocol) + .collect(java.util.stream.Collectors.toSet()); + return definitions.size() > protocols.size(); + } syn boolean DependencyDefinition.isAlreadyDefined() = lookupDependencyDefinition(getSource().containingTypeDecl(), getID()) != this; + + // --- protocol --- + syn String TokenEndpointDefinition.protocol(); + eq ReceiveFromMqttDefinition.protocol() = "mqtt"; + eq SendToMqttDefinition.protocol() = "mqtt"; + eq ReceiveFromRestDefinition.protocol() = "rest"; + eq SendToRestDefinition.protocol() = "rest"; + + // --- usesPROTOCOL --- + syn boolean RagConnect.usesMqtt() = !mqttEndpointDefinitions().isEmpty(); + syn boolean RagConnect.usesRest() = !restEndpointDefinitions().isEmpty(); + + // --- mqttEndpointDefinitions --- + coll java.util.List<TokenEndpointDefinition> RagConnect.mqttEndpointDefinitions() [new java.util.ArrayList<>()] root RagConnect; + ReceiveFromMqttDefinition contributes this + to RagConnect.mqttEndpointDefinitions() + for ragconnect(); + SendToMqttDefinition contributes this + to RagConnect.mqttEndpointDefinitions() + for ragconnect(); + + // --- restEndpointDefinitions --- + coll java.util.List<TokenEndpointDefinition> RagConnect.restEndpointDefinitions() [new java.util.ArrayList<>()] root RagConnect; + ReceiveFromRestDefinition contributes this + to RagConnect.restEndpointDefinitions() + for ragconnect(); + SendToRestDefinition contributes this + to RagConnect.restEndpointDefinitions() + for ragconnect(); + + syn boolean MappingDefinitionType.assignableTo(JavaTypeUse target); + eq JavaMappingDefinitionType.assignableTo(JavaTypeUse target) = getType().assignableTo(target); + eq JavaArrayMappingDefinitionType.assignableTo(JavaTypeUse target) { + if (!target.getName().endsWith("[]")) { return false; } + return getType().assignableTo(new SimpleJavaTypeUse(target.getName().replace("[]", ""))); + } + syn boolean JavaTypeUse.assignableTo(JavaTypeUse target) { + // target var = this; + return target.primitivePrettyPrint().equals(this.primitivePrettyPrint()); + } + syn String JavaTypeUse.primitivePrettyPrint() { + switch(getName()) { + case "int": + case "Integer": return "int"; + case "short": + case "Short": return "short"; + case "long": + case "Long": return "long"; + case "float": + case "Float": return "float"; + case "double": + case "Double": return "double"; + case "char": + case "Character": return "char"; + default: return getName(); + } + } } diff --git a/src/main/jastadd/Errors.jrag b/src/main/jastadd/Errors.jrag index cf001ac9d3b64181b58e9b1c461cba6e316d1370..fe2fcd59efd365174ca2803affebc34819cf3d7e 100644 --- a/src/main/jastadd/Errors.jrag +++ b/src/main/jastadd/Errors.jrag @@ -23,9 +23,9 @@ aspect Errors { when effectiveMappings().get(0) == null to RagConnect.errors(); - ReceiveTokenEndpointDefinition contributes error("to-type of last mapping (" + effectiveMappings().get(effectiveMappings().size() - 1).getToType().prettyPrint() + ") does not match type of the Token (" + getToken().effectiveJavaTypeUse().prettyPrint() + ")!") - when !getToken().effectiveJavaTypeUse().prettyPrint().equals( - effectiveMappings().get(effectiveMappings().size() - 1).getToType().prettyPrint()) + ReceiveTokenEndpointDefinition contributes error("to-type of last mapping (" + effectiveMappings().get(effectiveMappings().size() - 1).getToType().prettyPrint() + ") not assignable to type of the Token (" + getToken().effectiveJavaTypeUse().prettyPrint() + ")!") + when !effectiveMappings().get(effectiveMappings().size() - 1).getToType().assignableTo( + getToken().effectiveJavaTypeUse()) to RagConnect.errors(); SendTokenEndpointDefinition contributes error("Sending target token must be an NTA token!") diff --git a/src/main/jastadd/MustacheNodes.relast b/src/main/jastadd/MustacheNodes.relast index 1a35853e84701475c11632e7b31a31458b8de729..73d1b318e03c68d2bd243264b3d9863548657e02 100644 --- a/src/main/jastadd/MustacheNodes.relast +++ b/src/main/jastadd/MustacheNodes.relast @@ -1,7 +1,7 @@ //TypeComponentMustache ; //rel TypeComponentMustache.TypeComponent -> TypeComponent ; -MRagConnect ::= ReceiveDefinition:MReceiveDefinition* SendDefinition:MSendDefinition* MappingDefinition:MMappingDefinition* DependencyDefinition:MDependencyDefinition* RootTypeComponent:MTypeComponent* TokenComponent:MTokenComponent*; +MRagConnect ::= ReceiveDefinition:MReceiveDefinition* PushSendDefinition:MSendDefinition* PullSendDefinition:MSendDefinition* MappingDefinition:MMappingDefinition* DependencyDefinition:MDependencyDefinition* RootTypeComponent:MTypeComponent* TokenComponent:MTokenComponent*; abstract MEndpointDefinition ::= InnerMappingDefinition:MInnerMappingDefinition*; MReceiveDefinition : MEndpointDefinition; MSendDefinition : MEndpointDefinition; diff --git a/src/main/jastadd/Util.jadd b/src/main/jastadd/Util.jadd new file mode 100644 index 0000000000000000000000000000000000000000..3b59b13c53a8d0e1ca2a05feba43294797a4577e --- /dev/null +++ b/src/main/jastadd/Util.jadd @@ -0,0 +1,5 @@ +aspect Util { + static String ASTNode.capitalize(String s) { + return Character.toUpperCase(s.charAt(0)) + s.substring(1); + } +} diff --git a/src/main/jastadd/backend/Generation.jadd b/src/main/jastadd/backend/Generation.jadd index 512750e268fea52e0c0d46284e55fb3d66054ec1..35d1fcd6c65b37e0f6344df233310a371fbabb60 100644 --- a/src/main/jastadd/backend/Generation.jadd +++ b/src/main/jastadd/backend/Generation.jadd @@ -31,13 +31,18 @@ aspect AttributesForMustache { eq MRagConnect.getChild().mqttHandlerField() = mqttHandlerField(); eq MRagConnect.getRootTypeComponent(int i).isFirst() = i == 0; + syn boolean MRagConnect.usesMqtt() = getRagConnect().usesMqtt(); syn String MRagConnect.mqttHandlerAttribute() = getRagConnect().mqttHandlerAttribute(); syn String MRagConnect.mqttHandlerField() = getRagConnect().mqttHandlerField(); syn String MRagConnect.mqttSetHostMethod() = getRagConnect().mqttSetHostMethod(); syn String MRagConnect.mqttWaitUntilReadyMethod() = getRagConnect().mqttWaitUntilReadyMethod(); syn String MRagConnect.mqttCloseMethod() = getRagConnect().mqttCloseMethod(); + syn boolean MRagConnect.usesRest() = getRagConnect().usesRest(); syn String MRagConnect.restHandlerAttribute() = getRagConnect().restHandlerAttribute(); + syn String MRagConnect.restHandlerField() = getRagConnect().restHandlerField(); + syn String MRagConnect.restSetPortMethod() = getRagConnect().restSetPortMethod(); + syn String MRagConnect.restCloseMethod() = getRagConnect().restCloseMethod(); // --- MEndpointDefinition --- syn String MEndpointDefinition.preemptiveExpectedValue(); @@ -51,6 +56,8 @@ aspect AttributesForMustache { inh String MEndpointDefinition.mqttHandlerAttribute(); + syn String MEndpointDefinition.connectParameterName() = endpointDef().connectParameterName(); + syn String MEndpointDefinition.newConnectionMethod() = endpointDef().newConnectionMethod(); syn String MEndpointDefinition.handlerAttribute() = endpointDef().handlerAttribute(); syn String MEndpointDefinition.connectMethod() = endpointDef().connectMethod(); syn TokenComponent MEndpointDefinition.token() = endpointDef().getToken(); @@ -88,9 +95,12 @@ aspect AttributesForMustache { eq MReceiveDefinition.endpointDef() = getReceiveTokenEndpointDefinition(); eq MReceiveDefinition.firstInputVarName() = "message"; + syn String MReceiveDefinition.newConnectionMethod() = getReceiveTokenEndpointDefinition().newConnectionMethod(); + syn String MReceiveDefinition.connectParameterName() = getReceiveTokenEndpointDefinition().connectParameterName(); + // --- MSendDefinition --- eq MSendDefinition.preemptiveExpectedValue() = lastValue(); - eq MSendDefinition.preemptiveReturn() = "return false;"; + eq MSendDefinition.preemptiveReturn() = getSendTokenEndpointDefinition().preemptiveReturn(); eq MSendDefinition.endpointDef() = getSendTokenEndpointDefinition(); eq MSendDefinition.firstInputVarName() = "get" + tokenName() + "()"; @@ -99,6 +109,7 @@ aspect AttributesForMustache { syn String MSendDefinition.updateMethod() = getSendTokenEndpointDefinition().updateMethod(); syn String MSendDefinition.writeMethod() = getSendTokenEndpointDefinition().writeMethod(); syn String MSendDefinition.tokenResetMethod() = getSendTokenEndpointDefinition().tokenResetMethod(); + syn boolean MSendDefinition.isPush() = getSendTokenEndpointDefinition().isPush(); // --- MMappingDefinition --- syn String MMappingDefinition.toType() = getMappingDefinition().getToType().prettyPrint(); @@ -112,7 +123,7 @@ aspect AttributesForMustache { syn String MDependencyDefinition.dependencyMethod() = getDependencyDefinition().dependencyMethod(); syn String MDependencyDefinition.sourceParentTypeName() = getDependencyDefinition().getSource().containingTypeDecl().getName(); syn String MDependencyDefinition.internalRelationPrefix() = getDependencyDefinition().internalRelationPrefix(); - syn nta MEndpointDefinition MDependencyDefinition.targetEndpointDefinition() { + syn nta MSendDefinition MDependencyDefinition.targetEndpointDefinition() { return getDependencyDefinition().targetEndpointDefinition().toMustache(); } @@ -134,7 +145,12 @@ aspect AttributesForMustache { result.setRagConnect(this); for (EndpointDefinition def : getEndpointDefinitionList()) { if (def.isSendTokenEndpointDefinition()) { - result.addSendDefinition(def.asSendTokenEndpointDefinition().toMustache()); + SendTokenEndpointDefinition sendDef = def.asSendTokenEndpointDefinition(); + if (sendDef.isPush()) { + result.addPushSendDefinition(sendDef.toMustache()); + } else { + result.addPullSendDefinition(sendDef.toMustache()); + } } else { result.addReceiveDefinition(def.asReceiveTokenEndpointDefinition().toMustache()); } @@ -166,34 +182,18 @@ aspect AttributesForMustache { addInnerMappingDefinition(inner); } } - syn lazy MReceiveDefinition ReceiveTokenEndpointDefinition.toMustache(); - eq ReceiveFromMqttDefinition.toMustache() { + syn lazy MReceiveDefinition ReceiveTokenEndpointDefinition.toMustache() { MReceiveDefinition result = new MReceiveDefinition(); result.setReceiveTokenEndpointDefinition(this); result.addInnerMappings(); return result; } - eq ReceiveFromRestDefinition.toMustache() { - MReceiveDefinition result = new MReceiveDefinition(); - System.err.println("REST not implemented!"); - result.setReceiveTokenEndpointDefinition(this); - result.addInnerMappings(); - return result; - } - syn lazy MSendDefinition SendTokenEndpointDefinition.toMustache(); - eq SendToMqttDefinition.toMustache() { + syn lazy MSendDefinition SendTokenEndpointDefinition.toMustache() { MSendDefinition result = new MSendDefinition(); result.setSendTokenEndpointDefinition(this); result.addInnerMappings(); return result; } - eq SendToRestDefinition.toMustache() { - MSendDefinition result = new MSendDefinition(); - System.err.println("REST not implemented!"); - result.setSendTokenEndpointDefinition(this); - result.addInnerMappings(); - return result; - } syn lazy MMappingDefinition MappingDefinition.toMustache() { MMappingDefinition result = new MMappingDefinition(); result.setMappingDefinition(this); @@ -224,7 +224,7 @@ aspect AspectGeneration { syn String TokenComponent.internalName() = getDependencySourceDefinitionList().isEmpty() ? externalName() : "_internal_" + getName(); syn String TokenComponent.externalName() = getName(); - syn String TokenEndpointDefinition.connectMethod() = "connect" + getToken().getName(); + syn String TokenEndpointDefinition.connectMethod() = "connect" + getToken().getName() + (lookupTokenEndpointDefinitions(getToken()).size() > 1 ? "Via" + capitalize(protocol()) : ""); syn String SendTokenEndpointDefinition.sendTopic() = "_topic_" + getToken().getName(); syn String SendTokenEndpointDefinition.lastValue() = "_lastValue" + getToken().getName(); syn String SendTokenEndpointDefinition.updateMethod() = "_update_" + getToken().getName(); @@ -237,6 +237,7 @@ aspect AspectGeneration { syn String DependencyDefinition.internalRelationPrefix() = "_internal_" + getID(); syn String DependencyDefinition.internalTokenName() = getSource().internalName(); + // -- MQTT names -- syn String RagConnect.mqttHandlerAttribute() = "_mqttHandler"; syn String RagConnect.mqttHandlerField() = "_mqttHandler"; @@ -244,15 +245,40 @@ aspect AspectGeneration { syn String RagConnect.mqttWaitUntilReadyMethod() = "MqttWaitUntilReady"; syn String RagConnect.mqttCloseMethod() = "MqttCloseConnections"; + // -- REST names -- + syn String RagConnect.restSetPortMethod() = "RestSetPort"; + syn String RagConnect.restCloseMethod() = "RestCloseConnections"; + syn String RagConnect.restHandlerAttribute() = "_restHandler"; syn String RagConnect.restHandlerField() = "_restHandler"; + // -- endpoint names -- syn String TokenEndpointDefinition.handlerAttribute(); eq ReceiveFromMqttDefinition.handlerAttribute() = mqttHandlerAttribute(); eq SendToMqttDefinition.handlerAttribute() = mqttHandlerAttribute(); eq ReceiveFromRestDefinition.handlerAttribute() = restHandlerAttribute(); eq SendToRestDefinition.handlerAttribute() = restHandlerAttribute(); + syn String TokenEndpointDefinition.newConnectionMethod(); + eq ReceiveFromMqttDefinition.newConnectionMethod() = "newConnection"; + eq SendToMqttDefinition.newConnectionMethod() = null; + eq ReceiveFromRestDefinition.newConnectionMethod() = "newPUTConnection"; + eq SendToRestDefinition.newConnectionMethod() = "newGETConnection"; + + syn String TokenEndpointDefinition.connectParameterName(); + eq ReceiveFromMqttDefinition.connectParameterName() = "topic"; + eq SendToMqttDefinition.connectParameterName() = "topic"; + eq ReceiveFromRestDefinition.connectParameterName() = "path"; + eq SendToRestDefinition.connectParameterName() = "path"; + + syn String SendTokenEndpointDefinition.preemptiveReturn(); + eq SendToMqttDefinition.preemptiveReturn() = "return false;"; + eq SendToRestDefinition.preemptiveReturn() = "throw e;"; // e is Exception variable + + syn boolean SendTokenEndpointDefinition.isPush(); + eq SendToMqttDefinition.isPush() = true; + eq SendToRestDefinition.isPush() = false; + // naming copy attributes // --- mqttHandlerAttribute --- inh String EndpointDefinition.mqttHandlerAttribute(); diff --git a/src/main/jastadd/backend/Mappings.jrag b/src/main/jastadd/backend/Mappings.jrag index d5f79046be4271f93a954061c28978aa19ba63b9..0410cc289d9e69fc27b343ac162cdd6b60bcb9d5 100644 --- a/src/main/jastadd/backend/Mappings.jrag +++ b/src/main/jastadd/backend/Mappings.jrag @@ -1,25 +1,7 @@ aspect DefaultMappings { - private DefaultMappingDefinition RagConnect.baseDefaultMappingDefinitionFromBytes(String typeName) { - DefaultMappingDefinition result = new DefaultMappingDefinition(); - result.setID("_DefaultBytesTo" + Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1) + "Mapping"); - result.setFromType(new JavaArrayMappingDefinitionType(new SimpleJavaTypeUse("byte"))); - result.setFromVariableName("bytes"); - result.setToType(new JavaMappingDefinitionType(new SimpleJavaTypeUse(typeName))); - return result; - } - - private DefaultMappingDefinition RagConnect.baseDefaultMappingDefinitionToBytes(String typeName) { - DefaultMappingDefinition result = new DefaultMappingDefinition(); - result.setID("_Default" + Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1) + "ToBytesMapping"); - result.setFromType(new JavaMappingDefinitionType(new SimpleJavaTypeUse(typeName))); - result.setFromVariableName("input"); - result.setToType(new JavaArrayMappingDefinitionType(new SimpleJavaTypeUse("byte"))); - return result; - } - private String RagConnect.baseDefaultMappingTypeNamePart(String typeName) { - return Character.toUpperCase(typeName.charAt(0)) + typeName.substring(1).replace("[]", "s"); + return capitalize(typeName).replace("[]", "s"); } private MappingDefinitionType RagConnect.baseDefaultMappingTypeFromName(String typeName) { @@ -38,103 +20,61 @@ aspect DefaultMappings { return result; } - syn nta DefaultMappingDefinition RagConnect.defaultBytesToIntMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("int"); - result.setContent("return java.nio.ByteBuffer.wrap(bytes).getInt();"); - return result; - } + syn nta DefaultMappingDefinition RagConnect.defaultBytesToIntMapping() = baseDefaultMappingDefinition( + "byte[]", "int", "return java.nio.ByteBuffer.wrap(input).getInt();"); + syn nta DefaultMappingDefinition RagConnect.defaultBytesToShortMapping() = baseDefaultMappingDefinition( + "byte[]", "short", "return java.nio.ByteBuffer.wrap(input).getShort();"); + syn nta DefaultMappingDefinition RagConnect.defaultBytesToLongMapping() = baseDefaultMappingDefinition( + "byte[]", "long", "return java.nio.ByteBuffer.wrap(input).getLong();"); + syn nta DefaultMappingDefinition RagConnect.defaultBytesToFloatMapping() = baseDefaultMappingDefinition( + "byte[]", "float", "return java.nio.ByteBuffer.wrap(input).getFloat();"); + syn nta DefaultMappingDefinition RagConnect.defaultBytesToDoubleMapping() = baseDefaultMappingDefinition( + "byte[]", "double", "return java.nio.ByteBuffer.wrap(input).getDouble();"); + syn nta DefaultMappingDefinition RagConnect.defaultBytesToCharMapping() = baseDefaultMappingDefinition( + "byte[]", "char", "return java.nio.ByteBuffer.wrap(input).getChar();"); + syn nta DefaultMappingDefinition RagConnect.defaultBytesToStringMapping() = baseDefaultMappingDefinition( + "byte[]", "String", "return new String(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultBytesToShortMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("short"); - result.setContent("return java.nio.ByteBuffer.wrap(bytes).getShort();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultBytesToLongMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("long"); - result.setContent("return java.nio.ByteBuffer.wrap(bytes).getLong();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultBytesToFloatMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("float"); - result.setContent("return java.nio.ByteBuffer.wrap(bytes).getFloat();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultBytesToDoubleMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("double"); - result.setContent("return java.nio.ByteBuffer.wrap(bytes).getDouble();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultBytesToCharMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("char"); - result.setContent("return java.nio.ByteBuffer.wrap(bytes).getChar();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultBytesToStringMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionFromBytes("String"); - result.setContent("return new String(bytes);"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultIntToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("int"); - result.setContent("return java.nio.ByteBuffer.allocate(4).putInt(input).array();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultShortToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("short"); - result.setContent("return java.nio.ByteBuffer.allocate(2).putShort(input).array();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultLongToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("long"); - result.setContent("return java.nio.ByteBuffer.allocate(8).putLong(input).array();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultFloatToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("float"); - result.setContent("return java.nio.ByteBuffer.allocate(4).putFloat(input).array();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultDoubleToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("double"); - result.setContent("return java.nio.ByteBuffer.allocate(8).putDouble(input).array();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultCharToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("char"); - result.setContent("return java.nio.ByteBuffer.allocate(2).putChar(input).array();"); - return result; - } - - syn nta DefaultMappingDefinition RagConnect.defaultStringToBytesMapping() { - DefaultMappingDefinition result = baseDefaultMappingDefinitionToBytes("String"); - result.setContent("return input.getBytes();"); - return result; - } + syn nta DefaultMappingDefinition RagConnect.defaultIntToBytesMapping() = baseDefaultMappingDefinition( + "int", "byte[]", "return java.nio.ByteBuffer.allocate(Integer.BYTES).putInt(input).array();"); + syn nta DefaultMappingDefinition RagConnect.defaultShortToBytesMapping() = baseDefaultMappingDefinition( + "short", "byte[]", "return java.nio.ByteBuffer.allocate(Short.BYTES).putShort(input).array();"); + syn nta DefaultMappingDefinition RagConnect.defaultLongToBytesMapping() = baseDefaultMappingDefinition( + "long", "byte[]", "return java.nio.ByteBuffer.allocate(Long.BYTES).putLong(input).array();"); + syn nta DefaultMappingDefinition RagConnect.defaultFloatToBytesMapping() = baseDefaultMappingDefinition( + "float", "byte[]", "return java.nio.ByteBuffer.allocate(Float.BYTES).putFloat(input).array();"); + syn nta DefaultMappingDefinition RagConnect.defaultDoubleToBytesMapping() = baseDefaultMappingDefinition( + "double", "byte[]", "return java.nio.ByteBuffer.allocate(Double.BYTES).putDouble(input).array();"); + syn nta DefaultMappingDefinition RagConnect.defaultCharToBytesMapping() = baseDefaultMappingDefinition( + "char", "byte[]", "return java.nio.ByteBuffer.allocate(Character.BYTES).putChar(input).array();"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToBytesMapping() = baseDefaultMappingDefinition( + "String", "byte[]", "return input.getBytes();"); - syn nta DefaultMappingDefinition RagConnect.defaultStringToIntMapping() = baseDefaultMappingDefinition("String", "int", "return Integer.parseInteger(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultStringToShortMapping() = baseDefaultMappingDefinition("String", "short", "return Short.parseShort(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultStringToLongMapping() = baseDefaultMappingDefinition("String", "long", "return Long.parseLong(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultStringToFloatMapping() = baseDefaultMappingDefinition("String", "float", "return Float.parseFloat(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultStringToDoubleMapping() = baseDefaultMappingDefinition("String", "double", "return Double.parseDouble(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultStringToCharMapping() = baseDefaultMappingDefinition("String", "char", "return input.charAt(0);"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToIntMapping() = baseDefaultMappingDefinition( + "String", "int", "return Integer.parseInt(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToShortMapping() = baseDefaultMappingDefinition( + "String", "short", "return Short.parseShort(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToLongMapping() = baseDefaultMappingDefinition( + "String", "long", "return Long.parseLong(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToFloatMapping() = baseDefaultMappingDefinition( + "String", "float", "return Float.parseFloat(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToDoubleMapping() = baseDefaultMappingDefinition( + "String", "double", "return Double.parseDouble(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultStringToCharMapping() = baseDefaultMappingDefinition( + "String", "char", "return input.charAt(0);"); - syn nta DefaultMappingDefinition RagConnect.defaultIntToStringMapping() = baseDefaultMappingDefinition("int", "String", "return String.valueOf(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultShortToStringMapping() = baseDefaultMappingDefinition("int", "String", "return String.valueOf(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultLongToStringMapping() = baseDefaultMappingDefinition("int", "String", "return String.valueOf(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultFloatToStringMapping() = baseDefaultMappingDefinition("int", "String", "return String.valueOf(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultDoubleToStringMapping() = baseDefaultMappingDefinition("int", "String", "return String.valueOf(input);"); - syn nta DefaultMappingDefinition RagConnect.defaultCharToStringMapping() = baseDefaultMappingDefinition("int", "String", "return String.valueOf(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultIntToStringMapping() = baseDefaultMappingDefinition( + "int", "String", "return String.valueOf(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultShortToStringMapping() = baseDefaultMappingDefinition( + "short", "String", "return String.valueOf(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultLongToStringMapping() = baseDefaultMappingDefinition( + "long", "String", "return String.valueOf(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultFloatToStringMapping() = baseDefaultMappingDefinition( + "float", "String", "return String.valueOf(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultDoubleToStringMapping() = baseDefaultMappingDefinition( + "double", "String", "return String.valueOf(input);"); + syn nta DefaultMappingDefinition RagConnect.defaultCharToStringMapping() = baseDefaultMappingDefinition( + "char", "String", "return String.valueOf(input);"); } aspect Mappings { @@ -300,7 +240,7 @@ aspect Mappings { syn java.util.List<MappingDefinition> RagConnect.allMappingDefinitions() { java.util.List<MappingDefinition> result = new java.util.ArrayList<>(); getMappingDefinitionList().iterator().forEachRemaining(result::add); - // byte[] converstion + // byte[] conversion result.add(defaultBytesToIntMapping()); result.add(defaultBytesToShortMapping()); result.add(defaultBytesToLongMapping()); @@ -315,7 +255,7 @@ aspect Mappings { result.add(defaultDoubleToBytesMapping()); result.add(defaultCharToBytesMapping()); result.add(defaultStringToBytesMapping()); - // string converstion + // string conversion result.add(defaultStringToIntMapping()); result.add(defaultStringToShortMapping()); result.add(defaultStringToLongMapping()); diff --git a/src/main/jastadd/parser/RagConnect.parser b/src/main/jastadd/parser/RagConnect.parser index 0f897afc1992544d7736ccee4d884b934e7f0227..56a8dc4cc7f3396e778a529e981c1aefb302e18b 100644 --- a/src/main/jastadd/parser/RagConnect.parser +++ b/src/main/jastadd/parser/RagConnect.parser @@ -10,6 +10,10 @@ RagConnect ragconnect private Iterable<String> makeMappingDefs(ArrayList<?> raw_mapping_defs) { return () -> raw_mapping_defs.stream().map(raw -> ((Symbol) raw).value.toString()).iterator(); } + private TokenEndpointDefinition enableAlwaysApply(TokenEndpointDefinition def) { + def.setAlwaysApply(true); + return def; + } :} ; EndpointDefinition endpoint_definition @@ -29,10 +33,10 @@ EndpointDefinition endpoint_definition EndpointDefinition endpoint_definition_type = RECEIVE token_ref {: return new ReceiveFromMqttDefinition().setToken(token_ref); :} | RECEIVE token_ref VIA MQTT {: return new ReceiveFromMqttDefinition().setToken(token_ref); :} - | RECEIVE token_ref VIA REST {: return new ReceiveFromRestDefinition().setToken(token_ref); :} + | RECEIVE token_ref VIA REST {: return enableAlwaysApply(new ReceiveFromRestDefinition()).setToken(token_ref); :} | SEND token_ref {: return new SendToMqttDefinition().setToken(token_ref); :} | SEND token_ref VIA MQTT {: return new SendToMqttDefinition().setToken(token_ref); :} - | SEND token_ref VIA REST {: return new SendToRestDefinition().setToken(token_ref); :} + | SEND token_ref VIA REST {: return enableAlwaysApply(new SendToRestDefinition()).setToken(token_ref); :} ; TokenComponent token_ref diff --git a/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java b/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java index 8b33412c7994b5443088de6249273b9b83374414..5160ab6611f8a8f177555e55e511153b95a9659b 100644 --- a/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java +++ b/src/main/java/org/jastadd/ragconnect/compiler/Compiler.java @@ -14,9 +14,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import java.util.Collection; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import java.util.*; public class Compiler extends AbstractCompiler { @@ -62,18 +60,26 @@ public class Compiler extends AbstractCompiler { } printMessage("Writing output files"); - // copy MqttHandler into outputDir - final String mqttHandlerFileName = "MqttHandler.jadd"; - try { - InputStream inputStream = Compiler.class.getClassLoader().getResourceAsStream(mqttHandlerFileName); - if (inputStream == null) { - throw new CompilerException("Could not open " + mqttHandlerFileName); + final List<String> handlers = new ArrayList<>(); + if (ragConnect.usesMqtt()) { + handlers.add("MqttHandler.jadd"); + } + if (ragConnect.usesRest()) { + handlers.add("RestHandler.jadd"); + } + // copy handlers into outputDir + for (String handlerFileName : handlers) { + try { + InputStream inputStream = Compiler.class.getClassLoader().getResourceAsStream(handlerFileName); + if (inputStream == null) { + throw new CompilerException("Could not open " + handlerFileName); + } + Files.copy(inputStream, + getConfiguration().outputDir().toPath().resolve(handlerFileName), + StandardCopyOption.REPLACE_EXISTING); + } catch (IOException e) { + throw new CompilerException("Could not copy " + handlerFileName, e); } - Files.copy(inputStream, - getConfiguration().outputDir().toPath().resolve(mqttHandlerFileName), - StandardCopyOption.REPLACE_EXISTING); - } catch (IOException e) { - throw new CompilerException("Could not copy " + mqttHandlerFileName, e); } for (GrammarFile grammarFile : ragConnect.getProgram().getGrammarFileList()) { Path outputFile = getConfiguration().outputDir().toPath().resolve(grammarFile.getFileName()); @@ -90,7 +96,7 @@ public class Compiler extends AbstractCompiler { new Compiler().run(args); } catch (CompilerException e) { System.err.println(e.getMessage()); - System.exit(-1); + System.exit(1); } } @@ -162,6 +168,7 @@ public class Compiler extends AbstractCompiler { parseGrammar(program, filename); break; case "connect": + case "ragconnect": // process ragConnect RagConnect parsedRagConnect = parseRagConnect(program, filename); mergeRagConnectDefinitions(ragConnect, parsedRagConnect); diff --git a/src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java b/src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java index ac1109fef423ed58ebbbdfcaeacbdca42745e341..9da13bf479b6fe16be8c935b06cf1e9ad3283308 100644 --- a/src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java +++ b/src/main/java/org/jastadd/ragconnect/compiler/SimpleMain.java @@ -21,6 +21,17 @@ public class SimpleMain { // --- just testing byte[] conversion --- public static void testing() { + System.out.println("---"); + try { + Class<?> clazz = Class.forName("java.util.List"); + System.out.println("clazz.getName() = " + clazz.getName()); + System.out.println(Integer.class.isAssignableFrom(Integer.class)); + System.out.println(new SimpleJavaTypeUse("int").assignableTo(new SimpleJavaTypeUse("Integer"))); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + System.out.println("---"); + byte[] bytes; int i = 1; double d = 2.3d; @@ -102,8 +113,8 @@ public class SimpleMain { } public static void main(String[] args) { -// testing(); - createManualAST(); + testing(); +// createManualAST(); } private static void createManualAST() { diff --git a/src/main/resources/MqttHandler.jadd b/src/main/resources/MqttHandler.jadd index 493d8e4452e81c5dbfa45a522a6366345908cdcc..1161211ffb0b90eaf26c7d27d709d71f7a6369c8 100644 --- a/src/main/resources/MqttHandler.jadd +++ b/src/main/resources/MqttHandler.jadd @@ -83,7 +83,7 @@ public class MqttHandler { String topicString = topic.toString(); java.util.List<java.util.function.Consumer<byte[]>> callbackList = callbacks.get(topicString); if (callbackList == null || callbackList.isEmpty()) { - logger.debug("Got a message, but no callback to call. Forgot to unsubscribe?"); + logger.debug("Got a message, but no callback to call. Forgot to subscribe?"); } else { byte[] message = body.toByteArray(); // System.out.println("message = " + Arrays.toString(message)); diff --git a/src/main/resources/RestHandler.jadd b/src/main/resources/RestHandler.jadd new file mode 100644 index 0000000000000000000000000000000000000000..24118f04c563fe0b44105bfe674e269c76e7466f --- /dev/null +++ b/src/main/resources/RestHandler.jadd @@ -0,0 +1,99 @@ +aspect RestHandler { +/** + * Helper class to receive updates and publishes information via REST. + * @author rschoene - Initial contribution + */ +public class RestHandler { + private static final int DEFAULT_PORT = 4567; + + private final org.apache.logging.log4j.Logger logger; + private final String name; + private int port; + private final java.util.concurrent.CountDownLatch exitCondition; + /** Dispatch knowledge */ + private final java.util.Map<String, java.util.List<java.util.function.Consumer<String>>> callbacks; + private final java.util.Map<String, SupplierWithException<String>> suppliers; + + public RestHandler() { + this("RagConnect"); + } + + public RestHandler(String name) { + this.logger = org.apache.logging.log4j.LogManager.getLogger(RestHandler.class); + this.name = name; + this.port = DEFAULT_PORT; + this.exitCondition = new java.util.concurrent.CountDownLatch(1); + this.callbacks = new java.util.HashMap<>(); + this.suppliers = new java.util.HashMap<>(); + } + + public RestHandler setPort(int port) { + this.port = port; + start(); + return this; + } + + public void newPUTConnection(String path, java.util.function.Consumer<String> callback) { + if (callbacks.containsKey(path)) { + callbacks.get(path).add(callback); + } else { + // setup path + java.util.List<java.util.function.Consumer<String>> callbackList = new java.util.ArrayList<>(); + callbackList.add(callback); + callbacks.put(path, callbackList); + spark.Spark.put(path, (request, response) -> { + String content = request.body(); + java.util.Set<String> errors = new java.util.HashSet<>(); + for (java.util.function.Consumer<String> f : callbackList) { + try { + f.accept(content); + } catch (Exception e) { + errors.add(e.getMessage()); + } + } + if (errors.isEmpty()) { + return "OK"; + } else { + return makeError(response, 500, errors.stream().collect(java.util.stream.Collectors.joining("\n", "The folloing errors happened: [", "]"))); + } + }); + } + } + + public void newGETConnection(String path, SupplierWithException<String> supplier) { + if (suppliers.get(path) != null) { + logger.warn("Overriding existing supplier for '{}'", path); + } + suppliers.put(path, supplier); + spark.Spark.get(path, (request, response) -> { + try { + return supplier.get(); + } catch (Exception e) { + return makeError(response, 500, e.getMessage()); + } + }); + } + + private String makeError(spark.Response response, int statusCode, String message) { + response.status(statusCode); + return message; + } + + public void start() { + logger.info("Starting REST server at {}", this.port); + spark.Spark.port(this.port); + spark.Spark.init(); + spark.Spark.awaitInitialization(); + } + + public void close() { + spark.Spark.stop(); + spark.Spark.awaitStop(); + } + +} +@FunctionalInterface +public interface SupplierWithException<T> { + public T get() throws Exception; +} +} diff --git a/src/main/resources/mappingApplication.mustache b/src/main/resources/mappingApplication.mustache index 95ce2fe29329d87f880497b37697d50c8c0687be..cbfac221a210037dce1f9881699edad5c68776a2 100644 --- a/src/main/resources/mappingApplication.mustache +++ b/src/main/resources/mappingApplication.mustache @@ -1,7 +1,7 @@ {{lastDefinitionToType}} {{resultVarPrefix}}{{lastDefinitionName}}; try { {{#InnerMappingDefinitions}} - {{^last}}{{ToType}} {{/last}}{{resultVarPrefix}}{{methodName}} = {{methodName}}({{inputVarName}});{{!inputVarName has to be computed beforehand}} + {{^last}}{{ToType}} {{/last}}{{resultVarPrefix}}{{methodName}} = {{methodName}}({{inputVarName}}); {{/InnerMappingDefinitions}} } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/resources/mqtt.mustache b/src/main/resources/mqtt.mustache index dbdb85e7954dbf50ae7e150ffc43dd4cbda0fd80..95b253a9b4b4e46fda738a66499b8e2a7cc3707d 100644 --- a/src/main/resources/mqtt.mustache +++ b/src/main/resources/mqtt.mustache @@ -1,5 +1,5 @@ aspect MQTT { - private String {{rootNodeName}}.MqttName() { return "Ros2Rag"; } + private String {{rootNodeName}}.MqttName() { return "RagConnectMQTT"; } private MqttHandler {{rootNodeName}}.{{mqttHandlerField}} = new MqttHandler(MqttName()); public void {{rootNodeName}}.{{mqttSetHostMethod}}(String host) throws java.io.IOException { {{mqttHandlerField}}.setHost(host); @@ -20,4 +20,7 @@ aspect MQTT { {{#first}}inh MqttHandler ASTNode.{{mqttHandlerAttribute}}();{{/first}} eq {{rootNodeName}}.get{{name}}().{{mqttHandlerAttribute}}() = {{mqttHandlerField}}; {{/getRootTypeComponents}} + {{^getRootTypeComponents}} + syn MqttHandler {{rootNodeName}}.{{mqttHandlerAttribute}}() = {{mqttHandlerField}}; + {{/getRootTypeComponents}} } diff --git a/src/main/resources/ragconnect.mustache b/src/main/resources/ragconnect.mustache index 0b455283977cf812a47b5266ee593c6597e97cc9..24e25418d07766f0ac881683080a622687ceff8e 100644 --- a/src/main/resources/ragconnect.mustache +++ b/src/main/resources/ragconnect.mustache @@ -1,12 +1,21 @@ -{{> mqtt}} +{{#usesMqtt}} + {{> mqtt}} +{{/usesMqtt}} +{{#usesRest}} + {{> rest}} +{{/usesRest}} aspect ROS2RAG { {{#ReceiveDefinitions}} {{> receiveDefinition}} {{/ReceiveDefinitions}} - {{#SendDefinitions}} - {{> sendDefinition}} - {{/SendDefinitions}} + {{#PushSendDefinitions}} + {{> sendDefinitionPush}} + {{/PushSendDefinitions}} + + {{#PullSendDefinitions}} + {{> sendDefinitionPull}} + {{/PullSendDefinitions}} {{#MappingDefinitions}} {{> mappingDefinition}} diff --git a/src/main/resources/receiveDefinition.mustache b/src/main/resources/receiveDefinition.mustache index c02f5e5f49f6a9bebf0f6a1e7498ec743024afb3..31a08c737349b6c2d16f14a0fab50065d2c01a35 100644 --- a/src/main/resources/receiveDefinition.mustache +++ b/src/main/resources/receiveDefinition.mustache @@ -1,8 +1,8 @@ - public void {{parentTypeName}}.{{connectMethod}}(String topic) { - {{handlerAttribute}}().newConnection(topic, message -> { + public void {{parentTypeName}}.{{connectMethod}}(String {{connectParameterName}}) { + {{handlerAttribute}}().{{newConnectionMethod}}({{connectParameterName}}, message -> { {{> mappingApplication}} {{#loggingEnabledForReads}} - System.out.println("[Receive] " + topic + " -> {{tokenName}} = " + {{lastResult}}); + System.out.println("[Receive] " + {{connectParameterName}} + " -> {{tokenName}} = " + {{lastResult}}); {{/loggingEnabledForReads}} set{{tokenName}}({{lastResult}}); }); diff --git a/src/main/resources/rest.mustache b/src/main/resources/rest.mustache new file mode 100644 index 0000000000000000000000000000000000000000..fb77601c38467e0f3f1bd1f01993db410670ce16 --- /dev/null +++ b/src/main/resources/rest.mustache @@ -0,0 +1,18 @@ +aspect REST { + private String {{rootNodeName}}.RestName() { return "RagConnectREST"; } + private RestHandler {{rootNodeName}}.{{restHandlerField}} = new RestHandler(RestName()); + public void {{rootNodeName}}.{{restSetPortMethod}}(int port) { + {{restHandlerField}}.setPort(port); + } + public void {{rootNodeName}}.{{restCloseMethod}}() { + {{restHandlerField}}.close(); + } + + {{#getRootTypeComponents}} + {{#first}}inh RestHandler ASTNode.{{restHandlerAttribute}}();{{/first}} + eq {{rootNodeName}}.get{{name}}().{{restHandlerAttribute}}() = {{restHandlerField}}; + {{/getRootTypeComponents}} + {{^getRootTypeComponents}} + syn RestHandler {{rootNodeName}}.{{restHandlerAttribute}}() = {{restHandlerField}}; + {{/getRootTypeComponents}} +} diff --git a/src/main/resources/sendDefinitionPull.mustache b/src/main/resources/sendDefinitionPull.mustache new file mode 100644 index 0000000000000000000000000000000000000000..598846d86f9fc67167de7896f42c30cd0cfc3360 --- /dev/null +++ b/src/main/resources/sendDefinitionPull.mustache @@ -0,0 +1,7 @@ + public void {{parentTypeName}}.{{connectMethod}}(String {{connectParameterName}}, boolean writeCurrentValue) { + {{handlerAttribute}}().{{newConnectionMethod}}({{connectParameterName}}, () -> { + {{tokenResetMethod}}(); + {{> mappingApplication}} + return {{lastResult}}; + }); + } diff --git a/src/main/resources/sendDefinition.mustache b/src/main/resources/sendDefinitionPush.mustache similarity index 80% rename from src/main/resources/sendDefinition.mustache rename to src/main/resources/sendDefinitionPush.mustache index 874a342512326434d365563f5c1de93a609c5029..3f75b18274d687d306f7778f9846aeca592fa86f 100644 --- a/src/main/resources/sendDefinition.mustache +++ b/src/main/resources/sendDefinitionPush.mustache @@ -1,8 +1,8 @@ private String {{parentTypeName}}.{{sendTopic}} = null; private byte[] {{parentTypeName}}.{{lastValue}} = null; - public void {{parentTypeName}}.{{connectMethod}}(String topic, boolean writeCurrentValue) { - {{sendTopic}} = topic; + public void {{parentTypeName}}.{{connectMethod}}(String {{connectParameterName}}, boolean writeCurrentValue) { + {{sendTopic}} = {{connectParameterName}}; {{updateMethod}}(); if (writeCurrentValue) { {{writeMethod}}(); diff --git a/src/main/resources/tokenComponent.mustache b/src/main/resources/tokenComponent.mustache index e6a136d1c8de08b6dce9104fd46fafa5d91b67b6..729f442aebfc67ee2bbf5e559a9946405a275260 100644 --- a/src/main/resources/tokenComponent.mustache +++ b/src/main/resources/tokenComponent.mustache @@ -3,9 +3,11 @@ {{#DependencyDefinitions}} for ({{targetParentTypeName}} target : get{{internalRelationPrefix}}TargetList()) { {{#targetEndpointDefinition}} + {{#isPush}} if (target.{{updateMethod}}()) { target.{{writeMethod}}(); } + {{/isPush}} {{/targetEndpointDefinition}} } {{/DependencyDefinitions}}