Skip to content

Commit faac217

Browse files
andrea-acamporamergify[bot]
andrea-acampora
authored and
mergify[bot]
committed
style: adjust code style due to kotlin-qa update
1 parent 9842ab1 commit faac217

18 files changed

+73
-62
lines changed

‎src/main/kotlin/App.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import infrastructure.signalr.SignalRClient
1717
* The application launcher.
1818
*/
1919
fun main() {
20-
2120
val publisher: EventPublisher<Event<*>> = KafkaPublisher()
2221
val consumer: EventConsumer<String> = SignalRClient()
2322

‎src/main/kotlin/application/services/EventService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import io.reactivex.rxjava3.disposables.Disposable
2020
*/
2121
class EventService<in C>(
2222
private val eventPublisher: EventPublisher<Event<*>>,
23-
private val eventConsumer: EventConsumer<C>
23+
private val eventConsumer: EventConsumer<C>,
2424
) {
2525

2626
/**

‎src/main/kotlin/entities/environment/EnvironmentData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ object EnvironmentData {
4141

4242
/** The temperature unit. **/
4343
enum class TemperatureUnit {
44-
CELSIUS
44+
CELSIUS,
4545
}
4646

4747
/** The luminosity unit. **/
4848
enum class LuminosityUnit {
49-
LUX
49+
LUX,
5050
}
5151
}

‎src/main/kotlin/entities/events/EmptyEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ import entities.events.EventProperties.EventKey
1616
data class EmptyEvent(
1717
override val key: EventKey = EventKey.EMPTY_EVENT,
1818
override val data: Any = "EMPTY_DATA",
19-
override val dateTime: String = "EMPTY_DATA"
19+
override val dateTime: String = "EMPTY_DATA",
2020
) : Event<Any>

‎src/main/kotlin/entities/events/EventProperties.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ object EventProperties {
4141
EMPTY_EVENT(""),
4242
PATIENT_TRACKED_EVENT(processEvents),
4343
TRACKING_EVENT(trackingEvents),
44-
SURGERY_BOOKINGS_EVENT(bookingEvents)
44+
SURGERY_BOOKINGS_EVENT(bookingEvents),
4545
}
4646
}

‎src/main/kotlin/entities/events/ProcessEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ data class ProcessEvent<E : Any>(
1919

2020
override val data: E,
2121

22-
override val dateTime: String
22+
override val dateTime: String,
2323

2424
) : Event<E>

‎src/main/kotlin/entities/events/RoomEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ data class RoomEvent<E : Any> (
2929

3030
override val data: E,
3131

32-
override val dateTime: String
32+
override val dateTime: String,
3333

3434
) : Event<E>

‎src/main/kotlin/entities/events/SurgeryBookingEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ data class SurgeryBookingEvent<E : Any> (
1919

2020
override val data: E,
2121

22-
override val dateTime: String
22+
override val dateTime: String,
2323
) : Event<E>

‎src/main/kotlin/entities/events/TrackingEvent.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ data class TrackingEvent<E : Any> (
2929

3030
override val data: E,
3131

32-
override val dateTime: String
32+
override val dateTime: String,
3333

3434
) : Event<E>

‎src/main/kotlin/entities/process/ProcessData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ object ProcessData {
4343
val patientId: String,
4444
val roomId: String,
4545
val entered: Boolean,
46-
val roomType: RoomType
46+
val roomType: RoomType,
4747
)
4848

4949
/** The type of the room where the patient is tracked. **/

‎src/main/kotlin/infrastructure/digitaltwins/events/LifecycleEvents.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ object LifecycleEvents {
4646
/**
4747
* The date and time of the event.
4848
*/
49-
val eventDateTime: String
49+
val eventDateTime: String,
5050
)
5151
}

‎src/main/kotlin/infrastructure/digitaltwins/events/RelationshipEvents.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ object RelationshipEvents {
4646
/**
4747
* The model of the relationship target.
4848
*/
49-
val targetModel: String
49+
val targetModel: String,
5050
)
5151

5252
/**
@@ -75,6 +75,6 @@ object RelationshipEvents {
7575
/**
7676
* The date and time of the event.
7777
*/
78-
val eventDateTime: String
78+
val eventDateTime: String,
7979
)
8080
}

‎src/main/kotlin/infrastructure/digitaltwins/events/TwinProperties.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ object TwinProperties {
2121
TEMPERATURE("/temperature"),
2222
HUMIDITY("/humidity"),
2323
LUMINOSITY("/luminosity"),
24-
PRESENCE("/presence_inside")
24+
PRESENCE("/presence_inside"),
2525
}
2626

2727
/**
2828
* The properties path of Process events.
2929
* @param path the property path.
3030
*/
3131
enum class ProcessProperties(val path: String) {
32-
MEDICAL_TECHNOLOGY("/is_in_use")
32+
MEDICAL_TECHNOLOGY("/is_in_use"),
3333
}
3434

3535
/**
@@ -57,7 +57,7 @@ object TwinProperties {
5757
PATIENT_MODEL_ID("dtmi:io:github:smartoperatingblock:Patient;1"),
5858
HEALTH_PROFESSIONAL_MODEL_ID("dtmi:io:github:smartoperatingblock:HealthProfessional;1"),
5959
SURGERY_BOOKING_MODEL_ID("dtmi:io:github:smartoperatingblock:SurgeryBooking;1"),
60-
MEDICAL_TECHNOLOGY_MODEL_ID("dtmi:io:github:smartoperatingblock:MedicalTechnology;1")
60+
MEDICAL_TECHNOLOGY_MODEL_ID("dtmi:io:github:smartoperatingblock:MedicalTechnology;1"),
6161
}
6262

6363
/**

‎src/main/kotlin/infrastructure/digitaltwins/parser/DTEventParser.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ class DTEventParser : EventParser<String> {
3636
return when (eventMap["eventType"]) {
3737
UPDATE.type -> {
3838
updateEventParser.manageEvent(
39-
mapper.readValue(inputEvent, UpdateTwinEvent::class.java)
39+
mapper.readValue(inputEvent, UpdateTwinEvent::class.java),
4040
)
4141
}
4242
CREATE.type -> {
4343
lifecycleEventParser.manageEvent(
44-
mapper.readValue(inputEvent.replace("$", ""), LifecycleEvent::class.java)
44+
mapper.readValue(inputEvent.replace("$", ""), LifecycleEvent::class.java),
4545
)
4646
}
4747
RELATIONSHIP_CREATE.type -> {
4848
relationshipEventParser.manageCreatedRelationship(
49-
mapper.readValue(inputEvent.replace("$", ""), RelationshipEvent::class.java)
49+
mapper.readValue(inputEvent.replace("$", ""), RelationshipEvent::class.java),
5050
)
5151
}
5252
RELATIONSHIP_DELETE.type -> {
5353
relationshipEventParser.manageDeletedRelationship(
54-
mapper.readValue(inputEvent.replace("$", ""), RelationshipEvent::class.java)
54+
mapper.readValue(inputEvent.replace("$", ""), RelationshipEvent::class.java),
5555
)
5656
}
5757
else -> EmptyEvent()

‎src/main/kotlin/infrastructure/digitaltwins/parser/LifecycleEventParser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class LifecycleEventParser {
3838
SurgeryBookingEvent(
3939
data = SurgeryBooking(
4040
lifecycleTwinEvent.data["booking_date_time"].toString(),
41-
lifecycleTwinEvent.data["surgery_type"].toString()
41+
lifecycleTwinEvent.data["surgery_type"].toString(),
4242
),
43-
dateTime = lifecycleTwinEvent.eventDateTime
43+
dateTime = lifecycleTwinEvent.eventDateTime,
4444
)
4545
}
4646
else -> EmptyEvent()

‎src/main/kotlin/infrastructure/digitaltwins/parser/RelationshipEventParser.kt

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class RelationshipEventParser {
4040
healthProfessionalId = createdRelationship.data.sourceId,
4141
roomId = createdRelationship.data.targetId,
4242
data = true,
43-
dateTime = createdRelationship.eventDateTime
43+
dateTime = createdRelationship.eventDateTime,
4444
)
4545
else -> EmptyEvent()
4646
}
@@ -54,11 +54,13 @@ class RelationshipEventParser {
5454
roomId = createdRelationship.data.targetId,
5555
entered = true,
5656
roomType =
57-
if (createdRelationship.data.targetModel == PRE_OPERATING_ROOM_MODEL_ID.id)
57+
if (createdRelationship.data.targetModel == PRE_OPERATING_ROOM_MODEL_ID.id) {
5858
PRE_OPERATING_ROOM
59-
else OPERATING_ROOM
59+
} else {
60+
OPERATING_ROOM
61+
},
6062
),
61-
dateTime = createdRelationship.eventDateTime
63+
dateTime = createdRelationship.eventDateTime,
6264
)
6365
else -> EmptyEvent()
6466
}
@@ -69,9 +71,9 @@ class RelationshipEventParser {
6971
key = EventKey.MEDICAL_DEVICE_USAGE_EVENT,
7072
data = ProcessData.MedicalDeviceUsage(
7173
createdRelationship.data.targetId,
72-
createdRelationship.data.sourceId
74+
createdRelationship.data.sourceId,
7375
),
74-
dateTime = createdRelationship.eventDateTime
76+
dateTime = createdRelationship.eventDateTime,
7577
)
7678
else -> EmptyEvent()
7779
}
@@ -93,7 +95,7 @@ class RelationshipEventParser {
9395
healthProfessionalId = deletedRelationship.data.sourceId,
9496
roomId = deletedRelationship.data.targetId,
9597
data = false,
96-
dateTime = deletedRelationship.eventDateTime
98+
dateTime = deletedRelationship.eventDateTime,
9799
)
98100
}
99101
PATIENT_MODEL_ID.id -> {
@@ -104,11 +106,13 @@ class RelationshipEventParser {
104106
roomId = deletedRelationship.data.targetId,
105107
entered = false,
106108
roomType =
107-
if (deletedRelationship.data.targetModel == PRE_OPERATING_ROOM_MODEL_ID.id)
109+
if (deletedRelationship.data.targetModel == PRE_OPERATING_ROOM_MODEL_ID.id) {
108110
PRE_OPERATING_ROOM
109-
else OPERATING_ROOM
111+
} else {
112+
OPERATING_ROOM
113+
},
110114
),
111-
dateTime = deletedRelationship.eventDateTime
115+
dateTime = deletedRelationship.eventDateTime,
112116
)
113117
}
114118
else -> EmptyEvent()

‎src/main/kotlin/infrastructure/digitaltwins/parser/UpdateEventParser.kt

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -73,39 +73,47 @@ class UpdateEventParser {
7373
TEMPERATURE.path -> RoomEvent(
7474
key = EventKey.TEMPERATURE_EVENT,
7575
roomId = updateTwinEvent.id,
76-
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id)
76+
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id) {
7777
ProcessData.RoomType.OPERATING_ROOM
78-
else ProcessData.RoomType.PRE_OPERATING_ROOM,
78+
} else {
79+
ProcessData.RoomType.PRE_OPERATING_ROOM
80+
},
7981
data = Temperature((updateTwinEvent.data.patch[0].value as Number).toDouble(), TemperatureUnit.CELSIUS),
80-
dateTime = updateTwinEvent.eventDateTime
82+
dateTime = updateTwinEvent.eventDateTime,
8183
)
8284
HUMIDITY.path -> RoomEvent(
8385
key = EventKey.HUMIDITY_EVENT,
8486
roomId = updateTwinEvent.id,
85-
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id)
87+
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id) {
8688
ProcessData.RoomType.OPERATING_ROOM
87-
else ProcessData.RoomType.PRE_OPERATING_ROOM,
89+
} else {
90+
ProcessData.RoomType.PRE_OPERATING_ROOM
91+
},
8892
data = Humidity(updateTwinEvent.data.patch[0].value as Int),
89-
dateTime = updateTwinEvent.eventDateTime
93+
dateTime = updateTwinEvent.eventDateTime,
9094
)
9195
LUMINOSITY.path -> RoomEvent(
9296
key = EventKey.LUMINOSITY_EVENT,
9397
roomId = updateTwinEvent.id,
94-
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id)
98+
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id) {
9599
ProcessData.RoomType.OPERATING_ROOM
96-
else ProcessData.RoomType.PRE_OPERATING_ROOM,
100+
} else {
101+
ProcessData.RoomType.PRE_OPERATING_ROOM
102+
},
97103
data = Luminosity((updateTwinEvent.data.patch[0].value as Number).toDouble(), LuminosityUnit.LUX),
98-
dateTime = updateTwinEvent.eventDateTime
104+
dateTime = updateTwinEvent.eventDateTime,
99105
)
100106
PRESENCE.path -> {
101107
RoomEvent(
102108
key = EventKey.PRESENCE_EVENT,
103109
roomId = updateTwinEvent.id,
104-
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id)
110+
roomType = if (updateTwinEvent.data.modelId == OPERATING_ROOM_MODEL_ID.id) {
105111
ProcessData.RoomType.OPERATING_ROOM
106-
else ProcessData.RoomType.PRE_OPERATING_ROOM,
112+
} else {
113+
ProcessData.RoomType.PRE_OPERATING_ROOM
114+
},
107115
data = Presence(updateTwinEvent.data.patch[0].value as Boolean),
108-
dateTime = updateTwinEvent.eventDateTime
116+
dateTime = updateTwinEvent.eventDateTime,
109117
)
110118
}
111119
else -> EmptyEvent()
@@ -117,77 +125,77 @@ class UpdateEventParser {
117125
ProcessEvent(
118126
key = EventKey.PATIENT_ON_OB_EVENT,
119127
data = ProcessData.PatientOnOperatingTable(updateTwinEvent.id),
120-
dateTime = updateTwinEvent.eventDateTime
128+
dateTime = updateTwinEvent.eventDateTime,
121129
)
122130
}
123131
BODY_TEMPERATURE.path -> {
124132
ProcessEvent(
125133
key = EventKey.PATIENT_BODY_TEMPERATURE_UPDATE_EVENT,
126134
data = PatientData(
127135
updateTwinEvent.id,
128-
BodyTemperature((updateTwinEvent.data.patch[0].value as Number).toDouble())
136+
BodyTemperature((updateTwinEvent.data.patch[0].value as Number).toDouble()),
129137
),
130-
dateTime = updateTwinEvent.eventDateTime
138+
dateTime = updateTwinEvent.eventDateTime,
131139
)
132140
}
133141
DIASTOLIC_PRESSURE.path -> {
134142
ProcessEvent(
135143
key = EventKey.PATIENT_DIASTOLIC_PRESSURE_UPDATE_EVENT,
136144
data = PatientData(
137145
updateTwinEvent.id,
138-
DiastolicPressure(updateTwinEvent.data.patch[0].value as Int)
146+
DiastolicPressure(updateTwinEvent.data.patch[0].value as Int),
139147
),
140-
dateTime = updateTwinEvent.eventDateTime
148+
dateTime = updateTwinEvent.eventDateTime,
141149
)
142150
}
143151
SYSTOLIC_PRESSURE.path -> {
144152
ProcessEvent(
145153
key = EventKey.PATIENT_SYSTOLIC_PRESSURE_UPDATE_EVENT,
146154
data = PatientData(
147155
updateTwinEvent.id,
148-
SystolicPressure(updateTwinEvent.data.patch[0].value as Int)
156+
SystolicPressure(updateTwinEvent.data.patch[0].value as Int),
149157
),
150-
dateTime = updateTwinEvent.eventDateTime
158+
dateTime = updateTwinEvent.eventDateTime,
151159
)
152160
}
153161
RESPIRATORY_RATE.path -> {
154162
ProcessEvent(
155163
key = EventKey.PATIENT_RESPIRATORY_RATE_UPDATE_EVENT,
156164
data = PatientData(
157165
updateTwinEvent.id,
158-
RespiratoryRate(updateTwinEvent.data.patch[0].value as Int)
166+
RespiratoryRate(updateTwinEvent.data.patch[0].value as Int),
159167
),
160-
dateTime = updateTwinEvent.eventDateTime
168+
dateTime = updateTwinEvent.eventDateTime,
161169
)
162170
}
163171
SATURATION_PERCENTAGE.path -> {
164172
ProcessEvent(
165173
key = EventKey.PATIENT_SATURATION_UPDATE_EVENT,
166174
data = PatientData(
167175
updateTwinEvent.id,
168-
Saturation(updateTwinEvent.data.patch[0].value as Int)
176+
Saturation(updateTwinEvent.data.patch[0].value as Int),
169177
),
170-
dateTime = updateTwinEvent.eventDateTime
178+
dateTime = updateTwinEvent.eventDateTime,
171179
)
172180
}
173181
HEARTBEAT.path -> {
174182
ProcessEvent(
175183
key = EventKey.PATIENT_HEARTBEAT_UPDATE_EVENT,
176184
data = PatientData(
177185
updateTwinEvent.id,
178-
Heartbeat(updateTwinEvent.data.patch[0].value as Int)
186+
Heartbeat(updateTwinEvent.data.patch[0].value as Int),
179187
),
180-
dateTime = updateTwinEvent.eventDateTime
188+
dateTime = updateTwinEvent.eventDateTime,
181189
)
182190
}
183191
MEDICAL_TECHNOLOGY.path -> {
184192
ProcessEvent(
185193
key = EventKey.MEDICAL_TECHNOLOGY_USAGE_EVENT,
186194
data = MedicalTechnologyUsage(
187195
updateTwinEvent.id,
188-
updateTwinEvent.data.patch[0].value as Boolean
196+
updateTwinEvent.data.patch[0].value as Boolean,
189197
),
190-
dateTime = updateTwinEvent.eventDateTime
198+
dateTime = updateTwinEvent.eventDateTime,
191199
)
192200
}
193201
else -> EmptyEvent()

0 commit comments

Comments
 (0)