From e4473f2702c2ce1c50bcc66310b53aae5d53c683 Mon Sep 17 00:00:00 2001 From: SebastianEbert <sebastian.ebert@tu-dresden.de> Date: Mon, 25 Jan 2021 15:05:12 +0100 Subject: [PATCH] fixed bugs discovered in review --- ragconnect.base/src/main/resources/JavaHandler.jadd | 2 +- ragconnect.base/src/main/resources/receiveDefinition.mustache | 2 +- ragconnect.base/src/main/resources/sendDefinition.mustache | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ragconnect.base/src/main/resources/JavaHandler.jadd b/ragconnect.base/src/main/resources/JavaHandler.jadd index 44ac211..217ae63 100644 --- a/ragconnect.base/src/main/resources/JavaHandler.jadd +++ b/ragconnect.base/src/main/resources/JavaHandler.jadd @@ -14,7 +14,7 @@ aspect JavaHandler { public static JavaHandler JAVA_HANDLER_INSTANCE = null; - private final org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger(avaHandler.class); + private final org.apache.logging.log4j.Logger logger = org.apache.logging.log4j.LogManager.getLogger(JavaHandler.class); private Map<String, List<Consumer<byte[]>>> callbackList = new ConcurrentHashMap<>(); diff --git a/ragconnect.base/src/main/resources/receiveDefinition.mustache b/ragconnect.base/src/main/resources/receiveDefinition.mustache index 4abe2cb..86523f5 100644 --- a/ragconnect.base/src/main/resources/receiveDefinition.mustache +++ b/ragconnect.base/src/main/resources/receiveDefinition.mustache @@ -15,7 +15,7 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam case "mqtt": return {{javaHandlerAttribute}}().registerCallback(uri, consumer); {{/usesJava}} {{#usesRest}} - case "rest": return {{restHandlerAttribute}}().newPUTConnection(uri, input -> { + case "java": return {{restHandlerAttribute}}().newPUTConnection(uri, input -> { consumer.accept(input.getBytes()); }); {{/usesRest}} diff --git a/ragconnect.base/src/main/resources/sendDefinition.mustache b/ragconnect.base/src/main/resources/sendDefinition.mustache index 56fde1d..a913710 100644 --- a/ragconnect.base/src/main/resources/sendDefinition.mustache +++ b/ragconnect.base/src/main/resources/sendDefinition.mustache @@ -21,8 +21,8 @@ public boolean {{parentTypeName}}.{{connectMethod}}(String {{connectParameterNam break; {{/usesMqtt}} {{#usesJava}} - case "mqtt": - final MqttHandler handler = {{javaHandlerAttribute}}().resolveHandler(uri); + case "java": + final JavaHandler handler = {{javaHandlerAttribute}}().resolveHandler(uri); final String topic = {{javaHandlerAttribute}}().extractTopic(uri); {{sender}} = () -> { {{#loggingEnabledForWrites}} -- GitLab