diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/DeleteOptions.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/DeleteOptions.kt index c9f71a75..e3bd2a22 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/DeleteOptions.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/DeleteOptions.kt @@ -33,9 +33,9 @@ import io.zenoh.qos.Reliability data class DeleteOptions( var reliability: Reliability = Reliability.RELIABLE, var attachment: IntoZBytes? = null, - var express: Boolean = QoS.defaultQoS.express, - var congestionControl: CongestionControl = QoS.defaultQoS.congestionControl, - var priority: Priority = QoS.defaultQoS.priority + var express: Boolean = QoS.defaultPush.express, + var congestionControl: CongestionControl = QoS.defaultPush.congestionControl, + var priority: Priority = QoS.defaultPush.priority ) { fun setAttachment(attachment: String) = apply { this.attachment = ZBytes.from(attachment) } } diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PublisherOptions.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PublisherOptions.kt index 0759a5b4..960ebb66 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PublisherOptions.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PublisherOptions.kt @@ -28,6 +28,6 @@ import io.zenoh.qos.* */ data class PublisherOptions(var reliability: Reliability = Reliability.RELIABLE, var encoding: Encoding = Encoding.defaultEncoding(), - var express: Boolean = QoS.defaultQoS.express, - var congestionControl: CongestionControl = QoS.defaultQoS.congestionControl, - var priority: Priority = QoS.defaultQoS.priority) + var express: Boolean = QoS.defaultPush.express, + var congestionControl: CongestionControl = QoS.defaultPush.congestionControl, + var priority: Priority = QoS.defaultPush.priority) diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PutOptions.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PutOptions.kt index 2b57e5f4..c4fd8b56 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PutOptions.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/pubsub/PutOptions.kt @@ -33,9 +33,9 @@ data class PutOptions( var encoding: Encoding? = null, var reliability: Reliability = Reliability.RELIABLE, var attachment: IntoZBytes? = null, - var express: Boolean = QoS.defaultQoS.express, - var congestionControl: CongestionControl = QoS.defaultQoS.congestionControl, - var priority: Priority = QoS.defaultQoS.priority + var express: Boolean = QoS.defaultPush.express, + var congestionControl: CongestionControl = QoS.defaultPush.congestionControl, + var priority: Priority = QoS.defaultPush.priority ) { fun setAttachment(attachment: String) = apply { this.attachment = ZBytes.from(attachment) } } diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/qos/QoS.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/qos/QoS.kt index 7b18eedd..49dd317a 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/qos/QoS.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/qos/QoS.kt @@ -28,6 +28,8 @@ data class QoS ( ) { companion object { - internal val defaultQoS = QoS() + internal val defaultPush = QoS(CongestionControl.DROP, Priority.DATA, false) + internal val defaultRequest = QoS(CongestionControl.BLOCK, Priority.DATA, false) + internal val defaultResponse = QoS(CongestionControl.BLOCK, Priority.DATA, false) } } diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Get.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Get.kt index fdb2f507..766dc518 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Get.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Get.kt @@ -38,7 +38,7 @@ data class GetOptions( var payload: IntoZBytes? = null, var encoding: Encoding? = null, var attachment: IntoZBytes? = null, - var qos: QoS = QoS.defaultQoS + var qos: QoS = QoS.defaultRequest ) { fun setPayload(payload: String) = apply { this.payload = ZBytes.from(payload) } fun setAttachment(attachment: String) = apply { this.attachment = ZBytes.from(attachment) } diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Querier.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Querier.kt index 7662576f..cedb34d4 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Querier.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Querier.kt @@ -159,7 +159,7 @@ data class QuerierOptions( var target: QueryTarget = QueryTarget.BEST_MATCHING, var consolidationMode: ConsolidationMode = ConsolidationMode.AUTO, var timeout: Duration = Duration.ofMillis(10000), - var express: Boolean = QoS.defaultQoS.express, - var congestionControl: CongestionControl = QoS.defaultQoS.congestionControl, - var priority: Priority = QoS.defaultQoS.priority + var express: Boolean = QoS.defaultRequest.express, + var congestionControl: CongestionControl = QoS.defaultRequest.congestionControl, + var priority: Priority = QoS.defaultRequest.priority ) diff --git a/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Reply.kt b/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Reply.kt index 1317076f..265364d5 100644 --- a/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Reply.kt +++ b/zenoh-java/src/commonMain/kotlin/io/zenoh/query/Reply.kt @@ -92,9 +92,9 @@ data class ReplyOptions( var encoding: Encoding = Encoding.defaultEncoding(), var timeStamp: TimeStamp? = null, var attachment: IntoZBytes? = null, - var express: Boolean = QoS.defaultQoS.express, - var congestionControl: CongestionControl = QoS.defaultQoS.congestionControl, - var priority: Priority = QoS.defaultQoS.priority + var express: Boolean = QoS.defaultResponse.express, + var congestionControl: CongestionControl = QoS.defaultResponse.congestionControl, + var priority: Priority = QoS.defaultResponse.priority ) { fun setAttachment(attachment: String) = apply { this.attachment = ZBytes.from(attachment) } } @@ -111,9 +111,9 @@ data class ReplyOptions( data class ReplyDelOptions( var timeStamp: TimeStamp? = null, var attachment: IntoZBytes? = null, - var express: Boolean = QoS.defaultQoS.express, - var congestionControl: CongestionControl = QoS.defaultQoS.congestionControl, - var priority: Priority = QoS.defaultQoS.priority + var express: Boolean = QoS.defaultResponse.express, + var congestionControl: CongestionControl = QoS.defaultResponse.congestionControl, + var priority: Priority = QoS.defaultResponse.priority ) { fun setAttachment(attachment: String) = apply { this.attachment = ZBytes.from(attachment) } } diff --git a/zenoh-java/src/jvmTest/java/io/zenoh/QuerierTest.java b/zenoh-java/src/jvmTest/java/io/zenoh/QuerierTest.java index 00cb52b5..b8d33948 100644 --- a/zenoh-java/src/jvmTest/java/io/zenoh/QuerierTest.java +++ b/zenoh-java/src/jvmTest/java/io/zenoh/QuerierTest.java @@ -18,6 +18,8 @@ import io.zenoh.bytes.ZBytes; import io.zenoh.exceptions.ZError; import io.zenoh.keyexpr.KeyExpr; +import io.zenoh.qos.CongestionControl; +import io.zenoh.qos.Priority; import io.zenoh.qos.QoS; import io.zenoh.query.Querier; import io.zenoh.query.Reply; @@ -56,7 +58,7 @@ public void querier_runsWithCallbackTest() throws ZError { Encoding.defaultEncoding(), SampleKind.PUT, new TimeStamp(Date.from(Instant.now())), - new QoS(), + new QoS(CongestionControl.BLOCK, Priority.DATA, false), null ); var examplePayload = ZBytes.from("Example payload"); diff --git a/zenoh-java/src/jvmTest/java/io/zenoh/QueryableTest.java b/zenoh-java/src/jvmTest/java/io/zenoh/QueryableTest.java index b1e5918c..da8d72f2 100644 --- a/zenoh-java/src/jvmTest/java/io/zenoh/QueryableTest.java +++ b/zenoh-java/src/jvmTest/java/io/zenoh/QueryableTest.java @@ -53,7 +53,7 @@ public void queryableRunsWithCallback() throws ZError { Encoding.defaultEncoding(), SampleKind.PUT, timestamp, - new QoS(), + new QoS(CongestionControl.BLOCK, Priority.DATA, false), null );