From 8e118785bb4f204029594a551581a68488279a30 Mon Sep 17 00:00:00 2001 From: Pim van Nierop Date: Tue, 19 Mar 2024 17:59:02 +0100 Subject: [PATCH 01/10] Fix basic authentication during schema registry init --- .../radarbase/schema/registration/SchemaRegistry.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt b/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt index 4d235091..4d88a3fc 100644 --- a/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt +++ b/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt @@ -18,8 +18,7 @@ package org.radarbase.schema.registration import io.ktor.client.plugins.auth.Auth import io.ktor.client.plugins.auth.providers.BasicAuthCredentials import io.ktor.client.plugins.auth.providers.basic -import io.ktor.client.request.setBody -import io.ktor.client.request.url +import io.ktor.client.request.* import io.ktor.http.ContentType import io.ktor.http.HttpMethod import io.ktor.http.contentType @@ -56,8 +55,8 @@ import kotlin.time.toKotlinDuration */ class SchemaRegistry( private val baseUrl: String, - apiKey: String? = null, - apiSecret: String? = null, + private val apiKey: String? = null, + private val apiSecret: String? = null, private val topicConfiguration: Map = emptyMap(), ) { private val schemaClient: SchemaRetriever = schemaRetriever(baseUrl) { @@ -66,6 +65,7 @@ class SchemaRegistry( if (apiKey != null && apiSecret != null) { install(Auth) { basic { + sendWithoutRequest { true } credentials { BasicAuthCredentials(username = apiKey, password = apiSecret) } @@ -93,6 +93,9 @@ class SchemaRegistry( try { httpClient.request> { url("subjects") + if (apiKey != null && apiSecret != null) { + basicAuth(apiKey, apiSecret) + } } } catch (ex: RestException) { logger.error( From 5ec4a9b69b8444b9f8a6d2edc32de7b36bdde534 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Wed, 20 Mar 2024 14:07:37 +0100 Subject: [PATCH 02/10] stylefixes --- .../java/org/radarbase/schema/registration/SchemaRegistry.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt b/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt index 4d88a3fc..846490fb 100644 --- a/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt +++ b/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt @@ -18,7 +18,9 @@ package org.radarbase.schema.registration import io.ktor.client.plugins.auth.Auth import io.ktor.client.plugins.auth.providers.BasicAuthCredentials import io.ktor.client.plugins.auth.providers.basic -import io.ktor.client.request.* +import io.ktor.client.request.basicAuth +import io.ktor.client.request.url +import io.ktor.client.request.setBody import io.ktor.http.ContentType import io.ktor.http.HttpMethod import io.ktor.http.contentType @@ -178,6 +180,7 @@ class SchemaRegistry( val record: SpecificRecord = AvroTopic.parseSpecificRecord(topicValueSchema) record.javaClass to record.schema } + defaultTopic != null -> defaultTopic.valueClass to defaultTopic.valueSchema else -> { logger.warn( From e2a017441e5e27a84ef1eca443275dc2055e0623 Mon Sep 17 00:00:00 2001 From: Bastiaan Date: Wed, 20 Mar 2024 14:26:57 +0100 Subject: [PATCH 03/10] reorganize imports --- .../java/org/radarbase/schema/registration/SchemaRegistry.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt b/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt index 846490fb..3728f5e5 100644 --- a/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt +++ b/java-sdk/radar-schemas-registration/src/main/java/org/radarbase/schema/registration/SchemaRegistry.kt @@ -19,8 +19,8 @@ import io.ktor.client.plugins.auth.Auth import io.ktor.client.plugins.auth.providers.BasicAuthCredentials import io.ktor.client.plugins.auth.providers.basic import io.ktor.client.request.basicAuth -import io.ktor.client.request.url import io.ktor.client.request.setBody +import io.ktor.client.request.url import io.ktor.http.ContentType import io.ktor.http.HttpMethod import io.ktor.http.contentType From af93ce65730c434f412418ce0dd1a20f5b3633c9 Mon Sep 17 00:00:00 2001 From: Q Liu <1343451020@qq.com> Date: Thu, 26 Oct 2023 16:35:47 +0200 Subject: [PATCH 04/10] Mobovi TicWatch schemas --- commons/passive/ticwatch/acceleration.avsc | 12 ++++++ commons/passive/ticwatch/battery.avsc | 10 +++++ commons/passive/ticwatch/gyroscope.avsc | 12 ++++++ commons/passive/ticwatch/ppg.avsc | 11 ++++++ specifications/passive/ticwatch-1.0.0.yml | 45 ++++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 commons/passive/ticwatch/acceleration.avsc create mode 100644 commons/passive/ticwatch/battery.avsc create mode 100644 commons/passive/ticwatch/gyroscope.avsc create mode 100644 commons/passive/ticwatch/ppg.avsc create mode 100644 specifications/passive/ticwatch-1.0.0.yml diff --git a/commons/passive/ticwatch/acceleration.avsc b/commons/passive/ticwatch/acceleration.avsc new file mode 100644 index 00000000..5a538755 --- /dev/null +++ b/commons/passive/ticwatch/acceleration.avsc @@ -0,0 +1,12 @@ +{ + "namespace": "org.radarcns.passive.ticWatch", + "type": "record", + "name": "TicWatchAcceleration", + "doc": "Data from 3-axis accelerometer sensor of a Mobovi TicWatch device.", + "fields": [ + { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "x", "type": "float", "doc": "Acceleration in the x-axis (g)." }, + { "name": "y", "type": "float", "doc": "Acceleration in the y-axis (g)." }, + { "name": "z", "type": "float", "doc": "Acceleration in the z-axis (g)." } + ] +} \ No newline at end of file diff --git a/commons/passive/ticwatch/battery.avsc b/commons/passive/ticwatch/battery.avsc new file mode 100644 index 00000000..ea606eb0 --- /dev/null +++ b/commons/passive/ticwatch/battery.avsc @@ -0,0 +1,10 @@ +{ + "namespace": "org.radarcns.passive.ticWatch", + "type": "record", + "name": "TicWatchBatteryLevel", + "doc": "Battery level of a TicWatch device.", + "fields": [ + { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "batteryLevel", "type": "float", "doc": "Battery level from 0 to 1. Note that the battery level is a rough estimate." } + ] +} \ No newline at end of file diff --git a/commons/passive/ticwatch/gyroscope.avsc b/commons/passive/ticwatch/gyroscope.avsc new file mode 100644 index 00000000..29724723 --- /dev/null +++ b/commons/passive/ticwatch/gyroscope.avsc @@ -0,0 +1,12 @@ +{ + "namespace": "org.radarcns.passive.ticWatch", + "type": "record", + "name": "TicWatchGyroscope ", + "doc": "Data from 3-axis gyroscope sensor of a Mobovi TicWatch device.", + "fields": [ + { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "x", "type": "float", "doc": "Angular velocity in the x-axis (rad/s)." }, + { "name": "y", "type": "float", "doc": "Angular velocity in the y-axis (rad/s)." }, + { "name": "z", "type": "float", "doc": "Angular velocity in the z-axis (rad/s)." } + ] +} \ No newline at end of file diff --git a/commons/passive/ticwatch/ppg.avsc b/commons/passive/ticwatch/ppg.avsc new file mode 100644 index 00000000..84fc49ac --- /dev/null +++ b/commons/passive/ticwatch/ppg.avsc @@ -0,0 +1,11 @@ +{ + "namespace": "org.radarcns.passive.ticWatch", + "type": "record", + "name": "TicWatchPPG", + "doc": "PPG collected using a Mobovi TicWatch.", + "fields": [ + { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "redled", "type": "float", "doc": "red LED" }, + { "name": "iredled", "type": "float", "doc": "infrared LED" } + ] +} \ No newline at end of file diff --git a/specifications/passive/ticwatch-1.0.0.yml b/specifications/passive/ticwatch-1.0.0.yml new file mode 100644 index 00000000..2b3a2ce5 --- /dev/null +++ b/specifications/passive/ticwatch-1.0.0.yml @@ -0,0 +1,45 @@ +#====================================== TicWatch device =====================================# +vendor: MOBOVI +model: TicWatch +version: 1.0.0 +data: + - type: ACCELEROMETER + sample_rate: + dynamic: true + unit: g + processing_state: RAW + topic: android_esl_ticwatch_acceleration + value_schema: .passive.esl.TicWatchAcceleration + - type: GYROSCOPE + sample_rate: + dynamic: true + unit: rad/s + processing_state: RAW + topic: android_esl_ticwatch_gyroscope + value_schema: .passive.esl.TicWatchGyroscope + - type: BATTERY + sample_rate: + dynamic: true + unit: PERCENTAGE + processing_state: RAW + topic: android_esl_ticwatch_battery_level + value_schema: .passive.esl.TicWatchBatteryLevel + - type: PPG + sample_rate: + dynamic: true + processing_state: RAW + topic: android_esl_ticwatch_ppg + value_schema: .passive.esl.TicWatchPPG + - type: EXTERNAL_TIME + doc: Information sent by the Mobovi Ticwatch about time synchronisation with a NTP server. + sample_rate: + dynamic: true + unit: SECOND + topic: application_external_time + value_schema: .monitor.application.ApplicationExternalTime + - type: DEVICE_INFO + doc: Device information where the app is installed + sample_rate: + dynamic: true + topic: application_device_info + value_schema: .monitor.application.ApplicationDeviceInfo From 89cf757d89ad0d69a0683c44fecb6b537033dcb6 Mon Sep 17 00:00:00 2001 From: Jonathan Dan Date: Tue, 5 Mar 2024 13:36:05 +0100 Subject: [PATCH 05/10] Remove extra white space --- commons/passive/ticwatch/gyroscope.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/passive/ticwatch/gyroscope.avsc b/commons/passive/ticwatch/gyroscope.avsc index 29724723..a7711cc2 100644 --- a/commons/passive/ticwatch/gyroscope.avsc +++ b/commons/passive/ticwatch/gyroscope.avsc @@ -1,7 +1,7 @@ { "namespace": "org.radarcns.passive.ticWatch", "type": "record", - "name": "TicWatchGyroscope ", + "name": "TicWatchGyroscope", "doc": "Data from 3-axis gyroscope sensor of a Mobovi TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, From 128191796beda83d735d2ca768818db5a64cd577 Mon Sep 17 00:00:00 2001 From: Jonathan Dan Date: Thu, 7 Mar 2024 11:57:43 +0100 Subject: [PATCH 06/10] Fix file name errors --- commons/passive/ticwatch/ppg.avsc | 11 ----------- ...acceleration.avsc => ticwatch_acceleration.avsc} | 4 ++-- .../{battery.avsc => ticwatch_battery_level.avsc} | 4 ++-- .../{gyroscope.avsc => ticwatch_gyroscope.avsc} | 4 ++-- commons/passive/ticwatch/ticwatch_ppg.avsc | 11 +++++++++++ specifications/passive/ticwatch-1.0.0.yml | 13 +++++++------ 6 files changed, 24 insertions(+), 23 deletions(-) delete mode 100644 commons/passive/ticwatch/ppg.avsc rename commons/passive/ticwatch/{acceleration.avsc => ticwatch_acceleration.avsc} (84%) rename commons/passive/ticwatch/{battery.avsc => ticwatch_battery_level.avsc} (78%) rename commons/passive/ticwatch/{gyroscope.avsc => ticwatch_gyroscope.avsc} (85%) create mode 100644 commons/passive/ticwatch/ticwatch_ppg.avsc diff --git a/commons/passive/ticwatch/ppg.avsc b/commons/passive/ticwatch/ppg.avsc deleted file mode 100644 index 84fc49ac..00000000 --- a/commons/passive/ticwatch/ppg.avsc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "namespace": "org.radarcns.passive.ticWatch", - "type": "record", - "name": "TicWatchPPG", - "doc": "PPG collected using a Mobovi TicWatch.", - "fields": [ - { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, - { "name": "redled", "type": "float", "doc": "red LED" }, - { "name": "iredled", "type": "float", "doc": "infrared LED" } - ] -} \ No newline at end of file diff --git a/commons/passive/ticwatch/acceleration.avsc b/commons/passive/ticwatch/ticwatch_acceleration.avsc similarity index 84% rename from commons/passive/ticwatch/acceleration.avsc rename to commons/passive/ticwatch/ticwatch_acceleration.avsc index 5a538755..edb18ffc 100644 --- a/commons/passive/ticwatch/acceleration.avsc +++ b/commons/passive/ticwatch/ticwatch_acceleration.avsc @@ -1,7 +1,7 @@ { - "namespace": "org.radarcns.passive.ticWatch", + "namespace": "org.radarcns.passive.ticwatch", "type": "record", - "name": "TicWatchAcceleration", + "name": "TicwatchAcceleration", "doc": "Data from 3-axis accelerometer sensor of a Mobovi TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, diff --git a/commons/passive/ticwatch/battery.avsc b/commons/passive/ticwatch/ticwatch_battery_level.avsc similarity index 78% rename from commons/passive/ticwatch/battery.avsc rename to commons/passive/ticwatch/ticwatch_battery_level.avsc index ea606eb0..e97e7c65 100644 --- a/commons/passive/ticwatch/battery.avsc +++ b/commons/passive/ticwatch/ticwatch_battery_level.avsc @@ -1,7 +1,7 @@ { - "namespace": "org.radarcns.passive.ticWatch", + "namespace": "org.radarcns.passive.ticwatch", "type": "record", - "name": "TicWatchBatteryLevel", + "name": "TicwatchBatteryLevel", "doc": "Battery level of a TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, diff --git a/commons/passive/ticwatch/gyroscope.avsc b/commons/passive/ticwatch/ticwatch_gyroscope.avsc similarity index 85% rename from commons/passive/ticwatch/gyroscope.avsc rename to commons/passive/ticwatch/ticwatch_gyroscope.avsc index a7711cc2..b5b44a0a 100644 --- a/commons/passive/ticwatch/gyroscope.avsc +++ b/commons/passive/ticwatch/ticwatch_gyroscope.avsc @@ -1,7 +1,7 @@ { - "namespace": "org.radarcns.passive.ticWatch", + "namespace": "org.radarcns.passive.ticwatch", "type": "record", - "name": "TicWatchGyroscope", + "name": "TicwatchGyroscope", "doc": "Data from 3-axis gyroscope sensor of a Mobovi TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, diff --git a/commons/passive/ticwatch/ticwatch_ppg.avsc b/commons/passive/ticwatch/ticwatch_ppg.avsc new file mode 100644 index 00000000..85c9352a --- /dev/null +++ b/commons/passive/ticwatch/ticwatch_ppg.avsc @@ -0,0 +1,11 @@ +{ + "namespace": "org.radarcns.passive.ticwatch", + "type": "record", + "name": "TicwatchPPG", + "doc": "PPG collected using a Mobovi TicWatch.", + "fields": [ + { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "redled", "type": "float", "doc": "Red LED." }, + { "name": "iredled", "type": "float", "doc": "Infrared LED." } + ] +} \ No newline at end of file diff --git a/specifications/passive/ticwatch-1.0.0.yml b/specifications/passive/ticwatch-1.0.0.yml index 2b3a2ce5..297f9528 100644 --- a/specifications/passive/ticwatch-1.0.0.yml +++ b/specifications/passive/ticwatch-1.0.0.yml @@ -1,7 +1,8 @@ #====================================== TicWatch device =====================================# -vendor: MOBOVI +vendor: Mobobi model: TicWatch version: 1.0.0 +app_provider: .ticwatch.TicwatchSeviceProvier data: - type: ACCELEROMETER sample_rate: @@ -9,27 +10,27 @@ data: unit: g processing_state: RAW topic: android_esl_ticwatch_acceleration - value_schema: .passive.esl.TicWatchAcceleration + value_schema: .passive.ticwatch.TicwatchAcceleration - type: GYROSCOPE sample_rate: dynamic: true unit: rad/s processing_state: RAW topic: android_esl_ticwatch_gyroscope - value_schema: .passive.esl.TicWatchGyroscope + value_schema: .passive.ticwatch.TicwatchGyroscope - type: BATTERY sample_rate: dynamic: true unit: PERCENTAGE processing_state: RAW topic: android_esl_ticwatch_battery_level - value_schema: .passive.esl.TicWatchBatteryLevel + value_schema: .passive.ticwatch.TicwatchBatteryLevel - type: PPG sample_rate: dynamic: true processing_state: RAW topic: android_esl_ticwatch_ppg - value_schema: .passive.esl.TicWatchPPG + value_schema: .passive.ticwatch.TicwatchPpg - type: EXTERNAL_TIME doc: Information sent by the Mobovi Ticwatch about time synchronisation with a NTP server. sample_rate: @@ -38,7 +39,7 @@ data: topic: application_external_time value_schema: .monitor.application.ApplicationExternalTime - type: DEVICE_INFO - doc: Device information where the app is installed + doc: Device information where the app is installed. sample_rate: dynamic: true topic: application_device_info From 0e33040c7a54d65b3dc94e2feed8f2bcb1d99090 Mon Sep 17 00:00:00 2001 From: Jonathan Dan Date: Mon, 29 Apr 2024 11:12:47 +0200 Subject: [PATCH 07/10] Correct units --- specifications/passive/ticwatch-1.0.0.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specifications/passive/ticwatch-1.0.0.yml b/specifications/passive/ticwatch-1.0.0.yml index 297f9528..036bc1af 100644 --- a/specifications/passive/ticwatch-1.0.0.yml +++ b/specifications/passive/ticwatch-1.0.0.yml @@ -7,14 +7,14 @@ data: - type: ACCELEROMETER sample_rate: dynamic: true - unit: g + unit: G processing_state: RAW topic: android_esl_ticwatch_acceleration value_schema: .passive.ticwatch.TicwatchAcceleration - type: GYROSCOPE sample_rate: dynamic: true - unit: rad/s + unit: RADAIAN_PER_SEC processing_state: RAW topic: android_esl_ticwatch_gyroscope value_schema: .passive.ticwatch.TicwatchGyroscope @@ -28,6 +28,7 @@ data: - type: PPG sample_rate: dynamic: true + unit: UNKNOWN processing_state: RAW topic: android_esl_ticwatch_ppg value_schema: .passive.ticwatch.TicwatchPpg From 5aa2a1a49c80ca630eec3cdb1274facbe15bdb7d Mon Sep 17 00:00:00 2001 From: Jonathan Dan Date: Tue, 30 Apr 2024 16:21:10 +0200 Subject: [PATCH 08/10] Add timeReceived --- commons/passive/ticwatch/ticwatch_acceleration.avsc | 1 + commons/passive/ticwatch/ticwatch_battery_level.avsc | 1 + commons/passive/ticwatch/ticwatch_gyroscope.avsc | 1 + commons/passive/ticwatch/ticwatch_ppg.avsc | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/commons/passive/ticwatch/ticwatch_acceleration.avsc b/commons/passive/ticwatch/ticwatch_acceleration.avsc index edb18ffc..d72508b5 100644 --- a/commons/passive/ticwatch/ticwatch_acceleration.avsc +++ b/commons/passive/ticwatch/ticwatch_acceleration.avsc @@ -5,6 +5,7 @@ "doc": "Data from 3-axis accelerometer sensor of a Mobovi TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "timeReceived", "type": "double", "doc": "Processed time since the Unix Epoch (seconds)." }, { "name": "x", "type": "float", "doc": "Acceleration in the x-axis (g)." }, { "name": "y", "type": "float", "doc": "Acceleration in the y-axis (g)." }, { "name": "z", "type": "float", "doc": "Acceleration in the z-axis (g)." } diff --git a/commons/passive/ticwatch/ticwatch_battery_level.avsc b/commons/passive/ticwatch/ticwatch_battery_level.avsc index e97e7c65..869bac11 100644 --- a/commons/passive/ticwatch/ticwatch_battery_level.avsc +++ b/commons/passive/ticwatch/ticwatch_battery_level.avsc @@ -5,6 +5,7 @@ "doc": "Battery level of a TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "timeReceived", "type": "double", "doc": "Processed time since the Unix Epoch (seconds)." }, { "name": "batteryLevel", "type": "float", "doc": "Battery level from 0 to 1. Note that the battery level is a rough estimate." } ] } \ No newline at end of file diff --git a/commons/passive/ticwatch/ticwatch_gyroscope.avsc b/commons/passive/ticwatch/ticwatch_gyroscope.avsc index b5b44a0a..e602a814 100644 --- a/commons/passive/ticwatch/ticwatch_gyroscope.avsc +++ b/commons/passive/ticwatch/ticwatch_gyroscope.avsc @@ -5,6 +5,7 @@ "doc": "Data from 3-axis gyroscope sensor of a Mobovi TicWatch device.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "timeReceived", "type": "double", "doc": "Processed time since the Unix Epoch (seconds)." }, { "name": "x", "type": "float", "doc": "Angular velocity in the x-axis (rad/s)." }, { "name": "y", "type": "float", "doc": "Angular velocity in the y-axis (rad/s)." }, { "name": "z", "type": "float", "doc": "Angular velocity in the z-axis (rad/s)." } diff --git a/commons/passive/ticwatch/ticwatch_ppg.avsc b/commons/passive/ticwatch/ticwatch_ppg.avsc index 85c9352a..c8810913 100644 --- a/commons/passive/ticwatch/ticwatch_ppg.avsc +++ b/commons/passive/ticwatch/ticwatch_ppg.avsc @@ -1,10 +1,11 @@ { "namespace": "org.radarcns.passive.ticwatch", "type": "record", - "name": "TicwatchPPG", + "name": "TicwatchPpg", "doc": "PPG collected using a Mobovi TicWatch.", "fields": [ { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." }, + { "name": "timeReceived", "type": "double", "doc": "Processed time since the Unix Epoch (seconds)." }, { "name": "redled", "type": "float", "doc": "Red LED." }, { "name": "iredled", "type": "float", "doc": "Infrared LED." } ] From ba677751b3a3399d5b2aeb04af019d8337480da3 Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Thu, 23 May 2024 08:53:37 +0530 Subject: [PATCH 09/10] Not using deprecated Places.Type --- commons/passive/google/google_places_info.avsc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/commons/passive/google/google_places_info.avsc b/commons/passive/google/google_places_info.avsc index 2302ee89..b6799f24 100644 --- a/commons/passive/google/google_places_info.avsc +++ b/commons/passive/google/google_places_info.avsc @@ -11,11 +11,15 @@ "type": "enum", "doc": "The predefined categories or tags assigned to different places based on their characteristics. These types can represent various categories such as restaurants, cafes, museums, parks, hotels, airports, hospitals, and more.", "symbols": [ "ACCOUNTING", "ADMINISTRATIVE_AREA_LEVEL_1", "ADMINISTRATIVE_AREA_LEVEL_2", "ADMINISTRATIVE_AREA_LEVEL_3", "ADMINISTRATIVE_AREA_LEVEL_4", "ADMINISTRATIVE_AREA_LEVEL_5", "AIRPORT", "AMUSEMENT_PARK", "AQUARIUM", "ARCHIPELAGO", "ART_GALLERY", "ATM", "BAKERY", "BANK", "BAR", "BEAUTY_SALON", "BICYCLE_STORE", "BOOK_STORE", "BOWLING_ALLEY", "BUS_STATION", "CAFE", "CAMPGROUND", "CAR_DEALER", "CAR_RENTAL", "CAR_REPAIR", "CAR_WASH", "CASINO", "CEMETERY", "CHURCH", "CITY_HALL", "CLOTHING_STORE", "COLLOQUIAL_AREA", "CONTINENT", "CONVENIENCE_STORE", "COUNTRY", "COURTHOUSE", "DENTIST", "DEPARTMENT_STORE", "DOCTOR", "DRUGSTORE", "ELECTRICIAN", "ELECTRONICS_STORE", "EMBASSY", "ESTABLISHMENT", "FINANCE", "FIRE_STATION", "FLOOR", "FLORIST", "FOOD", "FUNERAL_HOME", "FURNITURE_STORE", "GAS_STATION", "GENERAL_CONTRACTOR", "GEOCODE", "GROCERY_OR_SUPERMARKET", "GYM", "HAIR_CARE", "HARDWARE_STORE", "HEALTH", "HINDU_TEMPLE", "HOME_GOODS_STORE", "HOSPITAL", "INSURANCE_AGENCY", "INTERSECTION", "JEWELRY_STORE", "LAUNDRY", "LAWYER", "LIBRARY", "LIGHT_RAIL_STATION", "LIQUOR_STORE", "LOCAL_GOVERNMENT_OFFICE", "LOCALITY", "LOCKSMITH", "LODGING", "MEAL_DELIVERY", "MEAL_TAKEAWAY", "MOSQUE", "MOVIE_RENTAL", "MOVIE_THEATER", "MOVING_COMPANY", "MUSEUM", "NATURAL_FEATURE", "NEIGHBORHOOD", "NIGHT_CLUB", "PAINTER", "PARK", "PARKING", "PET_STORE", "PHARMACY", "PHYSIOTHERAPIST", "PLACE_OF_WORSHIP", "PLUMBER", "PLUS_CODE", "POINT_OF_INTEREST", "POLICE", "POLITICAL", "POST_BOX", "POST_OFFICE", "POSTAL_CODE_PREFIX", "POSTAL_CODE_SUFFIX", "POSTAL_CODE", "POSTAL_TOWN", "PREMISE", "PRIMARY_SCHOOL", "REAL_ESTATE_AGENCY", "RESTAURANT", "ROOFING_CONTRACTOR", "ROOM", "ROUTE", "RV_PARK", "SCHOOL", "SECONDARY_SCHOOL", "SHOE_STORE", "SHOPPING_MALL", "SPA", "STADIUM", "STORAGE", "STORE", "STREET_ADDRESS", "STREET_NUMBER", "SUBLOCALITY_LEVEL_1", "SUBLOCALITY_LEVEL_2", "SUBLOCALITY_LEVEL_3", "SUBLOCALITY_LEVEL_4", "SUBLOCALITY_LEVEL_5", "SUBLOCALITY", "SUBPREMISE", "SUBWAY_STATION", "SUPERMARKET", "SYNAGOGUE", "TAXI_STAND", "TOURIST_ATTRACTION", "TOWN_SQUARE", "TRAIN_STATION", "TRANSIT_STATION", "TRAVEL_AGENCY", "UNIVERSITY", "VETERINARY_CARE", "ZOO"] - }], "doc": "Categorizing places based on their characteristics or attributes, this field represents the first type, if any, among the retrieved place categories.", "default": null + }], "doc": "Categorizing places based on their characteristics or attributes, This field is deprecated, as the Google Place.Type enum is deprecated. Instead, use the placeType field of string type.", "default": null }, - { "name": "type2", "type": ["null", "org.radarcns.passive.google.PlacesType"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the second type, if any, among the retrieved place categories.", "default": null }, - { "name": "type3", "type": ["null", "org.radarcns.passive.google.PlacesType"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the third type, if any, among the retrieved place categories.", "default": null }, - { "name": "type4", "type": ["null", "org.radarcns.passive.google.PlacesType"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the fourth type, if any, among the retrieved place categories.", "default": null }, + { "name": "type2", "type": ["null", "org.radarcns.passive.google.PlacesType"], "doc": "Categorizing places based on their characteristics or attributes, This field is deprecated, as the Google Place.Type enum is deprecated. Instead, use the placeType field of string type.", "default": null }, + { "name": "type3", "type": ["null", "org.radarcns.passive.google.PlacesType"], "doc": "Categorizing places based on their characteristics or attributes, This field is deprecated, as the Google Place.Type enum is deprecated. Instead, use the placeType field of string type.", "default": null }, + { "name": "type4", "type": ["null", "org.radarcns.passive.google.PlacesType"], "doc": "Categorizing places based on their characteristics or attributes, This field is deprecated, as the Google Place.Type enum is deprecated. Instead, use the placeType field of string type.", "default": null }, + { "name": "placeType1", "type": ["null", "string"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the first type, if any, among the retrieved place categories.", "default": null }, + { "name": "placeType2", "type": ["null", "string"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the second type, if any, among the retrieved place categories.", "default": null }, + { "name": "placeType3", "type": ["null", "string"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the third type, if any, among the retrieved place categories.", "default": null }, + { "name": "placeType4", "type": ["null", "string"], "doc": "Categorizing places based on their characteristics or attributes, this field represents the fourth type, if any, among the retrieved place categories.", "default": null }, { "name": "city", "type": ["null", "string"], "doc": "The city returned corresponds to the current location of the user's device.", "default": null }, { "name": "state", "type": ["null", "string"], "doc": "The state returned corresponds to the current location of the user's device.", "default": null }, { "name": "country", "type": ["null", "string"], "doc": "The country returned corresponds to the current location of the user's device.", "default": null }, From aa2a691ba137b915a3603c87ccfdd63641ea6644 Mon Sep 17 00:00:00 2001 From: Yatharth Ranjan Date: Mon, 3 Jun 2024 13:09:23 +0100 Subject: [PATCH 10/10] Bump minor version for release --- java-sdk/buildSrc/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-sdk/buildSrc/src/main/kotlin/Versions.kt b/java-sdk/buildSrc/src/main/kotlin/Versions.kt index 500a6baa..d9090f8a 100644 --- a/java-sdk/buildSrc/src/main/kotlin/Versions.kt +++ b/java-sdk/buildSrc/src/main/kotlin/Versions.kt @@ -1,5 +1,5 @@ object Versions { - const val project = "0.8.8-SNAPSHOT" + const val project = "0.8.9" const val kotlin = "1.9.10" const val java = 17