From 5f6cf6daf6674575faba8c05c1998378f3a3b9d6 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Oct 2018 14:01:14 +0100 Subject: [PATCH 1/3] Bump dev version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b283a12f..b6188a42 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ subprojects { // Configuration // //---------------------------------------------------------------------------// - version = '0.11.0' + version = '0.11.1-SNAPSHOT' group = 'org.radarcns' ext.githubRepoName = 'RADAR-CNS/RADAR-Commons' From 288acf239055f8177eaa91a3624e435b569beb73 Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Mon, 29 Oct 2018 14:15:10 +0100 Subject: [PATCH 2/3] With automatic schema manipulation, do not upload own schema --- .../org/radarcns/producer/rest/SchemaRetriever.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/radar-commons/src/main/java/org/radarcns/producer/rest/SchemaRetriever.java b/radar-commons/src/main/java/org/radarcns/producer/rest/SchemaRetriever.java index 8fcaf32e..1a4b421b 100644 --- a/radar-commons/src/main/java/org/radarcns/producer/rest/SchemaRetriever.java +++ b/radar-commons/src/main/java/org/radarcns/producer/rest/SchemaRetriever.java @@ -166,19 +166,14 @@ public void addSchemaMetadata(String topic, boolean ofValue, ParsedSchemaMetadat */ public ParsedSchemaMetadata getOrSetSchemaMetadata(String topic, boolean ofValue, Schema schema, int version) throws IOException { - ParsedSchemaMetadata metadata; try { - metadata = getSchemaMetadata(topic, ofValue, version); - if (metadata.getSchema().equals(schema)) { - return metadata; - } + return getSchemaMetadata(topic, ofValue, version); } catch (IOException ex) { logger.warn("Schema for {} value was not yet added to the schema registry.", topic); + ParsedSchemaMetadata metadata = new ParsedSchemaMetadata(null, null, schema); + addSchemaMetadata(topic, ofValue, metadata); + return metadata; } - - metadata = new ParsedSchemaMetadata(null, null, schema); - addSchemaMetadata(topic, ofValue, metadata); - return metadata; } private class SchemaRequestBody extends RequestBody { From 089c28e616dca1552fcff05803204e6e7c520a5b Mon Sep 17 00:00:00 2001 From: Joris Borgdorff Date: Tue, 30 Oct 2018 17:12:43 +0100 Subject: [PATCH 3/3] Bump version --- README.md | 10 +++++----- build.gradle | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index df76d7d8..0dc4d3da 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ repositories { } dependencies { - implementation group: 'org.radarcns', name: 'radar-commons', version: '0.11.0' + implementation group: 'org.radarcns', name: 'radar-commons', version: '0.11.1' } ``` @@ -26,7 +26,7 @@ repositories { } dependencies { - implementation group: 'org.radarcns', name: 'radar-commons-server', version: '0.11.0' + implementation group: 'org.radarcns', name: 'radar-commons-server', version: '0.11.1' } ``` @@ -40,7 +40,7 @@ repositories { } dependencies { - testImplementation group: 'org.radarcns', name: 'radar-commons-testing', version: '0.11.0' + testImplementation group: 'org.radarcns', name: 'radar-commons-testing', version: '0.11.1' } ``` @@ -53,7 +53,7 @@ repositories { } dependencies { - runtimeOnly group: 'org.radarcns', name: 'radar-commons-unsafe', version: '0.11.0' + runtimeOnly group: 'org.radarcns', name: 'radar-commons-unsafe', version: '0.11.1' } ``` @@ -78,7 +78,7 @@ configurations.all { } dependencies { - compile group: 'org.radarcns', name: 'radar-commons', version: '0.11.1-SNAPSHOT', changing: true + compile group: 'org.radarcns', name: 'radar-commons', version: '0.11.2-SNAPSHOT', changing: true } ``` diff --git a/build.gradle b/build.gradle index b6188a42..65d59163 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ subprojects { // Configuration // //---------------------------------------------------------------------------// - version = '0.11.1-SNAPSHOT' + version = '0.11.1' group = 'org.radarcns' ext.githubRepoName = 'RADAR-CNS/RADAR-Commons'