Add realtime inference consumer

.gitignore

@@ -27,4 +27,7 @@ smtp.env
 /libs/
 
 # Distribution
-/radar-backend-*
+/radar-backend-*
+/src/integrationTest/docker/etc/google-credentials.json
+
+temp

.travis.yml

@@ -35,8 +35,6 @@ script:
   - sudo docker-compose up -d zookeeper-1 kafka-1 schema-registry-1 && sleep 30 && sudo docker-compose run --rm integration-test
   - sudo docker-compose down
   - cd ../../..
-after_script:
-  - ./gradlew sendCoverageToCodacy
 
 deploy:
   provider: releases
@@ -49,6 +47,3 @@ deploy:
   skip_cleanup: true
   on:
     tags: true
-
-after_deploy:
-  - ./gradlew bintrayUpload

Dockerfile

@@ -10,44 +10,44 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gradle:6.6.1-jdk11 as builder
+FROM gradle:7.4-jdk17 as builder
 
 RUN mkdir /code
 WORKDIR /code
 
-ENV GRADLE_OPTS=-Dorg.gradle.project.profile=prod \
+ENV GRADLE_OPTS="-Dorg.gradle.project.profile=prod -Djdk.lang.Process.launchMechanism=vfork" \
   GRADLE_USER_HOME=/code/.gradlecache
 
 COPY ./gradle/profile.prod.gradle /code/gradle/
 COPY ./build.gradle ./gradle.properties ./settings.gradle /code/
 
-RUN gradle downloadRuntimeDependencies
+RUN gradle downloadRuntimeDependencies copyDependencies startScripts
 
 COPY ./src/ /code/src
 
-RUN gradle distTar && \
-  tar xf build/distributions/*.tar && \
-  rm build/distributions/*.tar
+RUN gradle jar
 
-FROM openjdk:11-jre-slim
+FROM azul/zulu-openjdk-alpine:17-jre-headless
 
 MAINTAINER Nivethika M <nivethika@thehyve.nl> , Joris Borgdorff <joris@thehyve.nl> , Yatharth Ranjan <yatharth.ranjan@kcl.ac.uk>
 
 LABEL description="RADAR-CNS Backend streams and monitor"
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-		curl \
-		wget \
-	&& rm -rf /var/lib/apt/lists/*
+RUN apk add --no-cache curl
+
+RUN mkdir -p /var/lib/radar/data
+RUN chown 101:101 /var/lib/radar/data
 
-ENV KAFKA_REST_PROXY http://rest-proxy:8082
 ENV KAFKA_SCHEMA_REGISTRY http://schema-registry:8081
 ENV RADAR_BACKEND_CONFIG /etc/radar.yml
 
-COPY --from=builder /code/radar-backend-*/bin/* /usr/bin/
-COPY --from=builder /code/radar-backend-*/lib/* /usr/lib/
+COPY --from=builder /code/build/third-party/* /usr/lib/
+COPY --from=builder /code/build/scripts/* /usr/bin/
+COPY --from=builder /code/build/libs/* /usr/lib/
 
 # Load topics validator
 COPY ./src/main/docker/radar-backend-init /usr/bin
 
+USER 101:101
+
 ENTRYPOINT ["radar-backend-init"]

build.gradle

@@ -2,6 +2,7 @@ plugins {
     // Apply the java plugin to add support for Java
     id 'java'
     id 'application'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
 }
 
 //---------------------------------------------------------------------------//
@@ -14,10 +15,6 @@ version = '0.4.1-SNAPSHOT'
 mainClassName = 'org.radarcns.RadarBackend'
 applicationDefaultJvmArgs = ["-Dlog4j.configuration=log4j.properties"]
 
-
-targetCompatibility = '11.0'
-sourceCompatibility = '11.0'
-
 ext {
     moduleDescription = 'Kafka backend for processing device data.'
     githubRepoName = 'RADAR-Base/RADAR-Backend'
@@ -27,23 +24,23 @@ ext {
     issueUrl = 'https://github.com/' + githubRepoName + '/issues'
     website = 'http://radar-base.org'
 
-    codacyVersion = '4.0.2'
-    confluentVersion = '5.5.1'
-    hamcrestVersion = '1.3'
-    kafkaVersion = '2.5.0'
-    jacksonVersion = '2.11.2'
+    confluentVersion = '7.0.1'
+    hamcrestVersion = '2.2'
+    kafkaVersion = '3.0.0'
+    jacksonVersion = '2.13.1'
     javaMailVersion = '1.6.2'
-    junitVersion = '4.12'
+    junitVersion = '4.13.1'
     findbugVersion = '3.0.2'
     commonsCliVersion = '1.4'
-    mockitoVersion = '3.5.11'
-    radarCommonsVersion = '0.13.0'
-    radarSchemasVersion = '0.5.14'
+    mockitoVersion = '4.3.1'
+    radarCommonsVersion = '0.14.1-SNAPSHOT'
+    radarSchemasVersion = '0.7.6'
     subethamailVersion = '3.1.7'
-    jsoupVersion = '1.13.1'
-    slf4jVersion = '1.7.30'
-    log4jVersion = '1.2.17'
-    avroVersion = '1.9.2'
+    jsoupVersion = '1.14.3'
+    slf4jVersion = '1.7.35'
+    reload4jVersion = '1.2.18.5'
+    avroVersion = '1.11.0'
+    jsonPathVersion = '2.7.0'
 }
 
 //---------------------------------------------------------------------------//
@@ -53,14 +50,9 @@ ext {
 // In this section you declare where to find the dependencies of your project
 repositories {
     mavenCentral()
-    // Non-jcenter radar releases
-    maven { url 'http://dl.bintray.com/radar-cns/org.radarcns' }
-    maven { url  'http://dl.bintray.com/radar-base/org.radarbase' }
     // Kafka/confluent releases
-    maven { url 'http://packages.confluent.io/maven/' }
-    // For working with dev-branches
-    maven { url 'http://oss.jfrog.org/artifactory/oss-snapshot-local/' }
-    // Github code
+    maven { url 'https://packages.confluent.io/maven/' }
+    maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
     maven { url 'https://jitpack.io' }
 }
 
@@ -69,11 +61,14 @@ dependencies {
     implementation group: 'org.radarbase', name: 'radar-commons', version: radarCommonsVersion
     implementation group: 'org.apache.avro', name: 'avro', version: avroVersion
     implementation group: 'org.radarbase', name: 'radar-commons-testing', version: radarCommonsVersion
-    implementation group: 'org.radarcns', name: 'radar-schemas-commons', version: radarSchemasVersion
+    implementation group: 'org.radarbase', name: 'radar-schemas-commons', version: radarSchemasVersion
+    implementation group: 'org.radarbase', name: 'oauth-client-util', version: '0.8.1'
+    implementation group: 'org.radarbase', name: 'radar-app-config-client', version: '0.4.1-SNAPSHOT'
 
     // Kafka streaming API
     implementation group: 'org.apache.kafka', name: 'kafka-streams', version: kafkaVersion
     implementation group: 'io.confluent', name: 'kafka-streams-avro-serde', version: confluentVersion
+    implementation group: 'io.confluent', name: 'kafka-json-serializer', version: confluentVersion
 
     // Nonnull annotation
     implementation group: 'com.google.code.findbugs' , name: 'jsr305' , version: findbugVersion
@@ -84,6 +79,7 @@ dependencies {
     // Configuration @JsonProperty
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: jacksonVersion
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
+    implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jacksonVersion
 
     // Monitor mail sending
     implementation group: 'javax.mail', name: 'javax.mail-api', version: javaMailVersion
@@ -92,14 +88,34 @@ dependencies {
     // JSoup html parser
     implementation group: 'org.jsoup', name: 'jsoup', version: jsoupVersion
 
-    runtimeOnly group: 'org.radarbase', name: 'radar-commons-unsafe', version: radarCommonsVersion
+    // JsonPath for evaluating json conditions dynamically.
+    implementation group: 'com.jayway.jsonpath', name: 'json-path', version: jsonPathVersion
 
-    runtimeOnly group: 'log4j', name: 'log4j', version: log4jVersion
-    runtimeOnly group: 'org.slf4j', name: 'slf4j-log4j12', version: slf4jVersion
+    runtimeOnly group: 'ch.qos.reload4j', name: 'reload4j', version: reload4jVersion
+    runtimeOnly group: 'org.slf4j', name: 'slf4j-reload4j', version: slf4jVersion
 }
 
 if (!hasProperty('profile')) {
     ext.profile = 'dev'
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+        freeCompilerArgs = [
+                "-Xjavac-arguments='-Xlint:unchecked -Xlint:deprecation'"
+        ]
+    }
+}
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+}
+
 apply from: "gradle/profile.${profile}.gradle"

gradle.properties

@@ -1,2 +0,0 @@
-bintrayUser=
-bintrayApiKey=

gradle/profile.dev.gradle

@@ -1,5 +1,3 @@
 apply from: 'gradle/test.gradle'
-apply from: 'gradle/codacy.gradle'
 apply from: 'gradle/style.gradle'
 apply from: 'gradle/utilities.gradle'
-apply from: 'gradle/publishing.gradle'

gradle/profile.prod.gradle

@@ -6,6 +6,14 @@ task downloadRuntimeDependencies {
     }
 }
 
+tasks.register("copyDependencies", Copy.class) {
+    from(configurations.named("runtimeClasspath").map { it.files })
+    into("$buildDir/third-party/")
+    doLast {
+        println("Copied third-party runtime dependencies")
+    }
+}
+
 processResources {
     expand(version: version)
 }