From acdbca6790b42be949cf17e4dad32777de795dd9 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 15 Apr 2021 14:11:13 +0200 Subject: [PATCH 01/10] Bump dev version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4246723e..9fd3e74a 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { } allprojects { - version = '0.13.2' + version = '0.13.3-SNAPSHOT' group = 'org.radarbase' } From e77e383dfea0939279b6c6febba293a2e1125e3d Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 15 Apr 2021 14:13:51 +0200 Subject: [PATCH 02/10] Move versions to gradle.properties --- build.gradle | 15 --------------- gradle.properties | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 9fd3e74a..572e463d 100644 --- a/build.gradle +++ b/build.gradle @@ -35,21 +35,6 @@ subprojects { // Configuration // //---------------------------------------------------------------------------// ext.githubRepoName = 'RADAR-base/radar-commons' - - ext.slf4jVersion = '1.7.30' - ext.kafkaVersion = '6.1.1-ce' - ext.avroVersion = '1.9.2' - ext.confluentVersion = '6.1.1' - ext.jacksonVersion = '2.12.3' - ext.jacksonYamlVersion = '2.12.3' - ext.okhttpVersion = '4.9.1' - ext.junitVersion = '4.13.2' - ext.mockitoVersion = '3.9.0' - ext.hamcrestVersion = '1.3' - ext.codacyVersion = '11.15.0' - ext.radarSchemasVersion = '0.6.0' - ext.orgJsonVersion = '20210307' - ext.githubUrl = "https://github.com/$githubRepoName" ext.issueUrl = "https://github.com/$githubRepoName/issues" ext.website = 'https://radar-base.org' diff --git a/gradle.properties b/gradle.properties index 09426f9c..20742700 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,13 @@ -#bintrayUser=username -#bintrayApiKey=apikey +slf4jVersion=1.7.30 +kafkaVersion=6.1.1-ce +avroVersion=1.9.2 +confluentVersion=6.1.1 +jacksonVersion=2.12.3 +jacksonYamlVersion=2.12.3 +okhttpVersion=4.9.1 +junitVersion=4.13.2 +mockitoVersion=3.9.0 +hamcrestVersion=1.3 +codacyVersion=11.15.0 +radarSchemasVersion=0.6.0 +orgJsonVersion=20210307 From 3f668cc1f4b88326bf9dd0ba10f7212e57d21486 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 15 Apr 2021 14:36:16 +0200 Subject: [PATCH 03/10] Update avro deserializer --- .../AbstractKafkaAvroDeserializer.java | 83 +++++++++++-------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java b/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java index 4a74187c..2d2b8551 100644 --- a/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java +++ b/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java @@ -16,19 +16,11 @@ package io.confluent.kafka.serializers; -import io.confluent.kafka.schemaregistry.avro.AvroSchema; -import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider; -import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils; -import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; -import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import java.nio.ByteBuffer; import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import kafka.utils.VerifiableProperties; import org.apache.avro.Schema; +import org.apache.avro.Schema.Type; import org.apache.avro.generic.GenericContainer; import org.apache.avro.generic.GenericDatumReader; import org.apache.avro.io.DatumReader; @@ -38,15 +30,27 @@ import org.apache.avro.specific.SpecificData; import org.apache.avro.specific.SpecificDatumReader; import org.apache.avro.specific.SpecificRecord; +import org.apache.kafka.common.errors.InvalidConfigurationException; import org.apache.kafka.common.errors.SerializationException; -public abstract class AbstractKafkaAvroDeserializer extends AbstractKafkaSchemaSerDe { +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; - private final ConcurrentMap> oldToNewIdMap = new ConcurrentHashMap<>(); +import io.confluent.kafka.schemaregistry.avro.AvroSchema; +import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider; +import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils; +import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; +import kafka.utils.VerifiableProperties; +@SuppressWarnings("unused") +public abstract class AbstractKafkaAvroDeserializer extends AbstractKafkaSchemaSerDe { private final DecoderFactory decoderFactory = DecoderFactory.get(); protected boolean useSpecificAvroReader = false; private final Map readerSchemaCache = new ConcurrentHashMap<>(); + private final Map> datumReaderCache = new ConcurrentHashMap<>(); + private final ConcurrentMap> oldToNewIdMap = new ConcurrentHashMap<>(); /** * Sets properties for this deserializer without overriding the schema registry client itself. @@ -134,7 +138,7 @@ private String subjectName(String topic, Boolean isKey, AvroSchema schemaFromReg */ protected GenericContainerWithVersion deserializeWithSchemaAndVersion( String topic, boolean isKey, byte[] payload) - throws SerializationException { + throws SerializationException, InvalidConfigurationException { // Even if the caller requests schema & version, if the payload is null we cannot include it. // The caller must handle this case. if (payload == null) { @@ -163,28 +167,38 @@ protected GenericContainerWithVersion deserializeWithSchemaAndVersion( return new GenericContainerWithVersion(new NonRecordContainer(schema.rawSchema(), result), version); } - } catch (RestClientException | IOException e) { + } catch (IOException e) { throw new SerializationException("Error retrieving Avro " + getSchemaType(isKey) + " schema version for id " + context.getSchemaId(), e); + } catch (RestClientException e) { + String errorMessage = "Error retrieving Avro " + + getSchemaType(isKey) + + " schema version for id " + + context.getSchemaId(); + throw toKafkaException(e, errorMessage); } } protected DatumReader getDatumReader(Schema writerSchema, Schema readerSchema) { // normalize reader schema - readerSchema = getReaderSchema(writerSchema, readerSchema); - boolean writerSchemaIsPrimitive = - AvroSchemaUtils.getPrimitiveSchemas().containsValue(writerSchema); - if (writerSchemaIsPrimitive) { - return new GenericDatumReader<>(writerSchema, readerSchema); - } else if (useSchemaReflection) { - return new ReflectDatumReader<>(writerSchema, readerSchema); - } else if (useSpecificAvroReader) { - return new SpecificDatumReader<>(writerSchema, readerSchema); - } else { - return new GenericDatumReader<>(writerSchema, readerSchema); - } + final Schema finalReaderSchema = getReaderSchema(writerSchema, readerSchema); + SchemaPair cacheKey = new SchemaPair(writerSchema, finalReaderSchema); + + return datumReaderCache.computeIfAbsent(cacheKey, schema -> { + boolean writerSchemaIsPrimitive = + AvroSchemaUtils.getPrimitiveSchemas().values().contains(writerSchema); + if (writerSchemaIsPrimitive) { + return new GenericDatumReader<>(writerSchema, finalReaderSchema); + } else if (useSchemaReflection) { + return new ReflectDatumReader<>(writerSchema, finalReaderSchema); + } else if (useSpecificAvroReader) { + return new SpecificDatumReader<>(writerSchema, finalReaderSchema); + } else { + return new GenericDatumReader<>(writerSchema, finalReaderSchema); + } + }); } /** @@ -224,6 +238,11 @@ private Schema getReaderSchema(Schema writerSchema, Schema readerSchema) { @SuppressWarnings("unchecked") private Schema getSpecificReaderSchema(Schema writerSchema) { + if (writerSchema.getType() == Type.ARRAY + || writerSchema.getType() == Type.MAP + || writerSchema.getType() == Type.UNION) { + return writerSchema; + } Class readerClass = SpecificData.get().getClass(writerSchema); if (readerClass == null) { throw new SerializationException("Could not find class " @@ -278,6 +297,10 @@ AvroSchema schemaFromRegistry() { try { return (AvroSchema) schemaRegistry.getSchemaBySubjectAndId(subject, id); } catch (RestClientException e) { + String errorMessage = "Error retrieving Avro " + + getSchemaType(isKey) + + " schema for id " + + schemaId; if (e.getErrorCode() == 40403) { try { List versions = schemaRegistry.getAllVersions(subject); @@ -286,16 +309,10 @@ AvroSchema schemaFromRegistry() { return (AvroSchema) schemaRegistry.getSchemaBySubjectAndId(subject, latestId); } catch (RestClientException | IOException ex) { - throw new SerializationException("Error retrieving Avro " - + getSchemaType(isKey) - + " schema for id " - + schemaId, e); + throw toKafkaException(e, errorMessage); } } - throw new SerializationException("Error retrieving Avro " - + getSchemaType(isKey) - + " schema for id " - + schemaId, e); + throw toKafkaException(e, errorMessage); } catch (IOException e) { throw new SerializationException("Error retrieving Avro " + getSchemaType(isKey) From c75faa2b6d3fcb8d005ecd4ef64d0bc10decf086 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 15:41:00 +0100 Subject: [PATCH 04/10] Bump versions --- .travis.yml | 26 -- build.gradle | 7 +- config/checkstyle/checkstyle.xml | 51 ++- config/pmd/ruleset.xml | 21 +- gradle.properties | 17 +- gradle/codestyle.gradle | 43 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++----- radar-commons-server/build.gradle | 9 +- radar-commons-testing/build.gradle | 7 - .../java/org/radarbase/mock/MockDevice.java | 1 + .../radarbase/mock/data/MockCsvParser.java | 4 +- .../radarbase/mock/data/RecordGenerator.java | 1 + radar-commons-unsafe/build.gradle | 26 -- .../AbstractKafkaAvroDeserializer.java | 384 ------------------ radar-commons/build.gradle | 11 +- .../org/radarbase/config/ServerConfig.java | 39 +- .../radarbase/data/RemoteSchemaEncoder.java | 5 +- .../producer/BatchedKafkaSender.java | 1 + .../producer/rest/AvroDataMapperFactory.java | 8 +- .../producer/rest/BinaryRecordRequest.java | 9 +- .../producer/rest/GzipRequestInterceptor.java | 8 +- .../producer/rest/JsonRecordRequest.java | 7 +- .../radarbase/producer/rest/RestClient.java | 9 +- .../producer/rest/SchemaRetriever.java | 25 +- .../java/org/radarbase/topic/AvroTopic.java | 3 +- .../main/java/org/radarbase/util/Base64.java | 3 +- settings.gradle | 11 - 29 files changed, 301 insertions(+), 694 deletions(-) delete mode 100644 .travis.yml delete mode 100644 radar-commons-unsafe/build.gradle delete mode 100644 radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9e4cf878..00000000 --- a/.travis.yml +++ /dev/null @@ -1,26 +0,0 @@ -language: java -jdk: - - oraclejdk11 -sudo: false - -cache: - directories: - - $HOME/.gradle/caches/jars-1 - - $HOME/.gradle/caches/jars-2 - - $HOME/.gradle/caches/jars-3 - - $HOME/.gradle/caches/modules-2/files-2.1/ - - $HOME/.gradle/native - - $HOME/.gradle/wrapper - -after_script: - - ./gradlew sendCoverageToCodacy - -deploy: - - provider: releases - api_key: ${GH_TOKEN} - file_glob: true - file: - - "*/build/libs/*.jar" - skip_cleanup: true - on: - tags: true diff --git a/build.gradle b/build.gradle index 572e463d..672dc279 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ * limitations under the License. */ plugins { - id 'com.commercehub.gradle.plugin.avro' version '0.19.1' + id 'com.github.davidmc24.gradle.plugin.avro' version '1.3.0' id("io.github.gradle-nexus.publish-plugin") version "1.0.0" id("com.github.ben-manes.versions") version "0.38.0" } @@ -31,6 +31,9 @@ subprojects { apply plugin: 'idea' apply plugin: 'com.github.ben-manes.versions' + targetCompatibility = '11' + sourceCompatibility = '11' + //---------------------------------------------------------------------------// // Configuration // //---------------------------------------------------------------------------// @@ -107,5 +110,5 @@ nexusPublishing { } wrapper { - gradleVersion '7.0' + gradleVersion '7.3.3' } diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index b9f3a458..a252c58c 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -1,7 +1,7 @@ + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd"> - + - + @@ -27,6 +27,11 @@ + + + + + @@ -39,10 +44,6 @@ - - - - @@ -51,10 +52,7 @@ - - - - + @@ -87,6 +85,23 @@ + + + + + + + + + + + + + + + + + - - + - + + + + + - - + diff --git a/config/pmd/ruleset.xml b/config/pmd/ruleset.xml index ca3f5871..1157371b 100644 --- a/config/pmd/ruleset.xml +++ b/config/pmd/ruleset.xml @@ -23,6 +23,11 @@ + + + + + @@ -37,6 +42,7 @@ + @@ -52,8 +58,13 @@ - - + + + + + + + @@ -62,13 +73,17 @@ - + + + + + diff --git a/gradle.properties b/gradle.properties index 20742700..3ad3c41c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,12 @@ -slf4jVersion=1.7.30 -kafkaVersion=6.1.1-ce -avroVersion=1.9.2 -confluentVersion=6.1.1 -jacksonVersion=2.12.3 -jacksonYamlVersion=2.12.3 -okhttpVersion=4.9.1 +slf4jVersion=1.7.32 +confluentVersion=7.0.1 +kafkaVersion=7.0.1-ce +avroVersion=1.11.0 +jacksonVersion=2.12.6 +jacksonYamlVersion=2.12.6 +okhttpVersion=4.9.3 junitVersion=4.13.2 mockitoVersion=3.9.0 hamcrestVersion=1.3 -codacyVersion=11.15.0 -radarSchemasVersion=0.6.0 +radarSchemasVersion=0.7.5 orgJsonVersion=20210307 diff --git a/gradle/codestyle.gradle b/gradle/codestyle.gradle index f2bd9bd1..9a24dbb0 100644 --- a/gradle/codestyle.gradle +++ b/gradle/codestyle.gradle @@ -1,55 +1,24 @@ apply plugin: 'checkstyle' apply plugin: 'pmd' -apply plugin: 'jacoco' - -configurations { - codacy -} - -dependencies { - codacy group: 'com.github.codacy', name: 'codacy-coverage-reporter', version: codacyVersion -} checkstyle { - // codacy version - toolVersion '6.16' - ignoreFailures false + toolVersion = '9.2' + ignoreFailures = false configFile = rootProject.file('config/checkstyle/checkstyle.xml') + // ignore tests + sourceSets = [sourceSets.main] } pmd { - // codacy version - toolVersion = '6.12.0' + toolVersion = '6.41.0' ignoreFailures = false consoleOutput = true ruleSets = [] - ruleSetFiles = files(rootProject.file("config/pmd/ruleset.xml")) -} - -checkstyle { + ruleSetFiles = rootProject.files("config/pmd/ruleset.xml") // ignore tests sourceSets = [sourceSets.main] } -pmd { - // ignore tests - sourceSets = [sourceSets.main] -} - -jacocoTestReport { - reports { - xml.enabled = true - csv.enabled = false - html.enabled = false - } -} - -task sendCoverageToCodacy(type: JavaExec, dependsOn: jacocoTestReport) { - main = 'com.codacy.CodacyCoverageReporter' - classpath = configurations.codacy - args = ['report', '-l', 'Java', '-r', "${buildDir}/reports/jacoco/test/jacocoTestReport.xml"] -} - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..2e6e5897 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +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" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# 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. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +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/radar-commons-server/build.gradle b/radar-commons-server/build.gradle index cdba36cc..8ed0c63d 100644 --- a/radar-commons-server/build.gradle +++ b/radar-commons-server/build.gradle @@ -14,17 +14,10 @@ * limitations under the License. */ -apply plugin: 'com.commercehub.gradle.plugin.avro' +apply plugin: 'com.github.davidmc24.gradle.plugin.avro' description = 'RADAR Common server library utilities.' -targetCompatibility = '11.0' -sourceCompatibility = '11.0' - -repositories { - maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } -} - dependencies { api project(':radar-commons') diff --git a/radar-commons-testing/build.gradle b/radar-commons-testing/build.gradle index 5e139e49..a795c1df 100644 --- a/radar-commons-testing/build.gradle +++ b/radar-commons-testing/build.gradle @@ -33,13 +33,6 @@ run { description = 'RADAR Common testing library mocking code and utilities.' -targetCompatibility = '11.0' -sourceCompatibility = '11.0' - -repositories { - maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } -} - dependencies { api project(':radar-commons') api project(':radar-commons-server') diff --git a/radar-commons-testing/src/main/java/org/radarbase/mock/MockDevice.java b/radar-commons-testing/src/main/java/org/radarbase/mock/MockDevice.java index 16e547d5..f2592fb2 100644 --- a/radar-commons-testing/src/main/java/org/radarbase/mock/MockDevice.java +++ b/radar-commons-testing/src/main/java/org/radarbase/mock/MockDevice.java @@ -63,6 +63,7 @@ public MockDevice(KafkaSender sender, K key, List> generators } @Override + @SuppressWarnings("PMD.CloseResource") public void run() { List> topicSenders = new ArrayList<>(generators.size()); diff --git a/radar-commons-testing/src/main/java/org/radarbase/mock/data/MockCsvParser.java b/radar-commons-testing/src/main/java/org/radarbase/mock/data/MockCsvParser.java index a7d4b133..8c0056c8 100644 --- a/radar-commons-testing/src/main/java/org/radarbase/mock/data/MockCsvParser.java +++ b/radar-commons-testing/src/main/java/org/radarbase/mock/data/MockCsvParser.java @@ -40,9 +40,10 @@ import org.radarbase.topic.AvroTopic; /** - * Parse mock data from a CSV file + * Parse mock data from a CSV file. * @param key type. */ +@SuppressWarnings("PMD.GodClass") public class MockCsvParser implements Closeable { private static final char ARRAY_SEPARATOR = ';'; private static final char ARRAY_START = '['; @@ -127,6 +128,7 @@ private V parseRecord(String[] rawValues, return record; } + /** Parse value from Schema. */ public static Object parseValue(Schema schema, String fieldString) { switch (schema.getType()) { case INT: diff --git a/radar-commons-testing/src/main/java/org/radarbase/mock/data/RecordGenerator.java b/radar-commons-testing/src/main/java/org/radarbase/mock/data/RecordGenerator.java index 88b9dcbf..dfcc0b30 100644 --- a/radar-commons-testing/src/main/java/org/radarbase/mock/data/RecordGenerator.java +++ b/radar-commons-testing/src/main/java/org/radarbase/mock/data/RecordGenerator.java @@ -145,6 +145,7 @@ public Iterator> iterateValues(final K key, final long } /** + * Get a random double. * @return random {@code Double} using {@code ThreadLocalRandom}. **/ private double getRandomDouble() { diff --git a/radar-commons-unsafe/build.gradle b/radar-commons-unsafe/build.gradle deleted file mode 100644 index 86411178..00000000 --- a/radar-commons-unsafe/build.gradle +++ /dev/null @@ -1,26 +0,0 @@ -description = 'RADAR Common unsafe libraries overriding stock Kafka and Confluent code.' - -targetCompatibility = '1.8' -sourceCompatibility = '1.8' - -//---------------------------------------------------------------------------// -// Sources and classpath configurations // -//---------------------------------------------------------------------------// - -configurations.implementation { - resolutionStrategy.cacheChangingModulesFor 0, 'SECONDS' -} - -// In this section you declare where to find the dependencies of your project -repositories { - maven { url 'https://jitpack.io' } -} - -// In this section you declare the dependencies for your production and test code -dependencies { - compileOnly group: 'io.confluent', name: 'kafka-avro-serializer', version: confluentVersion - compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaVersion - compileOnly group: 'org.apache.kafka', name: 'kafka_2.12', version: kafkaVersion -} - -apply from: '../gradle/publishing.gradle' diff --git a/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java b/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java deleted file mode 100644 index 2d2b8551..00000000 --- a/radar-commons-unsafe/src/main/java/io/confluent/kafka/serializers/AbstractKafkaAvroDeserializer.java +++ /dev/null @@ -1,384 +0,0 @@ -/* - * Copyright 2018 Confluent Inc. - * - * 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 io.confluent.kafka.serializers; - -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.concurrent.ConcurrentMap; -import org.apache.avro.Schema; -import org.apache.avro.Schema.Type; -import org.apache.avro.generic.GenericContainer; -import org.apache.avro.generic.GenericDatumReader; -import org.apache.avro.io.DatumReader; -import org.apache.avro.io.DecoderFactory; -import org.apache.avro.reflect.ReflectData; -import org.apache.avro.reflect.ReflectDatumReader; -import org.apache.avro.specific.SpecificData; -import org.apache.avro.specific.SpecificDatumReader; -import org.apache.avro.specific.SpecificRecord; -import org.apache.kafka.common.errors.InvalidConfigurationException; -import org.apache.kafka.common.errors.SerializationException; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import io.confluent.kafka.schemaregistry.avro.AvroSchema; -import io.confluent.kafka.schemaregistry.avro.AvroSchemaProvider; -import io.confluent.kafka.schemaregistry.avro.AvroSchemaUtils; -import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; -import kafka.utils.VerifiableProperties; - -@SuppressWarnings("unused") -public abstract class AbstractKafkaAvroDeserializer extends AbstractKafkaSchemaSerDe { - private final DecoderFactory decoderFactory = DecoderFactory.get(); - protected boolean useSpecificAvroReader = false; - private final Map readerSchemaCache = new ConcurrentHashMap<>(); - private final Map> datumReaderCache = new ConcurrentHashMap<>(); - private final ConcurrentMap> oldToNewIdMap = new ConcurrentHashMap<>(); - - /** - * Sets properties for this deserializer without overriding the schema registry client itself. - * Useful for testing, where a mock client is injected. - */ - protected void configure(KafkaAvroDeserializerConfig config) { - configureClientProperties(config, new AvroSchemaProvider()); - useSpecificAvroReader = config - .getBoolean(KafkaAvroDeserializerConfig.SPECIFIC_AVRO_READER_CONFIG); - } - - protected KafkaAvroDeserializerConfig deserializerConfig(Map props) { - return new KafkaAvroDeserializerConfig(props); - } - - protected KafkaAvroDeserializerConfig deserializerConfig(VerifiableProperties props) { - return new KafkaAvroDeserializerConfig(props.props()); - } - - /** - * Deserializes the payload without including schema information for primitive types, maps, and - * arrays. Just the resulting deserialized object is returned. - * - *

This behavior is the norm for Decoders/Deserializers. - * - * @param payload serialized data - * @return the deserialized object - */ - protected Object deserialize(byte[] payload) throws SerializationException { - return deserialize(null, null, payload, null); - } - - /** - * Just like single-parameter version but accepts an Avro schema to use for reading - * - * @param payload serialized data - * @param readerSchema schema to use for Avro read (optional, enables Avro projection) - * @return the deserialized object - */ - protected Object deserialize(byte[] payload, Schema readerSchema) throws SerializationException { - return deserialize(null, null, payload, readerSchema); - } - - protected Object deserialize(String topic, Boolean isKey, byte[] payload, Schema readerSchema) - throws SerializationException { - if (payload == null) { - return null; - } - - DeserializationContext context = new DeserializationContext(topic, isKey, payload); - return context.read(context.schemaFromRegistry().rawSchema(), readerSchema); - } - - private Integer schemaVersion(String topic, - Boolean isKey, - int id, - String subject, - AvroSchema schema, - Object result) throws IOException, RestClientException { - Integer version; - if (isDeprecatedSubjectNameStrategy(isKey)) { - subject = getSubjectName(topic, isKey, result, schema); - AvroSchema subjectSchema = (AvroSchema) schemaRegistry.getSchemaBySubjectAndId(subject, id); - version = schemaRegistry.getVersion(subject, subjectSchema); - } else { - //we already got the subject name - version = schemaRegistry.getVersion(subject, schema); - } - return version; - } - - private String subjectName(String topic, Boolean isKey, AvroSchema schemaFromRegistry) { - return isDeprecatedSubjectNameStrategy(isKey) - ? null - : getSubjectName(topic, isKey, null, schemaFromRegistry); - } - - /** - * Deserializes the payload and includes schema information, with version information from the - * schema registry embedded in the schema. - * - * @param payload the serialized data - * @return a GenericContainer with the schema and data, either as a {@link NonRecordContainer}, - * {@link org.apache.avro.generic.GenericRecord}, or {@link SpecificRecord} - */ - protected GenericContainerWithVersion deserializeWithSchemaAndVersion( - String topic, boolean isKey, byte[] payload) - throws SerializationException, InvalidConfigurationException { - // Even if the caller requests schema & version, if the payload is null we cannot include it. - // The caller must handle this case. - if (payload == null) { - return null; - } - - // Annotate the schema with the version. Note that we only do this if the schema + - // version are requested, i.e. in Kafka Connect converters. This is critical because that - // code *will not* rely on exact schema equality. Regular deserializers *must not* include - // this information because it would return schemas which are not equivalent. - // - // Note, however, that we also do not fill in the connect.version field. This allows the - // Converter to let a version provided by a Kafka Connect source take priority over the - // schema registry's ordering (which is implicit by auto-registration time rather than - // explicit from the Connector). - DeserializationContext context = new DeserializationContext(topic, isKey, payload); - AvroSchema schema = context.schemaForDeserialize(); - Object result = context.read(schema.rawSchema(), null); - - try { - Integer version = schemaVersion(topic, isKey, context.getSchemaId(), - context.getSubject(), schema, result); - if (schema.rawSchema().getType().equals(Schema.Type.RECORD)) { - return new GenericContainerWithVersion((GenericContainer) result, version); - } else { - return new GenericContainerWithVersion(new NonRecordContainer(schema.rawSchema(), result), - version); - } - } catch (IOException e) { - throw new SerializationException("Error retrieving Avro " - + getSchemaType(isKey) - + " schema version for id " - + context.getSchemaId(), e); - } catch (RestClientException e) { - String errorMessage = "Error retrieving Avro " - + getSchemaType(isKey) - + " schema version for id " - + context.getSchemaId(); - throw toKafkaException(e, errorMessage); - } - } - - protected DatumReader getDatumReader(Schema writerSchema, Schema readerSchema) { - // normalize reader schema - final Schema finalReaderSchema = getReaderSchema(writerSchema, readerSchema); - SchemaPair cacheKey = new SchemaPair(writerSchema, finalReaderSchema); - - return datumReaderCache.computeIfAbsent(cacheKey, schema -> { - boolean writerSchemaIsPrimitive = - AvroSchemaUtils.getPrimitiveSchemas().values().contains(writerSchema); - if (writerSchemaIsPrimitive) { - return new GenericDatumReader<>(writerSchema, finalReaderSchema); - } else if (useSchemaReflection) { - return new ReflectDatumReader<>(writerSchema, finalReaderSchema); - } else if (useSpecificAvroReader) { - return new SpecificDatumReader<>(writerSchema, finalReaderSchema); - } else { - return new GenericDatumReader<>(writerSchema, finalReaderSchema); - } - }); - } - - /** - * Normalizes the reader schema, puts the resolved schema into the cache. - *

  • - *
      if the reader schema is provided, use the provided one
    - *
      if the reader schema is cached for the writer schema full name, use the cached value
    - *
      if the writer schema is primitive, use the writer one
    - *
      if schema reflection is used, generate one from the class referred by writer schema
    - *
      if generated classes are used, query the class referred by writer schema
    - *
      otherwise use the writer schema
    - *
    • - */ - private Schema getReaderSchema(Schema writerSchema, Schema readerSchema) { - if (readerSchema != null) { - return readerSchema; - } - readerSchema = readerSchemaCache.get(writerSchema.getFullName()); - if (readerSchema != null) { - return readerSchema; - } - boolean writerSchemaIsPrimitive = - AvroSchemaUtils.getPrimitiveSchemas().values().contains(writerSchema); - if (writerSchemaIsPrimitive) { - readerSchema = writerSchema; - } else if (useSchemaReflection) { - readerSchema = getReflectionReaderSchema(writerSchema); - readerSchemaCache.put(writerSchema.getFullName(), readerSchema); - } else if (useSpecificAvroReader) { - readerSchema = getSpecificReaderSchema(writerSchema); - readerSchemaCache.put(writerSchema.getFullName(), readerSchema); - } else { - readerSchema = writerSchema; - } - return readerSchema; - } - - @SuppressWarnings("unchecked") - private Schema getSpecificReaderSchema(Schema writerSchema) { - if (writerSchema.getType() == Type.ARRAY - || writerSchema.getType() == Type.MAP - || writerSchema.getType() == Type.UNION) { - return writerSchema; - } - Class readerClass = SpecificData.get().getClass(writerSchema); - if (readerClass == null) { - throw new SerializationException("Could not find class " - + writerSchema.getFullName() - + " specified in writer's schema whilst finding reader's " - + "schema for a SpecificRecord."); - } - try { - return readerClass.getConstructor().newInstance().getSchema(); - } catch (InstantiationException | NoSuchMethodException | InvocationTargetException e) { - throw new SerializationException(writerSchema.getFullName() - + " specified by the " - + "writers schema could not be instantiated to " - + "find the readers schema."); - } catch (IllegalAccessException e) { - throw new SerializationException(writerSchema.getFullName() - + " specified by the " - + "writers schema is not allowed to be instantiated " - + "to find the readers schema."); - } - } - - private Schema getReflectionReaderSchema(Schema writerSchema) { - // shall we use ReflectData.AllowNull.get() instead? - Class readerClass = ReflectData.get().getClass(writerSchema); - if (readerClass == null) { - throw new SerializationException("Could not find class " - + writerSchema.getFullName() - + " specified in writer's schema whilst finding reader's " - + "schema for a reflected class."); - } - return ReflectData.get().getSchema(readerClass); - } - - class DeserializationContext { - private final String topic; - private final Boolean isKey; - private final ByteBuffer buffer; - private final int schemaId; - - DeserializationContext(final String topic, final Boolean isKey, final byte[] payload) { - this.topic = topic; - this.isKey = isKey; - this.buffer = getByteBuffer(payload); - this.schemaId = buffer.getInt(); - } - - AvroSchema schemaFromRegistry() { - String subject = getSubject(); - ConcurrentMap subjectIdMap = oldToNewIdMap.computeIfAbsent(subject, sub -> new ConcurrentHashMap<>()); - int id = subjectIdMap.getOrDefault(schemaId, schemaId); - try { - return (AvroSchema) schemaRegistry.getSchemaBySubjectAndId(subject, id); - } catch (RestClientException e) { - String errorMessage = "Error retrieving Avro " - + getSchemaType(isKey) - + " schema for id " - + schemaId; - if (e.getErrorCode() == 40403) { - try { - List versions = schemaRegistry.getAllVersions(subject); - int latestId = versions.get(versions.size() - 1); - subjectIdMap.put(schemaId, latestId); - - return (AvroSchema) schemaRegistry.getSchemaBySubjectAndId(subject, latestId); - } catch (RestClientException | IOException ex) { - throw toKafkaException(e, errorMessage); - } - } - throw toKafkaException(e, errorMessage); - } catch (IOException e) { - throw new SerializationException("Error retrieving Avro " - + getSchemaType(isKey) - + " schema for id " - + schemaId, e); - } - } - - AvroSchema schemaForDeserialize() { - return schemaFromRegistry(); - } - - String getSubject() { - return subjectName(topic, isKey, schemaFromRegistry()); - } - - String getTopic() { - return topic; - } - - boolean isKey() { - return isKey; - } - - - int getSchemaId() { - return schemaId; - } - - Object read(Schema writerSchema) { - return read(writerSchema, null); - } - - Object read(Schema writerSchema, Schema readerSchema) { - DatumReader reader = getDatumReader(writerSchema, readerSchema); - int length = buffer.limit() - 1 - idSize; - if (writerSchema.getType().equals(Schema.Type.BYTES)) { - byte[] bytes = new byte[length]; - buffer.get(bytes, 0, length); - return bytes; - } else { - int start = buffer.position() + buffer.arrayOffset(); - try { - Object result = reader.read(null, decoderFactory.binaryDecoder(buffer.array(), - start, length, null)); - if (writerSchema.getType().equals(Schema.Type.STRING)) { - return result.toString(); - } else { - return result; - } - } catch (IOException | RuntimeException e) { - // avro deserialization may throw AvroRuntimeException, NullPointerException, etc - throw new SerializationException("Error deserializing Avro message for id " - + schemaId, e); - } - } - } - } - - private static String getSchemaType(Boolean isKey) { - if (isKey == null) { - return "unknown"; - } else if (isKey) { - return "key"; - } else { - return "value"; - } - } -} diff --git a/radar-commons/build.gradle b/radar-commons/build.gradle index a208d566..ad6bcec4 100644 --- a/radar-commons/build.gradle +++ b/radar-commons/build.gradle @@ -1,8 +1,5 @@ description = 'RADAR Common utilities library.' -targetCompatibility = '1.8' -sourceCompatibility = '1.8' - //---------------------------------------------------------------------------// // Sources and classpath configurations // //---------------------------------------------------------------------------// @@ -16,17 +13,11 @@ configurations { // In this section you declare where to find the dependencies of your project repositories { maven { url 'https://jitpack.io' } - maven { url 'https://oss.jfrog.org/artifactory/oss-snapshot-local' } } // In this section you declare the dependencies for your production and test code dependencies { - api (group: 'org.apache.avro', name: 'avro', version: avroVersion) { - exclude group: 'org.xerial.snappy', module: 'snappy-java' - exclude group: 'com.thoughtworks.paranamer', module: 'paranamer' - exclude group: 'org.apache.commons', module: 'commons-compress' - exclude group: 'org.tukaani', module: 'xz' - } + api (group: 'org.apache.avro', name: 'avro', version: avroVersion) // to implement producers and consumers api group: 'com.squareup.okhttp3', name: 'okhttp', version: okhttpVersion diff --git a/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java b/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java index 5ad6b177..3212c626 100644 --- a/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java +++ b/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java @@ -28,6 +28,7 @@ /** * POJO representing a ServerConfig configuration. */ +@SuppressWarnings("PMD.GodClass") public class ServerConfig { private String host; private int port = -1; @@ -124,7 +125,7 @@ public HttpUrl getHttpUrl() { } /** - * Get the HTTP proxyHost associated to given server + * Get the HTTP proxyHost associated to given server. * @return http proxyHost if specified, or null if none is specified. * @throws IllegalStateException if proxyHost is set but proxyPort is not or if the server * protocol is not HTTP(s) @@ -206,23 +207,29 @@ public String getPath() { * @throws IllegalArgumentException if the path contains a question mark. */ public final void setPath(String path) { - if (path == null) { - this.path = "/"; - } else if (path.contains("?")) { + this.path = cleanPath(path); + } + + @SuppressWarnings("PMD.UseStringBufferForStringAppends") + private static String cleanPath(String path) { + String newPath = path; + if (newPath == null) { + newPath = "/"; + } + if (newPath.contains("?")) { throw new IllegalArgumentException("Cannot set server path with query string"); - } else { - this.path = path.trim(); - if (this.path.isEmpty()) { - this.path = "/"; - } else { - if (this.path.charAt(0) != '/') { - this.path = '/' + this.path; - } - if (this.path.charAt(this.path.length() - 1) != '/') { - this.path += '/'; - } - } } + newPath = newPath.trim(); + if (newPath.isEmpty()) { + newPath = "/"; + } + if (newPath.charAt(0) != '/') { + newPath = '/' + newPath; + } + if (newPath.charAt(newPath.length() - 1) != '/') { + newPath += '/'; + } + return newPath; } @Override diff --git a/radar-commons/src/main/java/org/radarbase/data/RemoteSchemaEncoder.java b/radar-commons/src/main/java/org/radarbase/data/RemoteSchemaEncoder.java index c8f40ba0..bbd65b48 100644 --- a/radar-commons/src/main/java/org/radarbase/data/RemoteSchemaEncoder.java +++ b/radar-commons/src/main/java/org/radarbase/data/RemoteSchemaEncoder.java @@ -41,11 +41,12 @@ private class SchemaEncoderWriter implements AvroWriter { this.schema = schema; GenericData genericData; + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); if (SpecificRecord.class.isAssignableFrom(clazz)) { - genericData = new SpecificData(RemoteSchemaEncoder.class.getClassLoader()); + genericData = new SpecificData(classLoader); isGeneric = false; } else { - genericData = new GenericData(RemoteSchemaEncoder.class.getClassLoader()); + genericData = new GenericData(classLoader); isGeneric = true; } recordEncoder = new AvroDatumEncoder(genericData, binary); diff --git a/radar-commons/src/main/java/org/radarbase/producer/BatchedKafkaSender.java b/radar-commons/src/main/java/org/radarbase/producer/BatchedKafkaSender.java index 6e2fedce..8bc7f22c 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/BatchedKafkaSender.java +++ b/radar-commons/src/main/java/org/radarbase/producer/BatchedKafkaSender.java @@ -152,6 +152,7 @@ public void flush() throws IOException { } @Override + @SuppressWarnings("PMD.UseTryWithResources") public void close() throws IOException { try { flush(); diff --git a/radar-commons/src/main/java/org/radarbase/producer/rest/AvroDataMapperFactory.java b/radar-commons/src/main/java/org/radarbase/producer/rest/AvroDataMapperFactory.java index 51b68772..7f70ce66 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/rest/AvroDataMapperFactory.java +++ b/radar-commons/src/main/java/org/radarbase/producer/rest/AvroDataMapperFactory.java @@ -368,10 +368,10 @@ private AvroDataMapper mapBytes(Schema from, final Schema to, final Object defau private AvroDataMapper mapRecord(Schema from, Schema to) - throws SchemaValidationException { + throws SchemaValidationException { if (to.getType() != Schema.Type.RECORD) { throw new SchemaValidationException(to, from, - new IllegalArgumentException("From and to schemas must be records.")); + new IllegalArgumentException("From and to schemas must be records.")); } List fromFields = from.getFields(); Schema.Field[] toFields = new Schema.Field[fromFields.size()]; @@ -398,8 +398,8 @@ private AvroDataMapper mapRecord(Schema from, Schema to) for (int i = 0; i < filledPositions.length; i++) { if (!filledPositions[i] && to.getFields().get(i).defaultVal() == null) { throw new SchemaValidationException(to, from, - new IllegalArgumentException("Cannot map to record without default value" - + " for new field " + to.getFields().get(i).name())); + new IllegalArgumentException("Cannot map to record without default value" + + " for new field " + to.getFields().get(i).name())); } } diff --git a/radar-commons/src/main/java/org/radarbase/producer/rest/BinaryRecordRequest.java b/radar-commons/src/main/java/org/radarbase/producer/rest/BinaryRecordRequest.java index 4fe2a5c1..41c56377 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/rest/BinaryRecordRequest.java +++ b/radar-commons/src/main/java/org/radarbase/producer/rest/BinaryRecordRequest.java @@ -124,9 +124,10 @@ public void prepare(ParsedSchemaMetadata keySchema, ParsedSchemaMetadata valueSc @Override public String content(int maxLength) throws IOException { - Buffer buffer = new Buffer(); - writeToSink(buffer, maxLength / 2 - 2); - return "0x" + Strings.bytesToHex( - buffer.readByteArray(Math.min(buffer.size(), maxLength - 2))); + try (Buffer buffer = new Buffer()) { + writeToSink(buffer, maxLength / 2 - 2); + return "0x" + Strings.bytesToHex( + buffer.readByteArray(Math.min(buffer.size(), maxLength - 2))); + } } } diff --git a/radar-commons/src/main/java/org/radarbase/producer/rest/GzipRequestInterceptor.java b/radar-commons/src/main/java/org/radarbase/producer/rest/GzipRequestInterceptor.java index a12c9011..6ce5f98b 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/rest/GzipRequestInterceptor.java +++ b/radar-commons/src/main/java/org/radarbase/producer/rest/GzipRequestInterceptor.java @@ -56,9 +56,9 @@ public long contentLength() { @Override public void writeTo(BufferedSink sink) throws IOException { - BufferedSink gzipSink = Okio.buffer(new GzipSink(sink)); - body.writeTo(gzipSink); - gzipSink.close(); + try (BufferedSink gzipSink = Okio.buffer(new GzipSink(sink))) { + body.writeTo(gzipSink); + } } }; } @@ -72,4 +72,4 @@ public int hashCode() { public boolean equals(Object obj) { return this == obj || obj != null && getClass() == obj.getClass(); } -} \ No newline at end of file +} diff --git a/radar-commons/src/main/java/org/radarbase/producer/rest/JsonRecordRequest.java b/radar-commons/src/main/java/org/radarbase/producer/rest/JsonRecordRequest.java index 1d47ad99..2ae287ce 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/rest/JsonRecordRequest.java +++ b/radar-commons/src/main/java/org/radarbase/producer/rest/JsonRecordRequest.java @@ -118,8 +118,9 @@ public void prepare(ParsedSchemaMetadata keySchema, ParsedSchemaMetadata valueSc @Override public String content(int maxLength) throws IOException { - Buffer buffer = new Buffer(); - writeToSink(buffer, maxLength); - return buffer.readString(Math.min(buffer.size(), maxLength), StandardCharsets.UTF_8); + try (Buffer buffer = new Buffer()) { + writeToSink(buffer, maxLength); + return buffer.readString(Math.min(buffer.size(), maxLength), StandardCharsets.UTF_8); + } } } diff --git a/radar-commons/src/main/java/org/radarbase/producer/rest/RestClient.java b/radar-commons/src/main/java/org/radarbase/producer/rest/RestClient.java index 9bc29727..df1cf8f6 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/rest/RestClient.java +++ b/radar-commons/src/main/java/org/radarbase/producer/rest/RestClient.java @@ -187,11 +187,12 @@ public String toString() { * @throws IOException if the body could not be read as a String. */ public static String responseBody(Response response) throws IOException { - ResponseBody body = response.body(); - if (body == null) { - return null; + try (ResponseBody body = response.body()) { + if (body == null) { + return null; + } + return body.string(); } - return body.string(); } /** Create a new builder with the settings of the current client. */ diff --git a/radar-commons/src/main/java/org/radarbase/producer/rest/SchemaRetriever.java b/radar-commons/src/main/java/org/radarbase/producer/rest/SchemaRetriever.java index 8b609397..074a1ac0 100644 --- a/radar-commons/src/main/java/org/radarbase/producer/rest/SchemaRetriever.java +++ b/radar-commons/src/main/java/org/radarbase/producer/rest/SchemaRetriever.java @@ -37,6 +37,7 @@ * Retriever of an Avro Schema. Internally, only {@link JSONObject} is used to manage JSON data, * to keep the class as lean as possible. */ +@SuppressWarnings("PMD.GodClass") public class SchemaRetriever { private static final Logger logger = LoggerFactory.getLogger(SchemaRetriever.class); private static final long MAX_VALIDITY = 86400L; @@ -195,15 +196,7 @@ protected ParsedSchemaMetadata getCachedVersion(String subject, int id, Integer version = reportedVersion; if (version == null || version <= 0) { ConcurrentMap versions = subjectVersionCache.get(subject); - if (versions != null) { - for (Map.Entry entry : versions.entrySet()) { - if (!entry.getValue().isExpired() && entry.getKey() != 0 - && entry.getValue().value == id) { - version = entry.getKey(); - break; - } - } - } + version = findCachedVersion(id, versions); if (version == null || version <= 0) { return null; } @@ -211,6 +204,20 @@ protected ParsedSchemaMetadata getCachedVersion(String subject, int id, return new ParsedSchemaMetadata(id, version, schema); } + private Integer findCachedVersion(int id, ConcurrentMap cache) { + if (cache == null) { + return null; + } + for (Map.Entry entry : cache.entrySet()) { + if (!entry.getValue().isExpired() + && entry.getKey() != 0 + && entry.getValue().value == id) { + return entry.getKey(); + } + } + return null; + } + protected void cache(ParsedSchemaMetadata metadata, String subject, boolean latest) { TimedInt id = new TimedInt(metadata.getId(), cacheValidity); schemaCache.put(metadata.getSchema(), id); diff --git a/radar-commons/src/main/java/org/radarbase/topic/AvroTopic.java b/radar-commons/src/main/java/org/radarbase/topic/AvroTopic.java index 2b63875e..ce8cda49 100644 --- a/radar-commons/src/main/java/org/radarbase/topic/AvroTopic.java +++ b/radar-commons/src/main/java/org/radarbase/topic/AvroTopic.java @@ -17,6 +17,7 @@ package org.radarbase.topic; import java.lang.reflect.InvocationTargetException; +import java.util.Arrays; import java.util.List; import java.util.Objects; import org.apache.avro.Schema; @@ -96,7 +97,7 @@ public V newValueInstance() throws ClassCastException { } public Schema.Type[] getValueFieldTypes() { - return valueFieldTypes; + return Arrays.copyOf(valueFieldTypes, valueFieldTypes.length); } /** diff --git a/radar-commons/src/main/java/org/radarbase/util/Base64.java b/radar-commons/src/main/java/org/radarbase/util/Base64.java index 62d630b1..3f23e4a3 100644 --- a/radar-commons/src/main/java/org/radarbase/util/Base64.java +++ b/radar-commons/src/main/java/org/radarbase/util/Base64.java @@ -52,7 +52,8 @@ @SuppressWarnings("PMD.ClassNamingConventions") public class Base64 { - private Base64() {} + private Base64() { + } /** * Returns a {@link Encoder} that encodes using the diff --git a/settings.gradle b/settings.gradle index d6543b68..2c61dca1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,18 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -pluginManagement { - repositories { - gradlePluginPortal() - jcenter() - maven { - name "JCenter Gradle Plugins" - url "https://dl.bintray.com/gradle/gradle-plugins" - } - } -} include ':radar-commons' include ':radar-commons-testing' include ':radar-commons-server' -include ':radar-commons-unsafe' From c240a2cf7deb9ce2895da7ff2bb0f0ba27f31b12 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 15:53:14 +0100 Subject: [PATCH 05/10] Misc simplifications --- .../radarbase/config/YamlConfigLoader.java | 4 +-- .../org/radarbase/config/ServerConfig.java | 31 ++----------------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/radar-commons-server/src/main/java/org/radarbase/config/YamlConfigLoader.java b/radar-commons-server/src/main/java/org/radarbase/config/YamlConfigLoader.java index 1b8ae639..2ffe713c 100644 --- a/radar-commons-server/src/main/java/org/radarbase/config/YamlConfigLoader.java +++ b/radar-commons-server/src/main/java/org/radarbase/config/YamlConfigLoader.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import java.io.IOException; @@ -38,7 +38,7 @@ public class YamlConfigLoader { private static final ObjectMapper YAML_MAPPER = new ObjectMapper(YAML_FACTORY); static { - YAML_MAPPER.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + YAML_MAPPER.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE); // only serialize fields, not getters, etc. YAML_MAPPER.setVisibility(YAML_MAPPER.getSerializationConfig().getDefaultVisibilityChecker() .withFieldVisibility(JsonAutoDetect.Visibility.ANY) diff --git a/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java b/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java index 3212c626..90a5d401 100644 --- a/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java +++ b/radar-commons/src/main/java/org/radarbase/config/ServerConfig.java @@ -58,21 +58,7 @@ public ServerConfig(String urlString) throws MalformedURLException { /** Get the path of the server as a string. This does not include proxyHost information. */ public String getUrlString() { - return addUrlString(new StringBuilder(40)).toString(); - } - - private StringBuilder addUrlString(StringBuilder builder) { - if (protocol != null) { - builder.append(protocol).append("://"); - } - builder.append(host); - if (port != -1) { - builder.append(':').append(port); - } - if (path != null) { - builder.append(path); - } - return builder; + return getUrl().toString(); } /** Get the paths of a list of servers, concatenated with commas. */ @@ -85,7 +71,7 @@ public static String getPaths(List configList) { } else { builder.append(','); } - server.addUrlString(builder); + builder.append(server.getUrl()); } return builder.toString(); } @@ -110,18 +96,7 @@ public URL getUrl() { * @throws IllegalStateException if the URL is invalid */ public HttpUrl getHttpUrl() { - HttpUrl.Builder urlBuilder = new HttpUrl.Builder() - .scheme(protocol) - .host(host); - - if (port != -1) { - urlBuilder.port(port); - } - if (path != null) { - urlBuilder.encodedPath(path); - } - - return urlBuilder.build(); + return HttpUrl.get(getUrl()); } /** From 75462a6652bf401b908f0296097eba4a3761e940 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 16:15:12 +0100 Subject: [PATCH 06/10] Add Github Actions --- .github/workflows/main.yml | 43 ++++++++++++++++++++ .github/workflows/publish_snapshots.yml | 49 +++++++++++++++++++++++ .github/workflows/release.yml | 53 +++++++++++++++++++++++++ .github/workflows/scheduled_snyk.yaml | 25 ++++++++++++ .github/workflows/snyk.yaml | 16 ++++++++ 5 files changed, 186 insertions(+) create mode 100644 .github/workflows/main.yml create mode 100644 .github/workflows/publish_snapshots.yml create mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/scheduled_snyk.yaml create mode 100644 .github/workflows/snyk.yaml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..1bb5b077 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,43 @@ +# Continuous integration, including test and integration test +name: CI + +# Run in master and dev branches and in all pull requests to those branches +on: + push: + branches: [ master, dev ] + pull_request: {} + +jobs: + # Build and test the code + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Cache + uses: actions/cache@v2 + with: + # Cache gradle directories + path: | + ~/.gradle/caches + ~/.gradle/wrapper + # Key for restoring and saving the cache + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', 'gradle.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + # Compile the code + - name: Compile code + run: ./gradlew assemble + + # Gradle check + - name: Check + run: ./gradlew check diff --git a/.github/workflows/publish_snapshots.yml b/.github/workflows/publish_snapshots.yml new file mode 100644 index 00000000..903426e0 --- /dev/null +++ b/.github/workflows/publish_snapshots.yml @@ -0,0 +1,49 @@ +# Continuous integration, including test and integration test +name: Publish snapshots + +# Run in master and dev branches and in all pull requests to those branches +on: + push: + branches: [ dev ] + +jobs: + # Build and test the code + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + + - name: Has SNAPSHOT version + id: is-snapshot + run: grep 'version = ".*-SNAPSHOT"' build.gradle.kts + + - uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Cache + uses: actions/cache@v2 + with: + # Cache gradle directories + path: | + ~/.gradle/caches + ~/.gradle/wrapper + # Key for restoring and saving the cache + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', 'gradle.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Install gpg secret key + run: | + cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import + gpg --list-secret-keys --keyid-format LONG + + - name: Publish + env: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + run: ./gradlew -Psigning.gnupg.keyName=CBEF2CF0 -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..4968812f --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,53 @@ +# Create release files +name: Release + +on: + release: + types: [published] + +jobs: + upload: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: 11 + + - name: Cache + uses: actions/cache@v2 + with: + # Cache gradle directories + path: | + ~/.gradle/caches + ~/.gradle/wrapper + # Key for restoring and saving the cache + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', 'gradle.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + # Compile code + - name: Compile code + run: ./gradlew assemble + + # Upload it to GitHub + - name: Upload to GitHub + uses: AButler/upload-release-assets@v2.0 + with: + files: 'radar-jersey/build/libs/*;radar-jersey-hibernate/build/libs/*' + repo-token: ${{ secrets.GITHUB_TOKEN }} + + - name: Install gpg secret key + run: | + cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import + gpg --list-secret-keys --keyid-format LONG + + - name: Publish + env: + OSSRH_USER: ${{ secrets.OSSRH_USER }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + run: ./gradlew -Psigning.gnupg.keyName=CBEF2CF0 -Psigning.gnupg.executable=gpg -Psigning.gnupg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} publish closeAndReleaseSonatypeStagingRepository diff --git a/.github/workflows/scheduled_snyk.yaml b/.github/workflows/scheduled_snyk.yaml new file mode 100644 index 00000000..46074dfb --- /dev/null +++ b/.github/workflows/scheduled_snyk.yaml @@ -0,0 +1,25 @@ +name: Snyk scheduled test +on: + schedule: + - cron: '0 2 * * 1' +jobs: + security: + runs-on: ubuntu-latest + env: + REPORT_FILE: test.json + steps: + - uses: actions/checkout@master + - name: Run Snyk to check for vulnerabilities + uses: snyk/actions/gradle-jdk11@master + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + with: + command: test + args: --json-file-output=${{ env.REPORT_FILE }} + - name: Report new vulnerabilities + uses: thehyve/report-vulnerability@master + with: + report-file: ${{ env.REPORT_FILE }} + env: + TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: ${{ failure() }} diff --git a/.github/workflows/snyk.yaml b/.github/workflows/snyk.yaml new file mode 100644 index 00000000..890b84f6 --- /dev/null +++ b/.github/workflows/snyk.yaml @@ -0,0 +1,16 @@ +name: Snyk test +on: + pull_request: + branches: + - master +jobs: + security: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@master + - name: Run Snyk to check for vulnerabilities + uses: snyk/actions/gradle-jdk11@master + env: + SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + with: + args: --severity-threshold=high From d6dd73d2032dfbde0e2266eed7fdae8409f57e1e Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 16:22:29 +0100 Subject: [PATCH 07/10] Update GA for correct gradle paths --- .github/workflows/main.yml | 2 +- .github/workflows/publish_snapshots.yml | 4 ++-- .github/workflows/release.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1bb5b077..5afb0577 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: ~/.gradle/caches ~/.gradle/wrapper # Key for restoring and saving the cache - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', 'gradle.properties') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', 'gradle.properties') }} restore-keys: | ${{ runner.os }}-gradle- diff --git a/.github/workflows/publish_snapshots.yml b/.github/workflows/publish_snapshots.yml index 903426e0..a89a77bf 100644 --- a/.github/workflows/publish_snapshots.yml +++ b/.github/workflows/publish_snapshots.yml @@ -19,7 +19,7 @@ jobs: - name: Has SNAPSHOT version id: is-snapshot - run: grep 'version = ".*-SNAPSHOT"' build.gradle.kts + run: grep "version = '.*-SNAPSHOT'" build.gradle - uses: actions/setup-java@v1 with: @@ -33,7 +33,7 @@ jobs: ~/.gradle/caches ~/.gradle/wrapper # Key for restoring and saving the cache - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', 'gradle.properties') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', 'gradle.properties') }} restore-keys: | ${{ runner.os }}-gradle- diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4968812f..9feed302 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: ~/.gradle/caches ~/.gradle/wrapper # Key for restoring and saving the cache - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts', 'gradle.properties') }} + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', 'gradle.properties') }} restore-keys: | ${{ runner.os }}-gradle- From cce7f6d5627c2b535c4f5abc0a9a16d5e7a28c47 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 16:28:19 +0100 Subject: [PATCH 08/10] Bump dependencies --- build.gradle | 5 ++--- gradle.properties | 4 ++-- radar-commons-testing/build.gradle | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 672dc279..8b560614 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,8 @@ */ plugins { id 'com.github.davidmc24.gradle.plugin.avro' version '1.3.0' - id("io.github.gradle-nexus.publish-plugin") version "1.0.0" - id("com.github.ben-manes.versions") version "0.38.0" + id("io.github.gradle-nexus.publish-plugin") version "1.1.0" + id("com.github.ben-manes.versions") version "0.39.0" } allprojects { @@ -29,7 +29,6 @@ subprojects { apply plugin: 'java' apply plugin: 'java-library' apply plugin: 'idea' - apply plugin: 'com.github.ben-manes.versions' targetCompatibility = '11' sourceCompatibility = '11' diff --git a/gradle.properties b/gradle.properties index 3ad3c41c..d415f4dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ jacksonVersion=2.12.6 jacksonYamlVersion=2.12.6 okhttpVersion=4.9.3 junitVersion=4.13.2 -mockitoVersion=3.9.0 +mockitoVersion=4.2.0 hamcrestVersion=1.3 radarSchemasVersion=0.7.5 -orgJsonVersion=20210307 +orgJsonVersion=20211205 diff --git a/radar-commons-testing/build.gradle b/radar-commons-testing/build.gradle index a795c1df..d00ca98c 100644 --- a/radar-commons-testing/build.gradle +++ b/radar-commons-testing/build.gradle @@ -39,7 +39,7 @@ dependencies { api group: 'org.apache.avro', name: 'avro', version: avroVersion api group: 'org.radarbase', name: 'radar-schemas-commons', version: radarSchemasVersion - implementation group: 'com.opencsv', name: 'opencsv', version: '5.4' + implementation group: 'com.opencsv', name: 'opencsv', version: '5.5.2' implementation group: 'com.fasterxml.jackson.core' , name: 'jackson-databind' , version: jacksonVersion implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaVersion implementation (group: 'io.confluent', name: 'kafka-avro-serializer', version: confluentVersion) { From 8168a4ba6808dcb656274d4e061feb0b136005ac Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 16:30:26 +0100 Subject: [PATCH 09/10] Bump version --- README.md | 20 ++++---------------- build.gradle | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d609a185..8c41caf7 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation group: 'org.radarbase', name: 'radar-commons', version: '0.13.2' + implementation group: 'org.radarbase', name: 'radar-commons', version: '0.14.0' } ``` @@ -69,7 +69,7 @@ repositories { } dependencies { - implementation group: 'org.radarbase', name: 'radar-commons-server', version: '0.13.2' + implementation group: 'org.radarbase', name: 'radar-commons-server', version: '0.14.0' } ``` @@ -82,19 +82,7 @@ repositories { } dependencies { - testImplementation group: 'org.radarbase', name: 'radar-commons-testing', version: '0.13.2' -} -``` - -Finally, if the schema registry is losing old schemas and your code is not recovering, include `radar-commons-unsafe`. Ensure that it comes in the classpath before any Confluent code. This will override the Confluent Avro deserializer to recover from failure when a message with unknown schema ID is passed. -```gradle -repositories { - mavenCentral() - maven { url 'https://packages.confluent.io/maven/' } -} - -dependencies { - runtimeOnly group: 'org.radarbase', name: 'radar-commons-unsafe', version: '0.13.2' + testImplementation group: 'org.radarbase', name: 'radar-commons-testing', version: '0.14.0' } ``` @@ -119,7 +107,7 @@ configurations.all { } dependencies { - compile group: 'org.radarbase', name: 'radar-commons', version: '0.13.3-SNAPSHOT' + compile group: 'org.radarbase', name: 'radar-commons', version: '0.14.1-SNAPSHOT' } ``` diff --git a/build.gradle b/build.gradle index 8b560614..d17019e8 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { } allprojects { - version = '0.13.3-SNAPSHOT' + version = '0.14.0' group = 'org.radarbase' } From 3823ebca023cf18a3993d254282201833f786722 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Thu, 23 Dec 2021 16:34:24 +0100 Subject: [PATCH 10/10] Relax OscilloscopeTest --- .../src/test/java/org/radarbase/util/OscilloscopeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radar-commons-testing/src/test/java/org/radarbase/util/OscilloscopeTest.java b/radar-commons-testing/src/test/java/org/radarbase/util/OscilloscopeTest.java index 75a2e4db..3941f7de 100644 --- a/radar-commons-testing/src/test/java/org/radarbase/util/OscilloscopeTest.java +++ b/radar-commons-testing/src/test/java/org/radarbase/util/OscilloscopeTest.java @@ -38,7 +38,7 @@ public void beat() throws Exception { // time of one beat is about 1/128 seconds = 7.8125 milliseconds long beatDiff = System.currentTimeMillis() - time; assertThat(beatDiff, greaterThanOrEqualTo(7L)); - assertThat(beatDiff, lessThanOrEqualTo(13L)); + assertThat(beatDiff, lessThanOrEqualTo(14L)); } } while (!oscilloscope.willRestart());