From 861fc328ffce26ebc1b7a5d5ca5937857c4cae61 Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Sat, 7 Dec 2024 23:07:32 +0100 Subject: [PATCH 1/7] Alpha release of the redis protocol adapter --- .../hivemq-edge-module-redis/.idea/.gitignore | 3 + modules/hivemq-edge-module-redis/.idea/.name | 1 + .../.idea/compiler.xml | 6 + .../hivemq-edge-module-redis/.idea/gradle.xml | 17 ++ .../.idea/jarRepositories.xml | 25 ++ .../hivemq-edge-module-redis/.idea/misc.xml | 5 + .../.idea/modules.xml | 8 + .../hivemq-edge-module-redis/.idea/vcs.xml | 6 + modules/hivemq-edge-module-redis/HEADER | 13 + .../hivemq-edge-module-redis/build.gradle.kts | 45 ++++ .../gradle.properties | 24 ++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + modules/hivemq-edge-module-redis/gradlew | 234 ++++++++++++++++++ modules/hivemq-edge-module-redis/gradlew.bat | 89 +++++++ .../settings.gradle.kts | 10 + .../redis/RedisPollingProtocolAdapter.java | 158 ++++++++++++ .../redis/RedisProtocolAdapterFactory.java | 43 ++++ .../RedisProtocolAdapterInformation.java | 127 ++++++++++ .../RedisSubscribingProtocolAdapter.java | 74 ++++++ .../redis/config/RedisAdapterConfig.java | 125 ++++++++++ .../redis/config/RedisPollingContext.java | 129 ++++++++++ ...r.sdk.api.factories.ProtocolAdapterFactory | 1 + .../src/main/resources/httpd/images/redis.png | Bin 0 -> 47278 bytes .../resources/redis-adapter-ui-schema.json | 53 ++++ .../RedisPollingProtocolAdapterTest.java | 39 +++ .../RedisProtocolAdapterInformationTest.java | 39 +++ .../adapters/redis/TestPollingOutput.java | 75 ++++++ 28 files changed, 1355 insertions(+) create mode 100644 modules/hivemq-edge-module-redis/.idea/.gitignore create mode 100644 modules/hivemq-edge-module-redis/.idea/.name create mode 100644 modules/hivemq-edge-module-redis/.idea/compiler.xml create mode 100644 modules/hivemq-edge-module-redis/.idea/gradle.xml create mode 100644 modules/hivemq-edge-module-redis/.idea/jarRepositories.xml create mode 100644 modules/hivemq-edge-module-redis/.idea/misc.xml create mode 100644 modules/hivemq-edge-module-redis/.idea/modules.xml create mode 100644 modules/hivemq-edge-module-redis/.idea/vcs.xml create mode 100644 modules/hivemq-edge-module-redis/HEADER create mode 100644 modules/hivemq-edge-module-redis/build.gradle.kts create mode 100644 modules/hivemq-edge-module-redis/gradle.properties create mode 100644 modules/hivemq-edge-module-redis/gradle/wrapper/gradle-wrapper.jar create mode 100644 modules/hivemq-edge-module-redis/gradle/wrapper/gradle-wrapper.properties create mode 100755 modules/hivemq-edge-module-redis/gradlew create mode 100644 modules/hivemq-edge-module-redis/gradlew.bat create mode 100644 modules/hivemq-edge-module-redis/settings.gradle.kts create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java create mode 100644 modules/hivemq-edge-module-redis/src/main/resources/META-INF/services/com.hivemq.adapter.sdk.api.factories.ProtocolAdapterFactory create mode 100644 modules/hivemq-edge-module-redis/src/main/resources/httpd/images/redis.png create mode 100644 modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json create mode 100644 modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapterTest.java create mode 100644 modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java create mode 100644 modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java diff --git a/modules/hivemq-edge-module-redis/.idea/.gitignore b/modules/hivemq-edge-module-redis/.idea/.gitignore new file mode 100644 index 0000000000..26d33521af --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/modules/hivemq-edge-module-redis/.idea/.name b/modules/hivemq-edge-module-redis/.idea/.name new file mode 100644 index 0000000000..0316ac6373 --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/.name @@ -0,0 +1 @@ +hivemq-postgresql-protocol-adapter \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/.idea/compiler.xml b/modules/hivemq-edge-module-redis/.idea/compiler.xml new file mode 100644 index 0000000000..fb7f4a8a46 --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/.idea/gradle.xml b/modules/hivemq-edge-module-redis/.idea/gradle.xml new file mode 100644 index 0000000000..5cbb93ace3 --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/.idea/jarRepositories.xml b/modules/hivemq-edge-module-redis/.idea/jarRepositories.xml new file mode 100644 index 0000000000..a529ef2a03 --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/.idea/misc.xml b/modules/hivemq-edge-module-redis/.idea/misc.xml new file mode 100644 index 0000000000..25d34a4744 --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/misc.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/.idea/modules.xml b/modules/hivemq-edge-module-redis/.idea/modules.xml new file mode 100644 index 0000000000..94281d65a9 --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/.idea/vcs.xml b/modules/hivemq-edge-module-redis/.idea/vcs.xml new file mode 100644 index 0000000000..d483ca8fed --- /dev/null +++ b/modules/hivemq-edge-module-redis/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/HEADER b/modules/hivemq-edge-module-redis/HEADER new file mode 100644 index 0000000000..6e731e9277 --- /dev/null +++ b/modules/hivemq-edge-module-redis/HEADER @@ -0,0 +1,13 @@ +Copyright 2023-present HiveMQ GmbH + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/build.gradle.kts b/modules/hivemq-edge-module-redis/build.gradle.kts new file mode 100644 index 0000000000..439db9ca18 --- /dev/null +++ b/modules/hivemq-edge-module-redis/build.gradle.kts @@ -0,0 +1,45 @@ +plugins { + id("java") + id("com.github.sgtsilvio.gradle.utf8") + id("com.github.johnrengelman.shadow") + id("com.github.hierynomus.license") + id("org.owasp.dependencycheck") +} + + +group = "com.hivemq" +version = "2024.7-ALPHA" + +repositories { + mavenLocal() + mavenCentral() +} + + +dependencies { + compileOnly("com.hivemq:hivemq-edge-adapter-sdk:${property("hivemq-edge-adapter-sdk.version")}") + compileOnly("commons-io:commons-io:${property("commons-io.version")}") + implementation("redis.clients:jedis:5.0.2") + implementation("com.fasterxml.jackson.core:jackson-core:2.18.1") + compileOnly("com.fasterxml.jackson.core:jackson-databind:${property("jackson.version")}") + compileOnly("org.slf4j:slf4j-api:${property("slf4j.version")}") +} + +dependencies { + testImplementation("org.junit.jupiter:junit-jupiter-api:${property("junit.jupiter.version")}") + testImplementation("org.junit.jupiter:junit-jupiter-params:${property("junit.jupiter.version")}") + testImplementation("org.junit.platform:junit-platform-launcher:${property("junit.jupiter.platform.version")}") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${property("junit.jupiter.version")}") + testImplementation("com.hivemq:hivemq-edge-adapter-sdk:${property("hivemq-edge-adapter-sdk.version")}") + testImplementation("org.mockito:mockito-core:${property("mockito.version")}") + testImplementation("com.fasterxml.jackson.core:jackson-databind:${property("jackson.version")}") +} + +tasks.test { + useJUnitPlatform() +} + +license { + header = file("HEADER") + mapping("java", "SLASHSTAR_STYLE") +} \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/gradle.properties b/modules/hivemq-edge-module-redis/gradle.properties new file mode 100644 index 0000000000..3325e1095e --- /dev/null +++ b/modules/hivemq-edge-module-redis/gradle.properties @@ -0,0 +1,24 @@ +# +# hivemq dependencies +# +hivemq-edge-adapter-sdk.version=2024.7 +# +# main dependencies +# +commons-io.version=2.13.0 +jackson.version=2.17.0 +slf4j.version=1.7.30 + +# +# plugins +# +plugin.utf8.version=0.1.0 +plugin.shadow.version=7.1.2 +plugin.license.version=0.16.1 +plugin.dependencycheck.version=7.4.4 +# +# tests +# +junit.jupiter.version=5.7.1 +junit.jupiter.platform.version=1.7.1 +mockito.version=5.7.0 diff --git a/modules/hivemq-edge-module-redis/gradle/wrapper/gradle-wrapper.jar b/modules/hivemq-edge-module-redis/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/modules/hivemq-edge-module-redis/gradlew.bat b/modules/hivemq-edge-module-redis/gradlew.bat new file mode 100644 index 0000000000..107acd32c4 --- /dev/null +++ b/modules/hivemq-edge-module-redis/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/modules/hivemq-edge-module-redis/settings.gradle.kts b/modules/hivemq-edge-module-redis/settings.gradle.kts new file mode 100644 index 0000000000..0a4d4814d0 --- /dev/null +++ b/modules/hivemq-edge-module-redis/settings.gradle.kts @@ -0,0 +1,10 @@ +rootProject.name = "hivemq-redis-protocol-adapter" + +pluginManagement { + plugins { + id("com.github.johnrengelman.shadow") version "${extra["plugin.shadow.version"]}" + id("com.github.sgtsilvio.gradle.utf8") version "${extra["plugin.utf8.version"]}" + id("com.github.hierynomus.license") version "${extra["plugin.license.version"]}" + id("org.owasp.dependencycheck") version "${extra["plugin.dependencycheck.version"]}" + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java new file mode 100644 index 0000000000..956a88e5f0 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -0,0 +1,158 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; +import com.hivemq.adapter.sdk.api.model.*; +import com.hivemq.adapter.sdk.api.polling.PollingInput; +import com.hivemq.adapter.sdk.api.polling.PollingOutput; +import com.hivemq.adapter.sdk.api.polling.PollingProtocolAdapter; +import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState; +import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import com.hivemq.edge.adapters.redis.config.RedisPollingContext; +import org.jetbrains.annotations.NotNull; +import redis.clients.jedis.*; + +import java.util.List; + +public class RedisPollingProtocolAdapter implements PollingProtocolAdapter { + private final @NotNull RedisAdapterConfig adapterConfig; + private final @NotNull ProtocolAdapterInformation adapterInformation; + private final @NotNull ProtocolAdapterState protocolAdapterState; + private final @NotNull List pollingContext; + private JedisPool jedisPool = new JedisPool(); + private String password; + + public RedisPollingProtocolAdapter(final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input) { + this.adapterInformation = adapterInformation; + this.adapterConfig = input.getConfig(); + this.protocolAdapterState = input.getProtocolAdapterState(); + this.pollingContext = adapterConfig.getPollingContexts(); + } + + @Override + public @NotNull String getId() { + return adapterConfig.getId(); + } + + @Override + public void start(final @NotNull ProtocolAdapterStartInput input, final @NotNull ProtocolAdapterStartOutput output) { + /* Test connection to the database when starting the adapter. */ + try { + // Start Initialization + initJedisPool(); + + if(!jedisPool.isClosed()){ + output.startedSuccessfully(); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.CONNECTED); + } else { + output.failStart(new Throwable("Error connecting Redis server, please check the configuration"), "Error connecting Redis server, please check the configuration"); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); + } + } catch (final Exception e) { + output.failStart(e, null); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); + } + } + + private JedisPoolConfig buildPoolConfig() { + final JedisPoolConfig poolConfig = new JedisPoolConfig(); + // Change settings here if needed. + return poolConfig; + } + + @Override + public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInput, final @NotNull ProtocolAdapterStopOutput protocolAdapterStopOutput) { + jedisPool.close(); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); + protocolAdapterStopOutput.stoppedSuccessfully(); + } + + @Override + public @NotNull ProtocolAdapterInformation getProtocolAdapterInformation() { + return adapterInformation; + } + + @Override + public void poll(final @NotNull PollingInput pollingInput, final @NotNull PollingOutput pollingOutput) { + boolean broken = false; + Jedis jedis = null; + + /* Connect to the database and get the key */ + try { + if(jedisPool.isClosed()){ + initJedisPool(); + } + /* Get resource from the Pool*/ + jedis = jedisPool.getResource(); + String result = jedis.get(pollingInput.getPollingContext().getKey()); + + /* Publish datapoint */ + if(result != null) { + pollingOutput.addDataPoint("keyValue", result); + } else { + pollingOutput.addDataPoint("keyValue", null); + } + + } catch (Exception e) { + broken = true; + try { + jedisPool.close(); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + throw new RuntimeException(e); + } + finally + { + if(broken) + { + jedisPool.returnBrokenResource(jedis); + } + else if(jedis != null) + { + jedisPool.returnResource(jedis); + } + } + pollingOutput.finish(); + } + + @Override + public @NotNull List getPollingContexts() { + return pollingContext; + } + + @Override + public int getPollingIntervalMillis() { + return adapterConfig.getPollingIntervalMillis(); + } + + @Override + public int getMaxPollingErrorsBeforeRemoval() { + return adapterConfig.getMaxPollingErrorsBeforeRemoval(); + } + + // Initialize Jedis Pool + public void initJedisPool() throws Exception { + JedisPoolConfig jedisPoolConfig = buildPoolConfig(); + if(!adapterConfig.getPassword().isEmpty()) { + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),Integer.parseInt(adapterConfig.getPort()),60,adapterConfig.getPassword()); + } else { + jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), Integer.parseInt(adapterConfig.getPort()), 60); + } + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java new file mode 100644 index 0000000000..9ebb97af5c --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java @@ -0,0 +1,43 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis; + +import com.hivemq.adapter.sdk.api.ProtocolAdapter; +import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; +import com.hivemq.adapter.sdk.api.factories.ProtocolAdapterFactory; +import com.hivemq.adapter.sdk.api.model.ProtocolAdapterInput; +import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import org.jetbrains.annotations.NotNull; + +public class RedisProtocolAdapterFactory implements ProtocolAdapterFactory { + + @Override + public @NotNull ProtocolAdapterInformation getInformation() { + return RedisProtocolAdapterInformation.INSTANCE; + } + + @Override + public @NotNull ProtocolAdapter createAdapter(final @NotNull ProtocolAdapterInformation adapterInformation, @NotNull final ProtocolAdapterInput input) { + return new RedisPollingProtocolAdapter(adapterInformation, input); + } + + + @Override + public @NotNull Class getConfigClass() { + return RedisAdapterConfig.class; + } + +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java new file mode 100644 index 0000000000..64a6e6b005 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java @@ -0,0 +1,127 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis; + + +import com.hivemq.adapter.sdk.api.ProtocolAdapterCapability; +import com.hivemq.adapter.sdk.api.ProtocolAdapterCategory; +import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; +import com.hivemq.adapter.sdk.api.ProtocolAdapterTag; +import org.apache.commons.io.IOUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.EnumSet; +import java.util.List; + +public class RedisProtocolAdapterInformation implements ProtocolAdapterInformation { + + public static final @NotNull ProtocolAdapterInformation INSTANCE = new RedisProtocolAdapterInformation(); + private static final @NotNull Logger LOG = LoggerFactory.getLogger(RedisProtocolAdapterInformation.class); + + protected RedisProtocolAdapterInformation() { + } + + @Override + public @NotNull String getProtocolName() { + // the returned string will be used for logging information on the protocol adapter + return "Redis"; + } + + @Override + public @NotNull String getProtocolId() { + // this id is very important as this is how the adapters configurations in the config.xml are linked to the adapter implementations. + // any change here means you will need to edit the config.xml + return "Redis_Protocol"; + } + + @Override + public @NotNull String getDisplayName() { + // the name for this protocol adapter type that will be displayed within edge's ui + return "Redis Protocol Adapter"; + } + + @Override + public @NotNull String getDescription() { + // the description that will be shown for this protocol adapter within edge's ui + return "This protocol adapter allow you to query Redis keys, retrieve the result and send it via MQTT."; + } + + @Override + public @NotNull String getUrl() { + // this url will be displayed in the ui as a link to further documentation on this protocol adapter. + // e.g. this could be a link to the source code and a readme + return "TO BE DEFINED"; + } + + @Override + public @NotNull String getVersion() { + // the version of this protocol adapter, the usage of semantic versioning is advised. + return "2024.7 (Alpha)"; + } + + @Override + public @NotNull EnumSet getCapabilities() { + // this indicates what capabilities this protocol adapter has. E.g. READ/WRITE. See the ProtocolAdapterCapability enum for more information. + return EnumSet.of(ProtocolAdapterCapability.READ); + } + + @Override + public @NotNull String getLogoUrl() { + // this is a default image that is always available. + return "/images/redis.png"; + } + + @Override + public @NotNull String getAuthor() { + // your name/nick + return "Anthony O. (HiveMQ)"; + } + + @Override + public @Nullable ProtocolAdapterCategory getCategory() { + // this indicates for which use cases this protocol adapter is intended. See the ProtocolAdapterConstants.CATEGORY enum for more information. + return ProtocolAdapterCategory.CONNECTIVITY; + } + + @Override + public List getTags() { + // here you can set which Tags should be applied to this protocol adapter + return List.of(ProtocolAdapterTag.INTERNET, + ProtocolAdapterTag.TCP, + ProtocolAdapterTag.AUTOMATION); + } + + @Override + public @Nullable String getUiSchema() { + try (final InputStream is = this.getClass() + .getClassLoader() + .getResourceAsStream("redis-adapter-ui-schema.json")) { + if (is == null) { + LOG.warn("The UISchema for the Redis Adapter could not be loaded from resources: Not found."); + return null; + } + return IOUtils.toString(is, StandardCharsets.UTF_8); + } catch (Exception e) { + LOG.warn("The UISchema for the Redis Adapter could not be loaded from resources:", e); + return null; + } + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java new file mode 100644 index 0000000000..2de6aac16c --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java @@ -0,0 +1,74 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis; + +import com.hivemq.adapter.sdk.api.ProtocolAdapter; +import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; +import com.hivemq.adapter.sdk.api.factories.AdapterFactories; +import com.hivemq.adapter.sdk.api.model.*; +import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState; +import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +@SuppressWarnings({"FieldCanBeLocal", "unused", "EmptyTryBlock"}) +public class RedisSubscribingProtocolAdapter implements ProtocolAdapter { + private static final @NotNull Logger log = LoggerFactory.getLogger(RedisSubscribingProtocolAdapter.class); + + private final @NotNull RedisAdapterConfig adapterConfig; + private final @NotNull ProtocolAdapterInformation adapterInformation; + private final @NotNull ProtocolAdapterState protocolAdapterState; + private final @NotNull AdapterFactories adapterFactories; + + public RedisSubscribingProtocolAdapter( + final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input) { + this.adapterInformation = adapterInformation; + this.adapterConfig = input.getConfig(); + this.protocolAdapterState = input.getProtocolAdapterState(); + this.adapterFactories = input.adapterFactories(); + } + @Override + public @NotNull String getId() { + return adapterConfig.getId(); + } + + @Override + public void start(@NotNull ProtocolAdapterStartInput input, @NotNull ProtocolAdapterStartOutput output) { + try { + // connect and subscribe your client here + output.startedSuccessfully(); + } catch (final Exception e) { + // error handling like logging and signaling edge that the start failed + output.failStart(e, null); + } + } + + @Override + public void stop(@NotNull ProtocolAdapterStopInput protocolAdapterStopInput, @NotNull ProtocolAdapterStopOutput protocolAdapterStopOutput) { + try { + // gracefully disconnect and cleanup resources here + } catch (final Exception e) { + protocolAdapterStopOutput.failStop(e, null); + } + protocolAdapterStopOutput.stoppedSuccessfully(); + } + + @Override + public @NotNull ProtocolAdapterInformation getProtocolAdapterInformation() { + return adapterInformation; + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java new file mode 100644 index 0000000000..41de429cdc --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java @@ -0,0 +1,125 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis.config; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField; +import com.hivemq.adapter.sdk.api.config.ProtocolAdapterConfig; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.List; + + +@SuppressWarnings({"unused", "FieldCanBeLocal", "FieldMayBeFinal"}) +@JsonPropertyOrder({ + "url", + "destination"}) +public class RedisAdapterConfig implements ProtocolAdapterConfig { + + private static final @NotNull String ID_REGEX = "^([a-zA-Z_0-9-_])*$"; + + @JsonProperty(value = "id", required = true) + @ModuleConfigField(title = "Identifier", + description = "Unique identifier for this protocol adapter", + format = ModuleConfigField.FieldType.IDENTIFIER, + required = true, + stringPattern = ID_REGEX, + stringMinLength = 1, + stringMaxLength = 1024) + protected @NotNull String id; + + @JsonProperty(value = "server", required = true) + @ModuleConfigField(title = "Server", + description = "Server address", + format = ModuleConfigField.FieldType.UNSPECIFIED, + required = true, + stringMinLength = 1, + stringMaxLength = 1024) + protected @NotNull String server; + + @JsonProperty(value = "port", required = true) + @ModuleConfigField(title = "Port", + description = "Server port", + format = ModuleConfigField.FieldType.UNSPECIFIED, + required = true, + stringPattern = ID_REGEX, + stringMinLength = 1, + stringMaxLength = 6, + defaultValue = "6379") + protected @NotNull String port; + + @JsonProperty(value = "password", required = true) + @ModuleConfigField(title = "Password", + description = "Password for the connection to the database", + format = ModuleConfigField.FieldType.UNSPECIFIED, + required = true, + stringPattern = ID_REGEX, + stringMinLength = 1, + stringMaxLength = 1024) + protected @NotNull String password; + + @JsonProperty("pollingIntervalMillis") + @ModuleConfigField(title = "Polling Interval [ms]", + description = "Time in millisecond that this endpoint will be polled", + numberMin = 1, + required = true, + defaultValue = "2000") + private int pollingIntervalMillis = 10000; + + @JsonProperty("maxPollingErrorsBeforeRemoval") + @ModuleConfigField(title = "Max. Polling Errors", + description = "Max. errors polling the endpoint before the polling daemon is stopped", + numberMin = 3, + defaultValue = "10") + private int maxPollingErrorsBeforeRemoval = 10; + + + @JsonProperty("subscriptions") + @ModuleConfigField(title = "subscription", description = "Map your Redis data to a MQTT Topic") + private @NotNull List pollingContexts = new ArrayList<>(); + + public RedisAdapterConfig() { + id = ""; + server = ""; + port = ""; + password = ""; + } + + @Override + public @NotNull String getId() { + return id; + } + + public @NotNull String getServer() {return server;} + + public @NotNull String getPort() {return port;} + + public @NotNull String getPassword() {return password;} + + public int getPollingIntervalMillis() { + return pollingIntervalMillis; + } + + public int getMaxPollingErrorsBeforeRemoval() { + return maxPollingErrorsBeforeRemoval; + } + + public @NotNull List getPollingContexts() { + return pollingContexts; + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java new file mode 100644 index 0000000000..efd3a0aec8 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java @@ -0,0 +1,129 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis.config; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField; +import com.hivemq.adapter.sdk.api.config.MessageHandlingOptions; +import com.hivemq.adapter.sdk.api.config.PollingContext; +import com.hivemq.adapter.sdk.api.config.UserProperty; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; + +public class RedisPollingContext implements PollingContext { + @JsonProperty(value = "destination", required = true) + @ModuleConfigField(title = "Destination Topic", + description = "The topic to publish data on", + required = true, + format = ModuleConfigField.FieldType.MQTT_TOPIC) + protected @Nullable String destination; + + @JsonProperty(value = "key", required = true) + @ModuleConfigField(title = "Key", + description = "Key to get from Redis", + required = true, + format = ModuleConfigField.FieldType.UNSPECIFIED) + protected @Nullable String key; + + @JsonProperty(value = "qos", required = true) + @ModuleConfigField(title = "QoS", + description = "MQTT Quality of Service level", + required = true, + numberMin = 0, + numberMax = 2, + defaultValue = "1") + protected int qos; + + @JsonProperty(value = "messageHandlingOptions") + @ModuleConfigField(title = "Message Handling Options", + description = "This setting defines the format of the resulting MQTT message, either a message per changed tag or a message per subscription that may include multiple data points per sample", + enumDisplayValues = { + "MQTT Message Per Device Tag", + "MQTT Message Per Subscription (Potentially Multiple Data Points Per Sample)"}, + defaultValue = "MQTTMessagePerTag") + protected @NotNull MessageHandlingOptions messageHandlingOptions = MessageHandlingOptions.MQTTMessagePerTag; + + @JsonProperty(value = "includeTimestamp") + @ModuleConfigField(title = "Include Sample Timestamp In Publish?", + description = "Include the unix timestamp of the sample time in the resulting MQTT message", + defaultValue = "true") + protected @NotNull Boolean includeTimestamp = Boolean.TRUE; + + @JsonProperty(value = "includeTagNames") + @ModuleConfigField(title = "Include Tag Names In Publish?", + description = "Include the names of the tags in the resulting MQTT publish", + defaultValue = "false") + protected @NotNull Boolean includeTagNames = Boolean.FALSE; + + @JsonProperty(value = "userProperties") + @ModuleConfigField(title = "User Properties", + description = "Arbitrary properties to associate with the subscription", + arrayMaxItems = 10) + private @NotNull List userProperties = new ArrayList<>(); + + @JsonCreator + public RedisPollingContext( + @JsonProperty("destination") @Nullable final String destination, + @JsonProperty("query") @Nullable final String query, + @JsonProperty("spiltLinesInIndividualMessages") @Nullable final String spiltLinesInIndividualMessages, + @JsonProperty("rowLimit") final int rowLimit, + @JsonProperty("qos") final int qos, + @JsonProperty("userProperties") @Nullable List userProperties) { + this.destination = destination; + this.qos = qos; + this.key = key; + + if (userProperties != null) { + this.userProperties = userProperties; + } + } + + @Override + public @Nullable String getDestinationMqttTopic() { + return destination; + } + + public @Nullable String getKey(){return key;} + + @Override + public int getQos() { + return qos; + } + + @Override + public @NotNull MessageHandlingOptions getMessageHandlingOptions() { + return messageHandlingOptions; + } + + @Override + public @NotNull Boolean getIncludeTimestamp() { + return includeTimestamp; + } + + @Override + public @NotNull Boolean getIncludeTagNames() { + return includeTagNames; + } + + @Override + public @NotNull List getUserProperties() { + return userProperties; + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/resources/META-INF/services/com.hivemq.adapter.sdk.api.factories.ProtocolAdapterFactory b/modules/hivemq-edge-module-redis/src/main/resources/META-INF/services/com.hivemq.adapter.sdk.api.factories.ProtocolAdapterFactory new file mode 100644 index 0000000000..a2540a9d90 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/resources/META-INF/services/com.hivemq.adapter.sdk.api.factories.ProtocolAdapterFactory @@ -0,0 +1 @@ +com.hivemq.edge.adapters.redis.RedisProtocolAdapterFactory diff --git a/modules/hivemq-edge-module-redis/src/main/resources/httpd/images/redis.png b/modules/hivemq-edge-module-redis/src/main/resources/httpd/images/redis.png new file mode 100644 index 0000000000000000000000000000000000000000..8b8a44172cc435b6508e3f583f7e56efc41df2dc GIT binary patch literal 47278 zcmbTe2{;t&_dh&@7;ARPTFAaH$u4Cli9uvSQMRmOAInftR6;3BQ7UOdmh6N?2uXI? zl6A9!4S%2wFYeQ)UPRr6>YH zdXJIKIS7!!;)#-b+qbT-;Up=gX@2d0iY;`7Py*q>MbZot#~C1HGKi1sa<>1YUDE z;mEJ9#;bx+h5_81e9*iYH&=IWWsEBS?zqbEGx67w{JgtOe6FeTYZ52qMH!j$YI}G& z@t%;77I%=6lIB%}pX3x|lun#bR8$n>m64K>m6TGDl#v&gkyVygRF;-| z=>7<&oV*>pTs(bTJluJSBcd;P`1+{w!)pI+!_D(Q!@7I#i3)@!i9vfxN=rx)x3$~Q z(cwSsJbk@fcPDprkaTi&a&vO`@rJh2|7q*#?BV0#?dURhRN9Db0J z`q$LR!_nn(!2j4(Nm)kfe`yMe<|-ClsWV6r98rl$;#JbEMt1My&;9QpTt?ef1Zfq%pLJ3GOk{}0FgubH>U zWgmaEmy_ldkkAI-%cd|ubbTc?7!@Gzd1Mq;*bCFMDUOQ_%bJVaA02G zsS@WNv?CA&7xhkQnqwZ%3^WID>-<$5=8vcnB0WWR!|5$Utewp%?2T%E_~)lXyl1fG z-4WkKCGQ^9xMM#?S^4%+{^|TTbwR)8l>dZWv@GVhj8DI2n*J(uxyy2AerKy{*NMV^ zq>|r8vF!Z=dx8r5GV#yoR9OLLTbTRp&+CUJ2JJ4tIfyuZ4^O)Lnbe)Wj9OcdpVwI> z2GhRS(IZU7(B!+H*!!;@WSI-(iNB9|91~moUDlio!EA^k+5NEROQ$BTOf3o>bfZw` z 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 p`$`@c&hYPTun8&uzqfc_j)EM+8yJR2cKR adapterInput = mock(); + private final @NotNull RedisAdapterConfig config = mock(); + + @Test + void test_poll_queryDatabaseWithFakeData() { + // TO BE WRITTEN + // Faking test + var result = 0; + assertEquals(0, result); + + } +} \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java new file mode 100644 index 0000000000..6790c0f998 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java @@ -0,0 +1,39 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis; + +import org.junit.jupiter.api.Test; + +import java.util.regex.Pattern; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +class RedisProtocolAdapterInformationTest { + @Test + void getProtocolId_MustNotContainWhiteSpaces() { + final RedisProtocolAdapterInformation information = new RedisProtocolAdapterInformation(); + assertFalse(information.getProtocolId().contains(" ")); + } + + @Test + void getProtocolId_MustBeAlphaNumericalOrUnderscore() { + final String ALPHA_NUM = "[A-Za-z0-9_]*"; + final Pattern alphaNumPattern = Pattern.compile(ALPHA_NUM); + final RedisProtocolAdapterInformation information = new RedisProtocolAdapterInformation(); + assertTrue(alphaNumPattern.matcher(information.getProtocolId()).matches()); + } +} \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java new file mode 100644 index 0000000000..b5b9d70057 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java @@ -0,0 +1,75 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis; + +import com.hivemq.adapter.sdk.api.data.DataPoint; +import com.hivemq.adapter.sdk.api.polling.PollingOutput; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +public class TestPollingOutput implements PollingOutput { + + private final @NotNull Map dataPoints = new HashMap<>(); + + final @NotNull CompletableFuture outputFuture = new CompletableFuture<>(); + private @Nullable String errorMessage = null; + + public TestPollingOutput() { + } + + @Override + public void addDataPoint(final @NotNull String tagName, final @NotNull Object tagValue) { + dataPoints.put(tagName, tagValue); + } + + @Override + public void addDataPoint(final @NotNull DataPoint dataPoint) { + // NOOP + } + + @Override + public void finish() { + outputFuture.complete(true); + } + + @Override + public void fail(final @NotNull Throwable t, @Nullable final String errorMessage) { + this.errorMessage = errorMessage; + outputFuture.completeExceptionally(t); + } + + @Override + public void fail(@NotNull final String errorMessage) { + this.errorMessage = errorMessage; + outputFuture.completeExceptionally(new RuntimeException()); + } + + public @NotNull CompletableFuture getOutputFuture() { + return outputFuture; + } + + public @NotNull Map getDataPoints() { + return dataPoints; + } + + public @Nullable String getErrorMessage() { + return errorMessage; + } +} From a0584861eb4c663026886306d8a736d97bdf5cfb Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Mon, 9 Dec 2024 07:57:14 +0100 Subject: [PATCH 2/7] Pooling improvments and configuration changes --- .../redis/RedisPollingProtocolAdapter.java | 39 ++++--------------- .../redis/config/RedisAdapterConfig.java | 21 +++++----- 2 files changed, 17 insertions(+), 43 deletions(-) diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java index 956a88e5f0..ff41967031 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -89,45 +89,20 @@ public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInpu @Override public void poll(final @NotNull PollingInput pollingInput, final @NotNull PollingOutput pollingOutput) { - boolean broken = false; - Jedis jedis = null; - - /* Connect to the database and get the key */ + /* Connect to Redis and get the key */ try { if(jedisPool.isClosed()){ initJedisPool(); } - /* Get resource from the Pool*/ - jedis = jedisPool.getResource(); - String result = jedis.get(pollingInput.getPollingContext().getKey()); - - /* Publish datapoint */ - if(result != null) { + /* Get resource from the Pool */ + try (Jedis jedis = jedisPool.getResource();){ + String result = jedis.get(pollingInput.getPollingContext().getKey()); + /* Publish datapoint */ pollingOutput.addDataPoint("keyValue", result); - } else { - pollingOutput.addDataPoint("keyValue", null); } - } catch (Exception e) { - broken = true; - try { - jedisPool.close(); - } catch (Exception ex) { - throw new RuntimeException(ex); - } throw new RuntimeException(e); } - finally - { - if(broken) - { - jedisPool.returnBrokenResource(jedis); - } - else if(jedis != null) - { - jedisPool.returnResource(jedis); - } - } pollingOutput.finish(); } @@ -150,9 +125,9 @@ public int getMaxPollingErrorsBeforeRemoval() { public void initJedisPool() throws Exception { JedisPoolConfig jedisPoolConfig = buildPoolConfig(); if(!adapterConfig.getPassword().isEmpty()) { - jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),Integer.parseInt(adapterConfig.getPort()),60,adapterConfig.getPassword()); + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60,adapterConfig.getPassword()); } else { - jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), Integer.parseInt(adapterConfig.getPort()), 60); + jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), adapterConfig.getPort(), 60); } } } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java index 41de429cdc..d6677b6e42 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java @@ -54,24 +54,23 @@ public class RedisAdapterConfig implements ProtocolAdapterConfig { @JsonProperty(value = "port", required = true) @ModuleConfigField(title = "Port", - description = "Server port", + description = "Server port (usually 6379)", format = ModuleConfigField.FieldType.UNSPECIFIED, required = true, stringPattern = ID_REGEX, stringMinLength = 1, - stringMaxLength = 6, - defaultValue = "6379") - protected @NotNull String port; + stringMaxLength = 6) + protected @NotNull Integer port; - @JsonProperty(value = "password", required = true) + @JsonProperty(value = "password", required = false) @ModuleConfigField(title = "Password", description = "Password for the connection to the database", format = ModuleConfigField.FieldType.UNSPECIFIED, - required = true, + required = false, stringPattern = ID_REGEX, - stringMinLength = 1, + stringMinLength = 0, stringMaxLength = 1024) - protected @NotNull String password; + protected String password; @JsonProperty("pollingIntervalMillis") @ModuleConfigField(title = "Polling Interval [ms]", @@ -96,7 +95,7 @@ public class RedisAdapterConfig implements ProtocolAdapterConfig { public RedisAdapterConfig() { id = ""; server = ""; - port = ""; + port = 6379; password = ""; } @@ -107,9 +106,9 @@ public RedisAdapterConfig() { public @NotNull String getServer() {return server;} - public @NotNull String getPort() {return port;} + public @NotNull Integer getPort() {return port;} - public @NotNull String getPassword() {return password;} + public String getPassword() {return password;} public int getPollingIntervalMillis() { return pollingIntervalMillis; From 1b84a527a976caafd4a42be165e7633a772baba2 Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Wed, 11 Dec 2024 20:58:25 +0100 Subject: [PATCH 3/7] Update Redis Auth to inclide username when needed --- .../adapters/redis/RedisPollingProtocolAdapter.java | 9 ++++++--- .../adapters/redis/config/RedisAdapterConfig.java | 13 +++++++++++++ .../src/main/resources/redis-adapter-ui-schema.json | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java index ff41967031..c62557c09b 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -70,9 +70,8 @@ public void start(final @NotNull ProtocolAdapterStartInput input, final @NotNull } private JedisPoolConfig buildPoolConfig() { - final JedisPoolConfig poolConfig = new JedisPoolConfig(); // Change settings here if needed. - return poolConfig; + return new JedisPoolConfig(); } @Override @@ -125,7 +124,11 @@ public int getMaxPollingErrorsBeforeRemoval() { public void initJedisPool() throws Exception { JedisPoolConfig jedisPoolConfig = buildPoolConfig(); if(!adapterConfig.getPassword().isEmpty()) { - jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60,adapterConfig.getPassword()); + if (!adapterConfig.getUsername().isEmpty()){ + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60, adapterConfig.getUsername(),adapterConfig.getPassword()); + } else { + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60,adapterConfig.getPassword()); + } } else { jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), adapterConfig.getPort(), 60); } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java index d6677b6e42..6876efd883 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java @@ -62,6 +62,16 @@ public class RedisAdapterConfig implements ProtocolAdapterConfig { stringMaxLength = 6) protected @NotNull Integer port; + @JsonProperty(value = "username", required = false) + @ModuleConfigField(title = "Username", + description = "Username for the connection to the database (can be empty if only password is required)", + format = ModuleConfigField.FieldType.UNSPECIFIED, + required = false, + stringPattern = ID_REGEX, + stringMinLength = 0, + stringMaxLength = 1024) + protected String username; + @JsonProperty(value = "password", required = false) @ModuleConfigField(title = "Password", description = "Password for the connection to the database", @@ -96,6 +106,7 @@ public RedisAdapterConfig() { id = ""; server = ""; port = 6379; + username = ""; password = ""; } @@ -110,6 +121,8 @@ public RedisAdapterConfig() { public String getPassword() {return password;} + public String getUsername() {return username;} + public int getPollingIntervalMillis() { return pollingIntervalMillis; } diff --git a/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json b/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json index 334ae13b51..20027c58c4 100644 --- a/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json +++ b/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json @@ -7,6 +7,7 @@ "id", "server", "port", + "username", "password" ] }, From 95ad225b4c85312a72105f17f3d8dd7ddf192c76 Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Sat, 28 Dec 2024 16:49:20 +0100 Subject: [PATCH 4/7] Update to 2024.9 SDK. Add support for HASH, LIST, STRING --- .../hivemq-edge-module-redis/build.gradle.kts | 5 +- .../gradle.properties | 4 +- .../redis/RedisPollingProtocolAdapter.java | 132 ++++++++++++------ .../redis/RedisProtocolAdapterFactory.java | 9 +- .../RedisProtocolAdapterInformation.java | 39 +++++- .../RedisSubscribingProtocolAdapter.java | 29 +++- .../redis/config/RedisAdapterConfig.java | 29 +--- .../redis/config/RedisAdapterTag.java | 99 +++++++++++++ .../config/RedisAdapterTagDefinition.java | 71 ++++++++++ .../adapters/redis/config/RedisDataType.java | 37 +++++ .../redis/config/RedisPollingContext.java | 129 ----------------- .../adapters/redis/helpers/RedisHelpers.java | 24 ++++ .../resources/redis-adapter-ui-schema.json | 29 ++-- .../RedisPollingProtocolAdapterTest.java | 12 +- .../RedisProtocolAdapterInformationTest.java | 7 +- .../adapters/redis/TestPollingOutput.java | 2 +- 16 files changed, 408 insertions(+), 249 deletions(-) create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTag.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java delete mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java create mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java diff --git a/modules/hivemq-edge-module-redis/build.gradle.kts b/modules/hivemq-edge-module-redis/build.gradle.kts index 439db9ca18..eda73452a3 100644 --- a/modules/hivemq-edge-module-redis/build.gradle.kts +++ b/modules/hivemq-edge-module-redis/build.gradle.kts @@ -8,7 +8,7 @@ plugins { group = "com.hivemq" -version = "2024.7-ALPHA" +version = "2024.9 ALPHA" repositories { mavenLocal() @@ -19,10 +19,9 @@ repositories { dependencies { compileOnly("com.hivemq:hivemq-edge-adapter-sdk:${property("hivemq-edge-adapter-sdk.version")}") compileOnly("commons-io:commons-io:${property("commons-io.version")}") - implementation("redis.clients:jedis:5.0.2") - implementation("com.fasterxml.jackson.core:jackson-core:2.18.1") compileOnly("com.fasterxml.jackson.core:jackson-databind:${property("jackson.version")}") compileOnly("org.slf4j:slf4j-api:${property("slf4j.version")}") + implementation("redis.clients:jedis:5.0.2") } dependencies { diff --git a/modules/hivemq-edge-module-redis/gradle.properties b/modules/hivemq-edge-module-redis/gradle.properties index 3325e1095e..0f9405b4c8 100644 --- a/modules/hivemq-edge-module-redis/gradle.properties +++ b/modules/hivemq-edge-module-redis/gradle.properties @@ -1,14 +1,14 @@ # # hivemq dependencies # -hivemq-edge-adapter-sdk.version=2024.7 +hivemq-edge-adapter-sdk.version=2024.9 # # main dependencies # commons-io.version=2.13.0 jackson.version=2.17.0 slf4j.version=1.7.30 - +slf4jfull.version=2.0.16 # # plugins # diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java index c62557c09b..b647f1b30a 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -15,38 +15,50 @@ */ package com.hivemq.edge.adapters.redis; -import com.fasterxml.jackson.databind.ObjectMapper; import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; +import com.hivemq.adapter.sdk.api.config.PollingContext; import com.hivemq.adapter.sdk.api.model.*; import com.hivemq.adapter.sdk.api.polling.PollingInput; import com.hivemq.adapter.sdk.api.polling.PollingOutput; import com.hivemq.adapter.sdk.api.polling.PollingProtocolAdapter; import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState; +import com.hivemq.adapter.sdk.api.tag.Tag; import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; -import com.hivemq.edge.adapters.redis.config.RedisPollingContext; +import com.hivemq.edge.adapters.redis.config.RedisAdapterTagDefinition; +import com.hivemq.edge.adapters.redis.helpers.RedisHelpers; import org.jetbrains.annotations.NotNull; -import redis.clients.jedis.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.json.Path2; import java.util.List; +import java.util.Objects; -public class RedisPollingProtocolAdapter implements PollingProtocolAdapter { + +public class RedisPollingProtocolAdapter implements PollingProtocolAdapter{ + private static final @NotNull Logger log = LoggerFactory.getLogger(RedisPollingProtocolAdapter.class); private final @NotNull RedisAdapterConfig adapterConfig; private final @NotNull ProtocolAdapterInformation adapterInformation; private final @NotNull ProtocolAdapterState protocolAdapterState; - private final @NotNull List pollingContext; - private JedisPool jedisPool = new JedisPool(); - private String password; + private final @NotNull RedisHelpers redisHelpers; + private final @NotNull List tags; + private JedisPool jedisPool; + private final @NotNull String adapterId; public RedisPollingProtocolAdapter(final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input) { + this.tags = input.getTags(); + this.redisHelpers = new RedisHelpers(); + this.adapterId = input.getAdapterId(); this.adapterInformation = adapterInformation; this.adapterConfig = input.getConfig(); this.protocolAdapterState = input.getProtocolAdapterState(); - this.pollingContext = adapterConfig.getPollingContexts(); } @Override public @NotNull String getId() { - return adapterConfig.getId(); + return adapterId; } @Override @@ -54,7 +66,7 @@ public void start(final @NotNull ProtocolAdapterStartInput input, final @NotNull /* Test connection to the database when starting the adapter. */ try { // Start Initialization - initJedisPool(); + jedisPool = redisHelpers.initJedisPool(adapterConfig); if(!jedisPool.isClosed()){ output.startedSuccessfully(); @@ -69,11 +81,6 @@ public void start(final @NotNull ProtocolAdapterStartInput input, final @NotNull } } - private JedisPoolConfig buildPoolConfig() { - // Change settings here if needed. - return new JedisPoolConfig(); - } - @Override public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInput, final @NotNull ProtocolAdapterStopOutput protocolAdapterStopOutput) { jedisPool.close(); @@ -81,33 +88,82 @@ public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInpu protocolAdapterStopOutput.stoppedSuccessfully(); } + @Override public @NotNull ProtocolAdapterInformation getProtocolAdapterInformation() { return adapterInformation; } @Override - public void poll(final @NotNull PollingInput pollingInput, final @NotNull PollingOutput pollingOutput) { - /* Connect to Redis and get the key */ + public void poll(final @NotNull PollingInput pollingInput, final @NotNull PollingOutput pollingOutput) { + final PollingContext pollingContext = pollingInput.getPollingContext(); + + /* Handle tags */ try { - if(jedisPool.isClosed()){ - initJedisPool(); - } - /* Get resource from the Pool */ - try (Jedis jedis = jedisPool.getResource();){ - String result = jedis.get(pollingInput.getPollingContext().getKey()); - /* Publish datapoint */ - pollingOutput.addDataPoint("keyValue", result); - } + tags.stream() + .filter(tag -> tag.getName().equals(pollingContext.getTagName())) + .findFirst() + .ifPresentOrElse( + def -> { + RedisAdapterTagDefinition definition = (RedisAdapterTagDefinition) def.getDefinition(); + + /* Connect to Redis and get the key */ + try { + if(jedisPool.isClosed()){ + jedisPool = redisHelpers.initJedisPool(adapterConfig); + } + + /* Switch method based on type of key to retrieve*/ + switch (Objects.requireNonNull(Objects.requireNonNull(definition.getType()).toString())) { + case "HASH": + log.debug("Handling Hash"); + log.debug("Hash Key : {}", definition.getKey()); + log.debug("Field : {}", definition.getField()); + try (Jedis jedis = jedisPool.getResource();){ + String result; + + if (definition.getAll()){ + result = jedis.hgetAll(definition.getKey()).toString(); + } else { + result = jedis.hget(definition.getKey(), definition.getField()); + } + log.debug("Hash Result : {}",result); + pollingOutput.addDataPoint("hashValue", result); + } + break; + case "LIST": + log.debug("Handling List like queue"); + log.debug("List Key : {}", definition.getKey()); + try (Jedis jedis = jedisPool.getResource();){ + String result = jedis.rpop(definition.getKey()); + log.debug("List Result : {}",result); + pollingOutput.addDataPoint("listValue", result); + } + break; + default: + log.debug("Handling Default (String)"); + log.debug("String Key : {}", definition.getKey()); + try (Jedis jedis = jedisPool.getResource();){ + String result = jedis.get(definition.getKey()); + log.debug("String Result : {}",result); + pollingOutput.addDataPoint("stringValue", result); + } + break; + } + } catch (Exception e) { + throw new RuntimeException(e); + } + }, + () -> pollingOutput.fail("Polling for Redis protocol adapter failed because the used tag '" + + pollingInput.getPollingContext().getTagName() + + "' was not found. For the polling to work the tag must be created via REST API or the UI.") + ); } catch (Exception e) { + log.debug(e.getMessage()); throw new RuntimeException(e); } - pollingOutput.finish(); - } - @Override - public @NotNull List getPollingContexts() { - return pollingContext; + pollingOutput.finish(); } @Override @@ -119,18 +175,4 @@ public int getPollingIntervalMillis() { public int getMaxPollingErrorsBeforeRemoval() { return adapterConfig.getMaxPollingErrorsBeforeRemoval(); } - - // Initialize Jedis Pool - public void initJedisPool() throws Exception { - JedisPoolConfig jedisPoolConfig = buildPoolConfig(); - if(!adapterConfig.getPassword().isEmpty()) { - if (!adapterConfig.getUsername().isEmpty()){ - jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60, adapterConfig.getUsername(),adapterConfig.getPassword()); - } else { - jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60,adapterConfig.getPassword()); - } - } else { - jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), adapterConfig.getPort(), 60); - } - } } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java index 9ebb97af5c..52d1f94b3e 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2024-present HiveMQ GmbH + * Copyright 2023-present HiveMQ GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,11 +33,4 @@ public class RedisProtocolAdapterFactory implements ProtocolAdapterFactory input) { return new RedisPollingProtocolAdapter(adapterInformation, input); } - - - @Override - public @NotNull Class getConfigClass() { - return RedisAdapterConfig.class; - } - } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java index 64a6e6b005..08b643230f 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java @@ -1,5 +1,5 @@ /* - * Copyright 2024-present HiveMQ GmbH + * Copyright 2023-present HiveMQ GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,12 +20,17 @@ import com.hivemq.adapter.sdk.api.ProtocolAdapterCategory; import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; import com.hivemq.adapter.sdk.api.ProtocolAdapterTag; +import com.hivemq.adapter.sdk.api.config.ProtocolSpecificAdapterConfig; +import com.hivemq.adapter.sdk.api.tag.Tag; +import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import com.hivemq.edge.adapters.redis.config.RedisAdapterTag; import org.apache.commons.io.IOUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.EnumSet; @@ -49,7 +54,7 @@ protected RedisProtocolAdapterInformation() { public @NotNull String getProtocolId() { // this id is very important as this is how the adapters configurations in the config.xml are linked to the adapter implementations. // any change here means you will need to edit the config.xml - return "Redis_Protocol"; + return "redis"; } @Override @@ -61,20 +66,20 @@ protected RedisProtocolAdapterInformation() { @Override public @NotNull String getDescription() { // the description that will be shown for this protocol adapter within edge's ui - return "This protocol adapter allow you to query Redis keys, retrieve the result and send it via MQTT."; + return "This protocol adapter allow you to get values from Redis."; } @Override public @NotNull String getUrl() { // this url will be displayed in the ui as a link to further documentation on this protocol adapter. // e.g. this could be a link to the source code and a readme - return "TO BE DEFINED"; + return "TBD"; } @Override public @NotNull String getVersion() { // the version of this protocol adapter, the usage of semantic versioning is advised. - return "2024.7 (Alpha)"; + return "1.0.0"; } @Override @@ -92,7 +97,7 @@ protected RedisProtocolAdapterInformation() { @Override public @NotNull String getAuthor() { // your name/nick - return "Anthony O. (HiveMQ)"; + return "HiveMQ"; } @Override @@ -106,9 +111,11 @@ public List getTags() { // here you can set which Tags should be applied to this protocol adapter return List.of(ProtocolAdapterTag.INTERNET, ProtocolAdapterTag.TCP, - ProtocolAdapterTag.AUTOMATION); + ProtocolAdapterTag.WEB); } + + @Override public @Nullable String getUiSchema() { try (final InputStream is = this.getClass() @@ -124,4 +131,22 @@ public List getTags() { return null; } } + + @Override + public @NotNull Class tagConfigurationClass() { + return RedisAdapterTag.class; + } + + @Override + public @NotNull Class configurationClassNorthbound() { + return RedisAdapterConfig.class; + } + + @Override + public @NotNull Class configurationClassNorthAndSouthbound() { + return RedisAdapterConfig.class; + } + + + } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java index 2de6aac16c..5b05b1606e 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java @@ -21,9 +21,11 @@ import com.hivemq.adapter.sdk.api.model.*; import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState; import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import com.hivemq.edge.adapters.redis.helpers.RedisHelpers; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import redis.clients.jedis.JedisPool; @SuppressWarnings({"FieldCanBeLocal", "unused", "EmptyTryBlock"}) public class RedisSubscribingProtocolAdapter implements ProtocolAdapter { @@ -33,27 +35,44 @@ public class RedisSubscribingProtocolAdapter implements ProtocolAdapter { private final @NotNull ProtocolAdapterInformation adapterInformation; private final @NotNull ProtocolAdapterState protocolAdapterState; private final @NotNull AdapterFactories adapterFactories; + private final @NotNull String adapterId; + private final @NotNull RedisHelpers redisHelpers; + private JedisPool jedisPool; public RedisSubscribingProtocolAdapter( - final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input) { + final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input, @NotNull RedisHelpers redisHelpers) { + this.adapterId = input.getAdapterId(); this.adapterInformation = adapterInformation; this.adapterConfig = input.getConfig(); this.protocolAdapterState = input.getProtocolAdapterState(); this.adapterFactories = input.adapterFactories(); + this.redisHelpers = new RedisHelpers(); } + @Override public @NotNull String getId() { - return adapterConfig.getId(); + return adapterId; } @Override public void start(@NotNull ProtocolAdapterStartInput input, @NotNull ProtocolAdapterStartOutput output) { + /* Test connection to the database when starting the adapter. */ try { - // connect and subscribe your client here - output.startedSuccessfully(); + // Start Initialization + jedisPool = redisHelpers.initJedisPool(adapterConfig); + + if(!jedisPool.isClosed()){ + output.startedSuccessfully(); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.CONNECTED); + jedisPool.close(); + } else { + output.failStart(new Throwable("Error connecting Redis server, please check the configuration"), "Error connecting Redis server, please check the configuration"); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); + } } catch (final Exception e) { - // error handling like logging and signaling edge that the start failed + jedisPool.close(); output.failStart(e, null); + protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); } } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java index 6876efd883..3743e5f8a3 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2024-present HiveMQ GmbH + * Copyright 2023-present HiveMQ GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,21 +15,19 @@ */ package com.hivemq.edge.adapters.redis.config; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField; -import com.hivemq.adapter.sdk.api.config.ProtocolAdapterConfig; +import com.hivemq.adapter.sdk.api.config.ProtocolSpecificAdapterConfig; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.List; - @SuppressWarnings({"unused", "FieldCanBeLocal", "FieldMayBeFinal"}) @JsonPropertyOrder({ "url", "destination"}) -public class RedisAdapterConfig implements ProtocolAdapterConfig { +public class RedisAdapterConfig implements ProtocolSpecificAdapterConfig { private static final @NotNull String ID_REGEX = "^([a-zA-Z_0-9-_])*$"; @@ -85,10 +83,10 @@ public class RedisAdapterConfig implements ProtocolAdapterConfig { @JsonProperty("pollingIntervalMillis") @ModuleConfigField(title = "Polling Interval [ms]", description = "Time in millisecond that this endpoint will be polled", - numberMin = 1, + numberMin = 100, required = true, - defaultValue = "2000") - private int pollingIntervalMillis = 10000; + defaultValue = "1000") + private int pollingIntervalMillis = 1000; @JsonProperty("maxPollingErrorsBeforeRemoval") @ModuleConfigField(title = "Max. Polling Errors", @@ -98,10 +96,6 @@ public class RedisAdapterConfig implements ProtocolAdapterConfig { private int maxPollingErrorsBeforeRemoval = 10; - @JsonProperty("subscriptions") - @ModuleConfigField(title = "subscription", description = "Map your Redis data to a MQTT Topic") - private @NotNull List pollingContexts = new ArrayList<>(); - public RedisAdapterConfig() { id = ""; server = ""; @@ -110,11 +104,6 @@ public RedisAdapterConfig() { password = ""; } - @Override - public @NotNull String getId() { - return id; - } - public @NotNull String getServer() {return server;} public @NotNull Integer getPort() {return port;} @@ -130,8 +119,4 @@ public int getPollingIntervalMillis() { public int getMaxPollingErrorsBeforeRemoval() { return maxPollingErrorsBeforeRemoval; } - - public @NotNull List getPollingContexts() { - return pollingContexts; - } } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTag.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTag.java new file mode 100644 index 0000000000..953d40cede --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTag.java @@ -0,0 +1,99 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis.config; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField; +import com.hivemq.adapter.sdk.api.tag.Tag; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Objects; + +public class RedisAdapterTag implements Tag { + + @JsonProperty(value = "name", required = true) + @ModuleConfigField(title = "Name", + description = "name of the tag to be used in mappings", + format = ModuleConfigField.FieldType.MQTT_TAG, + required = true) + private final @NotNull String name; + + @JsonProperty(value = "description") + @ModuleConfigField(title = "Description", + description = "A human readable description of the tag") + private final @NotNull String description; + + @JsonProperty(value = "definition", required = true) + @ModuleConfigField(title = "Definition", + description = "The actual definition of the tag on the device") + private final @NotNull RedisAdapterTagDefinition definition; + + public RedisAdapterTag( + @JsonProperty(value = "name", required = true) final @NotNull String name, + @JsonProperty(value = "description") final @Nullable String description, + @JsonProperty(value = "definition", required = true) final @NotNull RedisAdapterTagDefinition definition) { + this.name = name; + this.description = Objects.requireNonNullElse(description, "no description present."); + this.definition = definition; + } + + @Override + public @NotNull RedisAdapterTagDefinition getDefinition() { + return definition; + } + + @Override + public @NotNull String getName() { + return name; + } + + @Override + public @NotNull String getDescription() { + return description; + } + + @Override + public @NotNull String toString() { + return "RedisTag{" + + "Name='" + + name + + '\'' + + ", Description='" + + description + + '\'' + + ", Definition=" + + definition + + '}'; + } + + @Override + public boolean equals(final @Nullable Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + final RedisAdapterTag redisAdapterTag = (RedisAdapterTag) o; + return Objects.equals(name, redisAdapterTag.name) && + Objects.equals(description, redisAdapterTag.description) && + Objects.equals(definition, redisAdapterTag.definition); + } + + @Override + public int hashCode() { + return Objects.hash(name, description, definition); + } +} + + diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java new file mode 100644 index 0000000000..ccb917c477 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java @@ -0,0 +1,71 @@ +/* + * Copyright 2024-present HiveMQ GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.hivemq.edge.adapters.redis.config; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField; +import com.hivemq.adapter.sdk.api.tag.TagDefinition; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jetbrains.annotations.Nullable; + +public class RedisAdapterTagDefinition implements TagDefinition { + @JsonProperty(value = "key", required = true) + @ModuleConfigField(title = "Key", + description = "Key to get from Redis", + required = true, + format = ModuleConfigField.FieldType.UNSPECIFIED) + protected @Nullable String key; + + @JsonProperty(value = "field", required = false) + @ModuleConfigField(title = "Field", + description = "Optional field to get from Redis", + format = ModuleConfigField.FieldType.UNSPECIFIED) + protected @Nullable String field; + + @JsonProperty(value = "type", required = true) + @ModuleConfigField(title = "Type", + description = "Type of the Key to get from Redis", + required = true, + defaultValue = "STRING", + format = ModuleConfigField.FieldType.UNSPECIFIED) + protected @Nullable RedisDataType type; + + @JsonProperty(value = "getall", required = true) + @ModuleConfigField(title = "Get all values", + description = "Get all value from the hash", + required = false, + defaultValue = "false", + format = ModuleConfigField.FieldType.BOOLEAN) + protected boolean getAll; + + @JsonCreator + public RedisAdapterTagDefinition( + @JsonProperty("key") @Nullable final String key, + @JsonProperty("field") @Nullable final String field, + @JsonProperty("getall") final boolean getAll, + @JsonProperty("type") @Nullable final RedisDataType type) { + this.key = key; + this.field = field; + this.type = type; + this.getAll = getAll; + + } + + public @Nullable String getKey(){return key;} + public @Nullable String getField(){return field;} + public @Nullable RedisDataType getType(){return type;} + public Boolean getAll(){return getAll;} +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java new file mode 100644 index 0000000000..a12ba7fc4a --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java @@ -0,0 +1,37 @@ +package com.hivemq.edge.adapters.redis.config; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +public enum RedisDataType { + STRING("STRING"), + LIST("LIST"), + HASH("HASH"); + + private static final Map BY_LABEL; + + static { + final Map temp = new HashMap<>(); + for (RedisDataType e : values()) { + temp.put(e.label, e); + } + BY_LABEL = Collections.unmodifiableMap(temp); + } + + public final String label; + + RedisDataType(String label) { + this.label = label; + } + + + public static RedisDataType valueOfLabel(String label) { + return BY_LABEL.get(label); + } + + @Override + public String toString() { + return this.label; + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java deleted file mode 100644 index efd3a0aec8..0000000000 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisPollingContext.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright 2024-present HiveMQ GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.hivemq.edge.adapters.redis.config; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.hivemq.adapter.sdk.api.annotations.ModuleConfigField; -import com.hivemq.adapter.sdk.api.config.MessageHandlingOptions; -import com.hivemq.adapter.sdk.api.config.PollingContext; -import com.hivemq.adapter.sdk.api.config.UserProperty; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.List; - -public class RedisPollingContext implements PollingContext { - @JsonProperty(value = "destination", required = true) - @ModuleConfigField(title = "Destination Topic", - description = "The topic to publish data on", - required = true, - format = ModuleConfigField.FieldType.MQTT_TOPIC) - protected @Nullable String destination; - - @JsonProperty(value = "key", required = true) - @ModuleConfigField(title = "Key", - description = "Key to get from Redis", - required = true, - format = ModuleConfigField.FieldType.UNSPECIFIED) - protected @Nullable String key; - - @JsonProperty(value = "qos", required = true) - @ModuleConfigField(title = "QoS", - description = "MQTT Quality of Service level", - required = true, - numberMin = 0, - numberMax = 2, - defaultValue = "1") - protected int qos; - - @JsonProperty(value = "messageHandlingOptions") - @ModuleConfigField(title = "Message Handling Options", - description = "This setting defines the format of the resulting MQTT message, either a message per changed tag or a message per subscription that may include multiple data points per sample", - enumDisplayValues = { - "MQTT Message Per Device Tag", - "MQTT Message Per Subscription (Potentially Multiple Data Points Per Sample)"}, - defaultValue = "MQTTMessagePerTag") - protected @NotNull MessageHandlingOptions messageHandlingOptions = MessageHandlingOptions.MQTTMessagePerTag; - - @JsonProperty(value = "includeTimestamp") - @ModuleConfigField(title = "Include Sample Timestamp In Publish?", - description = "Include the unix timestamp of the sample time in the resulting MQTT message", - defaultValue = "true") - protected @NotNull Boolean includeTimestamp = Boolean.TRUE; - - @JsonProperty(value = "includeTagNames") - @ModuleConfigField(title = "Include Tag Names In Publish?", - description = "Include the names of the tags in the resulting MQTT publish", - defaultValue = "false") - protected @NotNull Boolean includeTagNames = Boolean.FALSE; - - @JsonProperty(value = "userProperties") - @ModuleConfigField(title = "User Properties", - description = "Arbitrary properties to associate with the subscription", - arrayMaxItems = 10) - private @NotNull List userProperties = new ArrayList<>(); - - @JsonCreator - public RedisPollingContext( - @JsonProperty("destination") @Nullable final String destination, - @JsonProperty("query") @Nullable final String query, - @JsonProperty("spiltLinesInIndividualMessages") @Nullable final String spiltLinesInIndividualMessages, - @JsonProperty("rowLimit") final int rowLimit, - @JsonProperty("qos") final int qos, - @JsonProperty("userProperties") @Nullable List userProperties) { - this.destination = destination; - this.qos = qos; - this.key = key; - - if (userProperties != null) { - this.userProperties = userProperties; - } - } - - @Override - public @Nullable String getDestinationMqttTopic() { - return destination; - } - - public @Nullable String getKey(){return key;} - - @Override - public int getQos() { - return qos; - } - - @Override - public @NotNull MessageHandlingOptions getMessageHandlingOptions() { - return messageHandlingOptions; - } - - @Override - public @NotNull Boolean getIncludeTimestamp() { - return includeTimestamp; - } - - @Override - public @NotNull Boolean getIncludeTagNames() { - return includeTagNames; - } - - @Override - public @NotNull List getUserProperties() { - return userProperties; - } -} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java new file mode 100644 index 0000000000..d9d0fb96f1 --- /dev/null +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java @@ -0,0 +1,24 @@ +package com.hivemq.edge.adapters.redis.helpers; + +import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import org.jetbrains.annotations.NotNull; +import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPoolConfig; + +public class RedisHelpers { + // Initialize Jedis Pool + public JedisPool initJedisPool(final @NotNull RedisAdapterConfig adapterConfig) { + JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); + JedisPool jedisPool; + if(!adapterConfig.getPassword().isEmpty()) { + if (!adapterConfig.getUsername().isEmpty()){ + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60, adapterConfig.getUsername(),adapterConfig.getPassword()); + } else { + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60,adapterConfig.getPassword()); + } + } else { + jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), adapterConfig.getPort(), 60); + } + return jedisPool; + } +} diff --git a/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json b/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json index 20027c58c4..394180dfdd 100644 --- a/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json +++ b/modules/hivemq-edge-module-redis/src/main/resources/redis-adapter-ui-schema.json @@ -11,13 +11,6 @@ "password" ] }, - { - "id": "subFields", - "title": "Subscription", - "properties": [ - "subscriptions" - ] - }, { "id": "publishing", "title": "Publishing", @@ -30,25 +23,25 @@ "password": { "ui:widget": "password" }, + "type": { + "ui:widget": "select" + }, "ui:order": [ "id", "server", "port", "*" ], - "subscriptions": { - "ui:batchMode": true, + "definition" : { + "ui:batchMode" : true, "items": { - "ui:order": [ + "ui:order" : [ "key", - "destination", - "qos", - "*", - "userProperties" - ], - "ui:collapsable": { - "titleKey": "destination" - } + "type", + "field", + "getall", + "*" + ] } } } diff --git a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapterTest.java b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapterTest.java index 92816ef09a..7f62c0414d 100644 --- a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapterTest.java +++ b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapterTest.java @@ -20,8 +20,11 @@ import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; + +import java.io.File; +import java.io.IOException; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; class RedisPollingProtocolAdapterTest { @@ -29,11 +32,8 @@ class RedisPollingProtocolAdapterTest { private final @NotNull RedisAdapterConfig config = mock(); @Test - void test_poll_queryDatabaseWithFakeData() { - // TO BE WRITTEN - // Faking test - var result = 0; - assertEquals(0, result); + void test_poll_whenFileIsPresent_thenFileContentsAreSetInOutput() throws IOException { + // To be implemented } } \ No newline at end of file diff --git a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java index 6790c0f998..29c7eb3a3e 100644 --- a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java +++ b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformationTest.java @@ -19,18 +19,19 @@ import java.util.regex.Pattern; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; class RedisProtocolAdapterInformationTest { + @Test void getProtocolId_MustNotContainWhiteSpaces() { final RedisProtocolAdapterInformation information = new RedisProtocolAdapterInformation(); assertFalse(information.getProtocolId().contains(" ")); } + @Test - void getProtocolId_MustBeAlphaNumericalOrUnderscore() { + void getProtocolId_MustBeAlphaNummercialOrUnderscore() { final String ALPHA_NUM = "[A-Za-z0-9_]*"; final Pattern alphaNumPattern = Pattern.compile(ALPHA_NUM); final RedisProtocolAdapterInformation information = new RedisProtocolAdapterInformation(); diff --git a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java index b5b9d70057..e3d3eb1a7e 100644 --- a/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java +++ b/modules/hivemq-edge-module-redis/src/test/java/com/hivemq/edge/adapters/redis/TestPollingOutput.java @@ -1,5 +1,5 @@ /* - * Copyright 2024-present HiveMQ GmbH + * Copyright 2023-present HiveMQ GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From fd920be0d68e4dd312e62c0ded0c86bf892fb060 Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Tue, 27 May 2025 15:39:02 +0200 Subject: [PATCH 5/7] switch to batch --- .../hivemq-edge-module-redis/build.gradle.kts | 6 +- .../gradle.properties | 2 +- .../redis/RedisPollingProtocolAdapter.java | 154 +++++++++--------- .../RedisProtocolAdapterInformation.java | 10 ++ .../config/RedisAdapterTagDefinition.java | 5 +- .../adapters/redis/config/RedisDataType.java | 6 +- .../adapters/redis/helpers/RedisHelpers.java | 10 +- 7 files changed, 104 insertions(+), 89 deletions(-) diff --git a/modules/hivemq-edge-module-redis/build.gradle.kts b/modules/hivemq-edge-module-redis/build.gradle.kts index eda73452a3..65847c3a32 100644 --- a/modules/hivemq-edge-module-redis/build.gradle.kts +++ b/modules/hivemq-edge-module-redis/build.gradle.kts @@ -8,7 +8,7 @@ plugins { group = "com.hivemq" -version = "2024.9 ALPHA" +version = "2025.8 ALPHA" repositories { mavenLocal() @@ -21,7 +21,7 @@ dependencies { compileOnly("commons-io:commons-io:${property("commons-io.version")}") compileOnly("com.fasterxml.jackson.core:jackson-databind:${property("jackson.version")}") compileOnly("org.slf4j:slf4j-api:${property("slf4j.version")}") - implementation("redis.clients:jedis:5.0.2") + implementation("redis.clients:jedis:6.0.0") } dependencies { @@ -41,4 +41,4 @@ tasks.test { license { header = file("HEADER") mapping("java", "SLASHSTAR_STYLE") -} \ No newline at end of file +} diff --git a/modules/hivemq-edge-module-redis/gradle.properties b/modules/hivemq-edge-module-redis/gradle.properties index 0f9405b4c8..ce8cdff1d0 100644 --- a/modules/hivemq-edge-module-redis/gradle.properties +++ b/modules/hivemq-edge-module-redis/gradle.properties @@ -1,7 +1,7 @@ # # hivemq dependencies # -hivemq-edge-adapter-sdk.version=2024.9 +hivemq-edge-adapter-sdk.version=2025.8 # # main dependencies # diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java index b647f1b30a..6661a9afcf 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -15,15 +15,19 @@ */ package com.hivemq.edge.adapters.redis; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; -import com.hivemq.adapter.sdk.api.config.PollingContext; +import com.hivemq.adapter.sdk.api.factories.AdapterFactories; +import com.hivemq.adapter.sdk.api.factories.DataPointFactory; import com.hivemq.adapter.sdk.api.model.*; -import com.hivemq.adapter.sdk.api.polling.PollingInput; -import com.hivemq.adapter.sdk.api.polling.PollingOutput; -import com.hivemq.adapter.sdk.api.polling.PollingProtocolAdapter; +import com.hivemq.adapter.sdk.api.polling.batch.BatchPollingInput; +import com.hivemq.adapter.sdk.api.polling.batch.BatchPollingOutput; +import com.hivemq.adapter.sdk.api.polling.batch.BatchPollingProtocolAdapter; import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState; import com.hivemq.adapter.sdk.api.tag.Tag; import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; +import com.hivemq.edge.adapters.redis.config.RedisAdapterTag; import com.hivemq.edge.adapters.redis.config.RedisAdapterTagDefinition; import com.hivemq.edge.adapters.redis.helpers.RedisHelpers; import org.jetbrains.annotations.NotNull; @@ -31,14 +35,16 @@ import org.slf4j.LoggerFactory; import redis.clients.jedis.Jedis; import redis.clients.jedis.JedisPool; -import redis.clients.jedis.json.Path2; import java.util.List; import java.util.Objects; +import static com.hivemq.adapter.sdk.api.state.ProtocolAdapterState.ConnectionStatus.STATELESS; -public class RedisPollingProtocolAdapter implements PollingProtocolAdapter{ + +public class RedisPollingProtocolAdapter implements BatchPollingProtocolAdapter { private static final @NotNull Logger log = LoggerFactory.getLogger(RedisPollingProtocolAdapter.class); + private static final @NotNull ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private final @NotNull RedisAdapterConfig adapterConfig; private final @NotNull ProtocolAdapterInformation adapterInformation; private final @NotNull ProtocolAdapterState protocolAdapterState; @@ -46,14 +52,17 @@ public class RedisPollingProtocolAdapter implements PollingProtocolAdapter{ private final @NotNull List tags; private JedisPool jedisPool; private final @NotNull String adapterId; + private final @NotNull AdapterFactories adapterFactories; - public RedisPollingProtocolAdapter(final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input) { + public RedisPollingProtocolAdapter(final @NotNull ProtocolAdapterInformation adapterInformation, + final @NotNull ProtocolAdapterInput input) { this.tags = input.getTags(); this.redisHelpers = new RedisHelpers(); this.adapterId = input.getAdapterId(); this.adapterInformation = adapterInformation; this.adapterConfig = input.getConfig(); this.protocolAdapterState = input.getProtocolAdapterState(); + this.adapterFactories = input.adapterFactories(); } @Override @@ -72,7 +81,8 @@ public void start(final @NotNull ProtocolAdapterStartInput input, final @NotNull output.startedSuccessfully(); protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.CONNECTED); } else { - output.failStart(new Throwable("Error connecting Redis server, please check the configuration"), "Error connecting Redis server, please check the configuration"); + output.failStart(new Throwable("Error connecting Redis server, please check the configuration"), + "Error connecting Redis server, please check the configuration"); protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); } } catch (final Exception e) { @@ -95,75 +105,71 @@ public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInpu } @Override - public void poll(final @NotNull PollingInput pollingInput, final @NotNull PollingOutput pollingOutput) { - final PollingContext pollingContext = pollingInput.getPollingContext(); + public void poll(final @NotNull BatchPollingInput pollingInput, final @NotNull BatchPollingOutput pollingOutput) { + log.debug("Handling tags for Redis protocol adapter"); + tags.forEach(tag -> loadRedisData(pollingOutput, (RedisAdapterTag) tag)); + protocolAdapterState.setConnectionStatus(STATELESS); + pollingOutput.finish(); + } - /* Handle tags */ - try { - tags.stream() - .filter(tag -> tag.getName().equals(pollingContext.getTagName())) - .findFirst() - .ifPresentOrElse( - def -> { - RedisAdapterTagDefinition definition = (RedisAdapterTagDefinition) def.getDefinition(); - - /* Connect to Redis and get the key */ - try { - if(jedisPool.isClosed()){ - jedisPool = redisHelpers.initJedisPool(adapterConfig); - } - - /* Switch method based on type of key to retrieve*/ - switch (Objects.requireNonNull(Objects.requireNonNull(definition.getType()).toString())) { - case "HASH": - log.debug("Handling Hash"); - log.debug("Hash Key : {}", definition.getKey()); - log.debug("Field : {}", definition.getField()); - try (Jedis jedis = jedisPool.getResource();){ - String result; - - if (definition.getAll()){ - result = jedis.hgetAll(definition.getKey()).toString(); - } else { - result = jedis.hget(definition.getKey(), definition.getField()); - } - log.debug("Hash Result : {}",result); - pollingOutput.addDataPoint("hashValue", result); - } - break; - case "LIST": - log.debug("Handling List like queue"); - log.debug("List Key : {}", definition.getKey()); - try (Jedis jedis = jedisPool.getResource();){ - String result = jedis.rpop(definition.getKey()); - log.debug("List Result : {}",result); - pollingOutput.addDataPoint("listValue", result); - } - break; - default: - log.debug("Handling Default (String)"); - log.debug("String Key : {}", definition.getKey()); - try (Jedis jedis = jedisPool.getResource();){ - String result = jedis.get(definition.getKey()); - log.debug("String Result : {}",result); - pollingOutput.addDataPoint("stringValue", result); - } - break; - } - } catch (Exception e) { - throw new RuntimeException(e); - } - }, - () -> pollingOutput.fail("Polling for Redis protocol adapter failed because the used tag '" + - pollingInput.getPollingContext().getTagName() + - "' was not found. For the polling to work the tag must be created via REST API or the UI.") - ); - } catch (Exception e) { - log.debug(e.getMessage()); - throw new RuntimeException(e); + private void loadRedisData(final @NotNull BatchPollingOutput output, final @NotNull RedisAdapterTag tag) { + /* Check if the pool is closed, if not, create a new one */ + if(jedisPool.isClosed()){ + jedisPool = redisHelpers.initJedisPool(adapterConfig); } - pollingOutput.finish(); + final RedisAdapterTagDefinition definition = tag.getDefinition(); + + log.debug("Tag : {}", tag.getName()); + + /* Connect to Redis and get the key */ + try { + /* Switch method based on a type of key to retrieve*/ + final ObjectNode node = OBJECT_MAPPER.createObjectNode(); + final DataPointFactory dataPointFactory = adapterFactories.dataPointFactory(); + switch (Objects.requireNonNull(Objects.requireNonNull(definition.getType()).toString())) { + case "HASH": + log.debug("Handling Hash"); + log.debug("Hash Key : {}", definition.getKey()); + log.debug("Field : {}", definition.getField()); + try (final Jedis jedis = jedisPool.getResource();){ + final String result; + if (definition.getAll()){ + result = jedis.hgetAll(definition.getKey()).toString(); + } else { + result = jedis.hget(definition.getKey(), definition.getField()); + } + log.debug("Hash Result : {}",result); + node.put("value", result); + output.addDataPoint(dataPointFactory.create(tag.getName(), node)); + } + break; + case "LIST": + log.debug("Handling List like queue"); + log.debug("List Key : {}", definition.getKey()); + try (final Jedis jedis = jedisPool.getResource();){ + final String result = jedis.rpop(definition.getKey()); + log.debug("List Result : {}",result); + node.put("value", result); + output.addDataPoint(dataPointFactory.create(tag.getName(), node)); + } + break; + default: + log.debug("Handling Default (String)"); + log.debug("String Key : {}", definition.getKey()); + try (final Jedis jedis = jedisPool.getResource();){ + final String result = jedis.get(definition.getKey()); + log.debug("String Result : {}",result); + node.put("value", result); + log.debug(node.toString()); + log.debug("Adding datapoint"); + output.addDataPoint(dataPointFactory.create(tag.getName(), node)); + } + break; + } + } catch (final Exception e) { + output.fail(e, e.getMessage()); + } } @Override diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java index 08b643230f..42a5c4d1fa 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterInformation.java @@ -57,6 +57,11 @@ protected RedisProtocolAdapterInformation() { return "redis"; } + @Override + public @NotNull List getLegacyProtocolIds() { + return ProtocolAdapterInformation.super.getLegacyProtocolIds(); + } + @Override public @NotNull String getDisplayName() { // the name for this protocol adapter type that will be displayed within edge's ui @@ -132,6 +137,11 @@ public List getTags() { } } + @Override + public int getCurrentConfigVersion() { + return 0; + } + @Override public @NotNull Class tagConfigurationClass() { return RedisAdapterTag.class; diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java index ccb917c477..c5f24461a3 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisAdapterTagDefinition.java @@ -32,6 +32,7 @@ public class RedisAdapterTagDefinition implements TagDefinition { @JsonProperty(value = "field", required = false) @ModuleConfigField(title = "Field", description = "Optional field to get from Redis", + defaultValue = "", format = ModuleConfigField.FieldType.UNSPECIFIED) protected @Nullable String field; @@ -45,9 +46,7 @@ public class RedisAdapterTagDefinition implements TagDefinition { @JsonProperty(value = "getall", required = true) @ModuleConfigField(title = "Get all values", - description = "Get all value from the hash", - required = false, - defaultValue = "false", + description = "Get all value from the hash", defaultValue = "false", format = ModuleConfigField.FieldType.BOOLEAN) protected boolean getAll; diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java index a12ba7fc4a..79e80f6392 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/config/RedisDataType.java @@ -13,7 +13,7 @@ public enum RedisDataType { static { final Map temp = new HashMap<>(); - for (RedisDataType e : values()) { + for (final RedisDataType e : values()) { temp.put(e.label, e); } BY_LABEL = Collections.unmodifiableMap(temp); @@ -21,12 +21,12 @@ public enum RedisDataType { public final String label; - RedisDataType(String label) { + RedisDataType(final String label) { this.label = label; } - public static RedisDataType valueOfLabel(String label) { + public static RedisDataType valueOfLabel(final String label) { return BY_LABEL.get(label); } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java index d9d0fb96f1..e11aac4e03 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/helpers/RedisHelpers.java @@ -8,16 +8,16 @@ public class RedisHelpers { // Initialize Jedis Pool public JedisPool initJedisPool(final @NotNull RedisAdapterConfig adapterConfig) { - JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); - JedisPool jedisPool; + final JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); + final JedisPool jedisPool; if(!adapterConfig.getPassword().isEmpty()) { if (!adapterConfig.getUsername().isEmpty()){ - jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60, adapterConfig.getUsername(),adapterConfig.getPassword()); + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),180, adapterConfig.getUsername(),adapterConfig.getPassword()); } else { - jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),60,adapterConfig.getPassword()); + jedisPool = new JedisPool(jedisPoolConfig,adapterConfig.getServer(),adapterConfig.getPort(),180,adapterConfig.getPassword()); } } else { - jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), adapterConfig.getPort(), 60); + jedisPool = new JedisPool(jedisPoolConfig, adapterConfig.getServer(), adapterConfig.getPort(), 180); } return jedisPool; } From 1f03765a93be1a7643b1d6d1515d486ed9bb96e5 Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Wed, 28 May 2025 08:39:32 +0200 Subject: [PATCH 6/7] latest updates --- .../hivemq-edge-module-redis/build.gradle.kts | 124 +++++++++++++++++- .../redis/RedisPollingProtocolAdapter.java | 3 +- .../redis/RedisProtocolAdapterFactory.java | 3 +- .../RedisSubscribingProtocolAdapter.java | 93 ------------- 4 files changed, 125 insertions(+), 98 deletions(-) delete mode 100644 modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java diff --git a/modules/hivemq-edge-module-redis/build.gradle.kts b/modules/hivemq-edge-module-redis/build.gradle.kts index 65847c3a32..fed97b03b3 100644 --- a/modules/hivemq-edge-module-redis/build.gradle.kts +++ b/modules/hivemq-edge-module-redis/build.gradle.kts @@ -1,18 +1,35 @@ +import nl.javadude.gradle.plugins.license.DownloadLicensesExtension.license + plugins { - id("java") + java id("com.github.sgtsilvio.gradle.utf8") id("com.github.johnrengelman.shadow") id("com.github.hierynomus.license") - id("org.owasp.dependencycheck") } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} group = "com.hivemq" version = "2025.8 ALPHA" repositories { - mavenLocal() mavenCentral() + maven { url = uri("https://jitpack.io") } + exclusiveContent { + forRepository { + maven { + url = uri("https://jitpack.io") + } + } + filter { + includeGroup("com.github.simon622.mqtt-sn") + includeGroup("com.github.simon622") + } + } } @@ -42,3 +59,104 @@ license { header = file("HEADER") mapping("java", "SLASHSTAR_STYLE") } + +downloadLicenses { + aliases = mapOf( + license("Apache License, Version 2.0", "https://opensource.org/licenses/Apache-2.0") to listOf( + "Apache 2", + "Apache 2.0", + "Apache-2.0", + "Apache License 2.0", + "Apache License, 2.0", + "Apache License v2.0", + "Apache License, Version 2", + "Apache License Version 2.0", + "Apache License, Version 2.0", + "Apache License, version 2.0", + "The Apache License, Version 2.0", + "Apache Software License - Version 2.0", + "Apache Software License, version 2.0", + "The Apache Software License, Version 2.0" + ), + license("MIT License", "https://opensource.org/licenses/MIT") to listOf( + "MIT License", + "MIT license", + "The MIT License", + "The MIT License (MIT)" + ), + license("CDDL, Version 1.0", "https://opensource.org/licenses/CDDL-1.0") to listOf( + "CDDL, Version 1.0", + "Common Development and Distribution License 1.0", + "COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0", + license("CDDL", "https://glassfish.dev.java.net/public/CDDLv1.0.html") + ), + license("CDDL, Version 1.1", "https://oss.oracle.com/licenses/CDDL+GPL-1.1") to listOf( + "CDDL 1.1", + "CDDL, Version 1.1", + "Common Development And Distribution License 1.1", + "CDDL+GPL License", + "CDDL + GPLv2 with classpath exception", + "Dual license consisting of the CDDL v1.1 and GPL v2", + "CDDL or GPLv2 with exceptions", + "CDDL/GPLv2+CE" + ), + license("LGPL, Version 2.0", "https://opensource.org/licenses/LGPL-2.0") to listOf( + "LGPL, Version 2.0", + "GNU General Public License, version 2" + ), + license("LGPL, Version 2.1", "https://opensource.org/licenses/LGPL-2.1") to listOf( + "LGPL, Version 2.1", + "LGPL, version 2.1", + "GNU Lesser General Public License version 2.1 (LGPLv2.1)", + license("GNU Lesser General Public License", "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html") + ), + license("LGPL, Version 3.0", "https://opensource.org/licenses/LGPL-3.0") to listOf( + "LGPL, Version 3.0", + "Lesser General Public License, version 3 or greater" + ), + license("EPL, Version 1.0", "https://opensource.org/licenses/EPL-1.0") to listOf( + "EPL, Version 1.0", + "Eclipse Public License - v 1.0", + "Eclipse Public License - Version 1.0", + license("Eclipse Public License", "http://www.eclipse.org/legal/epl-v10.html") + ), + license("EPL, Version 2.0", "https://opensource.org/licenses/EPL-2.0") to listOf( + "EPL 2.0", + "EPL, Version 2.0" + ), + license("EDL, Version 1.0", "https://www.eclipse.org/org/documents/edl-v10.php") to listOf( + "EDL 1.0", + "EDL, Version 1.0", + "Eclipse Distribution License - v 1.0" + ), + license("BSD 3-Clause License", "https://opensource.org/licenses/BSD-3-Clause") to listOf( + "BSD 3-clause", + "BSD-3-Clause", + "BSD 3-Clause License", + "3-Clause BSD License", + "New BSD License", + license("BSD", "http://asm.ow2.org/license.html"), + license("BSD", "http://asm.objectweb.org/license.html"), + license("BSD", "LICENSE.txt") + ), + license("Bouncy Castle License", "https://www.bouncycastle.org/licence.html") to listOf( + "Bouncy Castle Licence" + ), + license("W3C License", "https://opensource.org/licenses/W3C") to listOf( + "W3C License", + "W3C Software Copyright Notice and License", + "The W3C Software License" + ), + license("CC0", "https://creativecommons.org/publicdomain/zero/1.0/") to listOf( + "CC0", + "Public Domain" + ) + ) + + dependencyConfiguration = "runtimeClasspath" +} + +val javaComponent = components["java"] as AdhocComponentWithVariants +javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements.get()) { + skip() +} diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java index 6661a9afcf..769053019d 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -45,6 +45,7 @@ public class RedisPollingProtocolAdapter implements BatchPollingProtocolAdapter { private static final @NotNull Logger log = LoggerFactory.getLogger(RedisPollingProtocolAdapter.class); private static final @NotNull ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + private final @NotNull RedisAdapterConfig adapterConfig; private final @NotNull ProtocolAdapterInformation adapterInformation; private final @NotNull ProtocolAdapterState protocolAdapterState; @@ -108,6 +109,7 @@ public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInpu public void poll(final @NotNull BatchPollingInput pollingInput, final @NotNull BatchPollingOutput pollingOutput) { log.debug("Handling tags for Redis protocol adapter"); tags.forEach(tag -> loadRedisData(pollingOutput, (RedisAdapterTag) tag)); + protocolAdapterState.setConnectionStatus(STATELESS); pollingOutput.finish(); } @@ -159,7 +161,6 @@ private void loadRedisData(final @NotNull BatchPollingOutput output, final @NotN log.debug("String Key : {}", definition.getKey()); try (final Jedis jedis = jedisPool.getResource();){ final String result = jedis.get(definition.getKey()); - log.debug("String Result : {}",result); node.put("value", result); log.debug(node.toString()); log.debug("Adding datapoint"); diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java index 52d1f94b3e..6a9077dc31 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisProtocolAdapterFactory.java @@ -30,7 +30,8 @@ public class RedisProtocolAdapterFactory implements ProtocolAdapterFactory input) { + public @NotNull ProtocolAdapter createAdapter(final @NotNull ProtocolAdapterInformation adapterInformation, + @NotNull final ProtocolAdapterInput input) { return new RedisPollingProtocolAdapter(adapterInformation, input); } } diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java deleted file mode 100644 index 5b05b1606e..0000000000 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisSubscribingProtocolAdapter.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2024-present HiveMQ GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.hivemq.edge.adapters.redis; - -import com.hivemq.adapter.sdk.api.ProtocolAdapter; -import com.hivemq.adapter.sdk.api.ProtocolAdapterInformation; -import com.hivemq.adapter.sdk.api.factories.AdapterFactories; -import com.hivemq.adapter.sdk.api.model.*; -import com.hivemq.adapter.sdk.api.state.ProtocolAdapterState; -import com.hivemq.edge.adapters.redis.config.RedisAdapterConfig; -import com.hivemq.edge.adapters.redis.helpers.RedisHelpers; -import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import redis.clients.jedis.JedisPool; - -@SuppressWarnings({"FieldCanBeLocal", "unused", "EmptyTryBlock"}) -public class RedisSubscribingProtocolAdapter implements ProtocolAdapter { - private static final @NotNull Logger log = LoggerFactory.getLogger(RedisSubscribingProtocolAdapter.class); - - private final @NotNull RedisAdapterConfig adapterConfig; - private final @NotNull ProtocolAdapterInformation adapterInformation; - private final @NotNull ProtocolAdapterState protocolAdapterState; - private final @NotNull AdapterFactories adapterFactories; - private final @NotNull String adapterId; - private final @NotNull RedisHelpers redisHelpers; - private JedisPool jedisPool; - - public RedisSubscribingProtocolAdapter( - final @NotNull ProtocolAdapterInformation adapterInformation, final @NotNull ProtocolAdapterInput input, @NotNull RedisHelpers redisHelpers) { - this.adapterId = input.getAdapterId(); - this.adapterInformation = adapterInformation; - this.adapterConfig = input.getConfig(); - this.protocolAdapterState = input.getProtocolAdapterState(); - this.adapterFactories = input.adapterFactories(); - this.redisHelpers = new RedisHelpers(); - } - - @Override - public @NotNull String getId() { - return adapterId; - } - - @Override - public void start(@NotNull ProtocolAdapterStartInput input, @NotNull ProtocolAdapterStartOutput output) { - /* Test connection to the database when starting the adapter. */ - try { - // Start Initialization - jedisPool = redisHelpers.initJedisPool(adapterConfig); - - if(!jedisPool.isClosed()){ - output.startedSuccessfully(); - protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.CONNECTED); - jedisPool.close(); - } else { - output.failStart(new Throwable("Error connecting Redis server, please check the configuration"), "Error connecting Redis server, please check the configuration"); - protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); - } - } catch (final Exception e) { - jedisPool.close(); - output.failStart(e, null); - protocolAdapterState.setConnectionStatus(ProtocolAdapterState.ConnectionStatus.DISCONNECTED); - } - } - - @Override - public void stop(@NotNull ProtocolAdapterStopInput protocolAdapterStopInput, @NotNull ProtocolAdapterStopOutput protocolAdapterStopOutput) { - try { - // gracefully disconnect and cleanup resources here - } catch (final Exception e) { - protocolAdapterStopOutput.failStop(e, null); - } - protocolAdapterStopOutput.stoppedSuccessfully(); - } - - @Override - public @NotNull ProtocolAdapterInformation getProtocolAdapterInformation() { - return adapterInformation; - } -} From 1b8ddfe9dfb6501e57b3490cffb7337dc1799fb5 Mon Sep 17 00:00:00 2001 From: Anthony Olazabal Date: Wed, 28 May 2025 13:49:21 +0200 Subject: [PATCH 7/7] Add log debug --- .../edge/adapters/redis/RedisPollingProtocolAdapter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java index 769053019d..221f7d987a 100644 --- a/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java +++ b/modules/hivemq-edge-module-redis/src/main/java/com/hivemq/edge/adapters/redis/RedisPollingProtocolAdapter.java @@ -109,9 +109,10 @@ public void stop(final @NotNull ProtocolAdapterStopInput protocolAdapterStopInpu public void poll(final @NotNull BatchPollingInput pollingInput, final @NotNull BatchPollingOutput pollingOutput) { log.debug("Handling tags for Redis protocol adapter"); tags.forEach(tag -> loadRedisData(pollingOutput, (RedisAdapterTag) tag)); - + log.debug("Finished getting tags"); protocolAdapterState.setConnectionStatus(STATELESS); pollingOutput.finish(); + log.debug("Finished polling"); } private void loadRedisData(final @NotNull BatchPollingOutput output, final @NotNull RedisAdapterTag tag) { @@ -164,6 +165,7 @@ private void loadRedisData(final @NotNull BatchPollingOutput output, final @NotN node.put("value", result); log.debug(node.toString()); log.debug("Adding datapoint"); + log.debug(tag.getName()); output.addDataPoint(dataPointFactory.create(tag.getName(), node)); } break;