Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "Custom Wildcard Subscription"-Logic for Specifications #61

Merged
merged 8 commits into from
Feb 1, 2024
Merged

Remove "Custom Wildcard Subscription"-Logic for Specifications #61

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2632b4d
feature: Remove "Custom Wildcard Subscription"-Logic for Specs
wba2hi Dec 7, 2023
b571fde
test: Fix Tests
wba2hi Dec 7, 2023
1dfa887
Merge branch 'main' into feature-60
wba2hi Dec 7, 2023
de30bd5
Merge branch 'main' into feature-60
Chrylo Jan 30, 2024
bb92476
chore: Improve PropertyListener for Wildcard Subscribes
wba2hi Jan 31, 2024
35f7e50
chore: Use FriendlyListener, eventually and continually
wba2hi Jan 31, 2024
6fa50d3
chore: Fix Crash when subscribing to Vehicle
wba2hi Feb 1, 2024
80d0f75
chore: Fix Flickering Tests
wba2hi Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/DataBrokerTransporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ internal class DataBrokerTransporter(
val entry = entryUpdate.entry

subscription.listeners.forEach { observer ->
Chrylo marked this conversation as resolved.
Show resolved Hide resolved
observer.onPropertyChanged(vssPath, field, entry)
observer.onPropertyChanged(entry.path, field, entry)
}
}

Expand Down
26 changes: 13 additions & 13 deletions kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/subscription/DataBrokerSubscriber.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ import org.eclipse.kuksa.DataBrokerTransporter
import org.eclipse.kuksa.PropertyListener
import org.eclipse.kuksa.VssSpecificationListener
import org.eclipse.kuksa.extension.TAG
import org.eclipse.kuksa.extension.createProperties
import org.eclipse.kuksa.proto.v1.Types
import org.eclipse.kuksa.proto.v1.Types.Field
import org.eclipse.kuksa.vsscore.model.VssProperty
import org.eclipse.kuksa.vsscore.model.VssSpecification
import org.eclipse.kuksa.vsscore.model.vssProperties

/**
* Creates [Subscription]s to the DataBroker to get notified about changes on the underlying vssPaths and fields.
Expand Down Expand Up @@ -91,13 +91,13 @@ internal class DataBrokerSubscriber(private val dataBrokerTransporter: DataBroke
field: Field = Field.FIELD_VALUE,
listener: VssSpecificationListener<T>,
) {
val leafProperties = specification.createProperties(field)
val vssPaths = leafProperties.map { it.vssPath }
val vssPath = specification.vssPath

val specificationPropertyListener = SpecificationPropertyListener(specification, vssPaths, listener)
vssPaths.forEach { vssPath ->
subscribe(vssPath, field, specificationPropertyListener)
}
val leafProperties = specification.vssProperties
val childPropertiesPaths = leafProperties.map { it.vssPath }

val specificationPropertyListener = SpecificationPropertyListener(specification, childPropertiesPaths, listener)
subscribe(vssPath, field, specificationPropertyListener)
}

/**
Expand All @@ -111,13 +111,13 @@ internal class DataBrokerSubscriber(private val dataBrokerTransporter: DataBroke
field: Field = Field.FIELD_VALUE,
listener: VssSpecificationListener<T>,
) {
val leafProperties = specification.createProperties(field)
val vssPaths = leafProperties.map { it.vssPath }
val vssPath = specification.vssPath

val specificationPropertyListener = SpecificationPropertyListener(specification, vssPaths, listener)
vssPaths.forEach { vssPath ->
unsubscribe(vssPath, field, specificationPropertyListener)
}
val leafProperties = specification.vssProperties
val childPropertiesPaths = leafProperties.map { it.vssPath }

val specificationPropertyListener = SpecificationPropertyListener(specification, childPropertiesPaths, listener)
unsubscribe(vssPath, field, specificationPropertyListener)
}

private companion object {
Expand Down
1 change: 0 additions & 1 deletion kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/subscription/SpecificationPropertyListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ internal class SpecificationPropertyListener<T : VssSpecification>(
vssPaths: Collection<String>,
private val listener: VssSpecificationListener<T>,
) : PropertyListener {
// TODO: Remove as soon as the server supports subscribing to vssPaths which are not VssProperties
// Reduces the load on the observer for big VssSpecifications. We wait for the initial update
// of all VssProperties before notifying the observer about the first batch
private val initialSubscriptionUpdates = vssPaths.associateWith { false }.toMutableMap()
Expand Down
2 changes: 1 addition & 1 deletion kuksa-sdk/src/main/kotlin/org/eclipse/kuksa/subscription/Subscription.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ internal class Subscription(

for (entryUpdate in lastSubscribeResponse.updatesList) {
val entry = entryUpdate.entry
observer.onPropertyChanged(vssPath, field, entry)
observer.onPropertyChanged(entry.path, field, entry)
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions kuksa-sdk/src/test/kotlin/org/eclipse/kuksa/DataBrokerConnectionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ class DataBrokerConnectionTest : BehaviorSpec({
dataBrokerConnection.subscribe(specification, listener = specificationListener)

then("The #onSpecificationChanged method is triggered") {
verify(
timeout = 100L,
exactly = 1,
) { specificationListener.onSpecificationChanged(any()) }
val capturingList = mutableListOf<VssDriver>()
verify(timeout = 100L, exactly = 1) {
specificationListener.onSpecificationChanged(capture(capturingList))
}
}

and("The initial value is different from the default for a child") {
Expand Down
Loading