Skip to content
Snippets Groups Projects
Commit 38c4a6a2 authored by Sebastian Ebert's avatar Sebastian Ebert
Browse files

bugfix on java backend

parent 5c47afd8
Branches
No related tags found
1 merge request!11Merge/dev to fork master merge
......@@ -227,6 +227,7 @@ public class Compiler extends AbstractCompiler {
ASTNode.loggingEnabledForReads = optionLogReads.value();
ASTNode.loggingEnabledForWrites = optionLogWrites.value();
ASTNode.usesMqtt = optionProtocols.hasValue(OPTION_PROTOCOL_MQTT);
ASTNode.usesJava = optionProtocols.hasValue(OPTION_PROTOCOL_JAVA);
ASTNode.usesRest = optionProtocols.hasValue(OPTION_PROTOCOL_REST);
return ragConnect;
}
......
......@@ -29,7 +29,7 @@ aspect JavaHandler {
return JAVA_HANDLER_INSTANCE;
}
public void registerCallback(String topic, Consumer<byte[]> callback) {
public boolean registerCallback(String topic, Consumer<byte[]> callback) {
logger.debug("[JAVA_HANDLER] Registering new callback.");
......@@ -42,8 +42,12 @@ aspect JavaHandler {
} else {
registeredCallbacks.add(callback);
}
return true;
}
public void close(){};
public boolean push(String topic, byte[] data) {
logger.debug("[JAVA_HANDLER] Pushing a message.");
......
......@@ -12,10 +12,10 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam
case "mqtt": return {{mqttHandlerAttribute}}().newConnection(uri, consumer);
{{/usesMqtt}}
{{#usesJava}}
case "mqtt": return {{javaHandlerAttribute}}().registerCallback(uri, consumer);
case "java": return {{javaHandlerAttribute}}().registerCallback(path, consumer);
{{/usesJava}}
{{#usesRest}}
case "java": return {{restHandlerAttribute}}().newPUTConnection(uri, input -> {
case "rest": return {{restHandlerAttribute}}().newPUTConnection(uri, input -> {
consumer.accept(input.getBytes());
});
{{/usesRest}}
......
......@@ -22,13 +22,10 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam
{{/usesMqtt}}
{{#usesJava}}
case "java":
final JavaHandler handler = {{javaHandlerAttribute}}().resolveHandler(uri);
final String topic = {{javaHandlerAttribute}}().extractTopic(uri);
final JavaHandler handler = {{javaHandlerAttribute}}().getInstance();
{{sender}} = () -> {
{{#loggingEnabledForWrites}}
System.out.println("[Send] {{tokenName}} = " + get{{tokenName}}() + " -> " + {{connectParameterName}});
{{/loggingEnabledForWrites}}
handler.publish(topic, {{lastValue}});
handler.push(path, {{lastValue}});
};
{{updateMethod}}();
if (writeCurrentValue) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment