From 1bbaf5e0eb5d28f7f419af0397a266598aa4ea80 Mon Sep 17 00:00:00 2001 From: Yonny Hao Date: Fri, 30 May 2025 15:58:23 +0800 Subject: [PATCH 1/2] Rename groupId: com.baidu.bifromq -> org.apache.bifromq --- base-cluster/pom.xml | 16 +- base-crdt/base-crdt-service/pom.xml | 12 +- base-crdt/base-crdt-store/pom.xml | 12 +- base-crdt/pom.xml | 6 +- base-env/base-env-provider-spi/pom.xml | 6 +- base-env/base-env-provider/pom.xml | 6 +- base-env/pom.xml | 6 +- base-hlc/pom.xml | 6 +- base-hookloader/pom.xml | 6 +- base-kv/base-kv-local-engine/pom.xml | 12 +- base-kv/base-kv-meta-service/pom.xml | 12 +- base-kv/base-kv-raft-type/pom.xml | 6 +- base-kv/base-kv-raft/pom.xml | 8 +- .../base-kv-store-balance-controller/pom.xml | 16 +- base-kv/base-kv-store-balance-spi/pom.xml | 10 +- base-kv/base-kv-store-client/pom.xml | 18 +- base-kv/base-kv-store-rpc-definition/pom.xml | 16 +- base-kv/base-kv-store-server/pom.xml | 24 +-- base-kv/base-kv-type-proto/pom.xml | 10 +- base-kv/pom.xml | 6 +- base-logger/pom.xml | 6 +- base-rpc/base-rpc-client/pom.xml | 16 +- base-rpc/base-rpc-common/pom.xml | 4 +- base-rpc/base-rpc-grpc-inproc/pom.xml | 4 +- base-rpc/base-rpc-server/pom.xml | 10 +- base-rpc/base-rpc-traffic-governor/pom.xml | 10 +- base-rpc/pom.xml | 2 +- base-scheduler/pom.xml | 6 +- base-util/pom.xml | 2 +- bifromq-apiserver/pom.xml | 22 +-- bifromq-common-type/pom.xml | 6 +- bifromq-deliverer/pom.xml | 16 +- bifromq-dist/bifromq-dist-client/pom.xml | 18 +- .../bifromq-dist-coproc-proto/pom.xml | 10 +- .../bifromq-dist-rpc-definition/pom.xml | 6 +- bifromq-dist/bifromq-dist-server/pom.xml | 30 ++-- .../bifromq-dist-worker-schema/pom.xml | 8 +- bifromq-dist/bifromq-dist-worker-spi/pom.xml | 10 +- bifromq-dist/bifromq-dist-worker/pom.xml | 38 ++-- bifromq-dist/pom.xml | 6 +- bifromq-inbox/bifromq-inbox-client/pom.xml | 12 +- .../bifromq-inbox-coproc-proto/pom.xml | 6 +- .../bifromq-inbox-rpc-definition/pom.xml | 12 +- bifromq-inbox/bifromq-inbox-server/pom.xml | 46 ++--- .../bifromq-inbox-store-schema/pom.xml | 4 +- bifromq-inbox/bifromq-inbox-store-spi/pom.xml | 6 +- bifromq-inbox/bifromq-inbox-store/pom.xml | 42 ++--- bifromq-inbox/pom.xml | 2 +- bifromq-metrics/pom.xml | 6 +- .../bifromq-mqtt-broker-client/pom.xml | 10 +- .../pom.xml | 10 +- bifromq-mqtt/bifromq-mqtt-server/pom.xml | 54 +++--- bifromq-mqtt/pom.xml | 6 +- .../bifromq-plugin-archetype/pom.xml | 6 +- .../archetype-resources/auth-provider/pom.xml | 8 +- .../archetype-resources/plugin-build/pom.xml | 8 +- .../plugin-context/pom.xml | 6 +- .../resources/archetype-resources/pom.xml | 12 +- .../pom.xml | 14 +- .../bifromq-plugin-auth-provider/pom.xml | 10 +- .../pom.xml | 8 +- .../bifromq-plugin-client-balancer/pom.xml | 10 +- bifromq-plugin/bifromq-plugin-context/pom.xml | 6 +- .../pom.xml | 12 +- .../bifromq-plugin-event-collector/pom.xml | 10 +- bifromq-plugin/bifromq-plugin-main/pom.xml | 8 +- bifromq-plugin/bifromq-plugin-manager/pom.xml | 6 +- .../pom.xml | 8 +- .../bifromq-plugin-resource-throttler/pom.xml | 8 +- .../pom.xml | 8 +- .../bifromq-plugin-setting-provider/pom.xml | 8 +- .../bifromq-plugin-sub-broker-helper/pom.xml | 8 +- .../bifromq-plugin-sub-broker/pom.xml | 8 +- bifromq-plugin/pom.xml | 6 +- bifromq-retain/bifromq-retain-client/pom.xml | 12 +- .../bifromq-retain-coproc-proto/pom.xml | 4 +- bifromq-retain/bifromq-retain-gc/pom.xml | 8 +- .../bifromq-retain-rpc-definition/pom.xml | 6 +- bifromq-retain/bifromq-retain-server/pom.xml | 34 ++-- .../bifromq-retain-store-schema/pom.xml | 6 +- .../bifromq-retain-store-spi/pom.xml | 6 +- bifromq-retain/bifromq-retain-store/pom.xml | 38 ++-- bifromq-retain/pom.xml | 6 +- .../bifromq-session-dict-client/pom.xml | 10 +- .../pom.xml | 12 +- .../bifromq-session-dict-server/pom.xml | 20 +-- bifromq-session-dict/pom.xml | 6 +- bifromq-sysprops/pom.xml | 8 +- bifromq-util/pom.xml | 8 +- build/build-bifromq-starters/pom.xml | 48 ++--- build/build-plugin-demo/pom.xml | 16 +- build/pom.xml | 6 +- coverage-report/pom.xml | 86 ++++----- pom.xml | 168 +++++++++--------- testsuites/pom.xml | 2 +- 95 files changed, 677 insertions(+), 671 deletions(-) diff --git a/base-cluster/pom.xml b/base-cluster/pom.xml index 06ae04287..b8be3c8a0 100644 --- a/base-cluster/pom.xml +++ b/base-cluster/pom.xml @@ -11,12 +11,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT @@ -24,20 +24,20 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hlc - io.micrometer - micrometer-core + org.apache.bifromq + base-crdt-store - com.baidu.bifromq - base-crdt-store + io.micrometer + micrometer-core com.google.protobuf diff --git a/base-crdt/base-crdt-service/pom.xml b/base-crdt/base-crdt-service/pom.xml index f81731350..824640d9b 100644 --- a/base-crdt/base-crdt-service/pom.xml +++ b/base-crdt/base-crdt-service/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq base-crdt 4.0.0-SNAPSHOT @@ -25,15 +25,15 @@ base-crdt-service - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-cluster - com.baidu.bifromq + org.apache.bifromq base-crdt-store diff --git a/base-crdt/base-crdt-store/pom.xml b/base-crdt/base-crdt-store/pom.xml index 2eca6fd76..3a91158e2 100644 --- a/base-crdt/base-crdt-store/pom.xml +++ b/base-crdt/base-crdt-store/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-crdt 4.0.0-SNAPSHOT @@ -26,15 +26,15 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-logger - com.baidu.bifromq + org.apache.bifromq base-env-provider diff --git a/base-crdt/pom.xml b/base-crdt/pom.xml index 3aff4c033..03aa52fc7 100644 --- a/base-crdt/pom.xml +++ b/base-crdt/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/base-env/base-env-provider-spi/pom.xml b/base-env/base-env-provider-spi/pom.xml index 3b03590a6..25a92a808 100644 --- a/base-env/base-env-provider-spi/pom.xml +++ b/base-env/base-env-provider-spi/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-env 4.0.0-SNAPSHOT diff --git a/base-env/base-env-provider/pom.xml b/base-env/base-env-provider/pom.xml index 95231e62f..c79ba1394 100644 --- a/base-env/base-env-provider/pom.xml +++ b/base-env/base-env-provider/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-env 4.0.0-SNAPSHOT @@ -25,11 +25,11 @@ base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq base-env-provider-spi diff --git a/base-env/pom.xml b/base-env/pom.xml index 9a762312b..54767dd7c 100644 --- a/base-env/pom.xml +++ b/base-env/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/base-hlc/pom.xml b/base-hlc/pom.xml index 70a7f4868..a26fcfdfb 100644 --- a/base-hlc/pom.xml +++ b/base-hlc/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/base-hookloader/pom.xml b/base-hookloader/pom.xml index d65da59ac..db329921d 100644 --- a/base-hookloader/pom.xml +++ b/base-hookloader/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/base-kv/base-kv-local-engine/pom.xml b/base-kv/base-kv-local-engine/pom.xml index 585329b9a..1f0a15529 100644 --- a/base-kv/base-kv-local-engine/pom.xml +++ b/base-kv/base-kv-local-engine/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -26,15 +26,15 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-logger diff --git a/base-kv/base-kv-meta-service/pom.xml b/base-kv/base-kv-meta-service/pom.xml index 5a4890702..78f1cc671 100644 --- a/base-kv/base-kv-meta-service/pom.xml +++ b/base-kv/base-kv-meta-service/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -13,11 +13,11 @@ - com.baidu.bifromq + org.apache.bifromq base-crdt-service - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq base-cluster test diff --git a/base-kv/base-kv-raft-type/pom.xml b/base-kv/base-kv-raft-type/pom.xml index a41305c84..8fada5240 100644 --- a/base-kv/base-kv-raft-type/pom.xml +++ b/base-kv/base-kv-raft-type/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT diff --git a/base-kv/base-kv-raft/pom.xml b/base-kv/base-kv-raft/pom.xml index f092e0d97..3b0d15752 100644 --- a/base-kv/base-kv-raft/pom.xml +++ b/base-kv/base-kv-raft/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -26,15 +26,15 @@ - com.baidu.bifromq + org.apache.bifromq base-logger - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-kv-raft-type diff --git a/base-kv/base-kv-store-balance-controller/pom.xml b/base-kv/base-kv-store-balance-controller/pom.xml index a11445e77..572312c74 100644 --- a/base-kv/base-kv-store-balance-controller/pom.xml +++ b/base-kv/base-kv-store-balance-controller/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - base-kv - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 @@ -26,23 +26,23 @@ - com.baidu.bifromq + org.apache.bifromq base-logger - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-spi diff --git a/base-kv/base-kv-store-balance-spi/pom.xml b/base-kv/base-kv-store-balance-spi/pom.xml index 40edfdeb1..e91f88851 100644 --- a/base-kv/base-kv-store-balance-spi/pom.xml +++ b/base-kv/base-kv-store-balance-spi/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - base-kv - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto - com.baidu.bifromq + org.apache.bifromq base-logger diff --git a/base-kv/base-kv-store-client/pom.xml b/base-kv/base-kv-store-client/pom.xml index 01e8f3992..688a9a0d7 100644 --- a/base-kv/base-kv-store-client/pom.xml +++ b/base-kv/base-kv-store-client/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -25,27 +25,27 @@ base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-cluster - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq base-crdt-service - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-rpc-definition diff --git a/base-kv/base-kv-store-rpc-definition/pom.xml b/base-kv/base-kv-store-rpc-definition/pom.xml index 481b71b4b..9539bfbfe 100644 --- a/base-kv/base-kv-store-rpc-definition/pom.xml +++ b/base-kv/base-kv-store-rpc-definition/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -26,32 +26,32 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-rpc-common - com.baidu.bifromq + org.apache.bifromq base-kv-raft-type - com.baidu.bifromq + org.apache.bifromq bifromq-dist-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-retain-coproc-proto diff --git a/base-kv/base-kv-store-server/pom.xml b/base-kv/base-kv-store-server/pom.xml index 9750c1c65..6f919cbcc 100644 --- a/base-kv/base-kv-store-server/pom.xml +++ b/base-kv/base-kv-store-server/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -26,47 +26,47 @@ - com.baidu.bifromq + org.apache.bifromq base-logger - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-cluster - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq base-crdt-service - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-rpc-definition - com.baidu.bifromq + org.apache.bifromq base-kv-local-engine - com.baidu.bifromq + org.apache.bifromq base-kv-raft - com.baidu.bifromq + org.apache.bifromq base-util diff --git a/base-kv/base-kv-type-proto/pom.xml b/base-kv/base-kv-type-proto/pom.xml index 13c19cb2a..b9f014999 100644 --- a/base-kv/base-kv-type-proto/pom.xml +++ b/base-kv/base-kv-type-proto/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-kv 4.0.0-SNAPSHOT @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-kv-raft-type diff --git a/base-kv/pom.xml b/base-kv/pom.xml index fb7c063c5..3598627d7 100644 --- a/base-kv/pom.xml +++ b/base-kv/pom.xml @@ -12,13 +12,13 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT pom diff --git a/base-logger/pom.xml b/base-logger/pom.xml index bf13ea3a4..cae30ee94 100644 --- a/base-logger/pom.xml +++ b/base-logger/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/base-rpc/base-rpc-client/pom.xml b/base-rpc/base-rpc-client/pom.xml index 234e19d31..87803b3f3 100644 --- a/base-rpc/base-rpc-client/pom.xml +++ b/base-rpc/base-rpc-client/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-rpc 4.0.0-SNAPSHOT @@ -13,23 +13,23 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-crdt-service - com.baidu.bifromq + org.apache.bifromq base-rpc-common - com.baidu.bifromq + org.apache.bifromq base-rpc-traffic-governor - com.baidu.bifromq + org.apache.bifromq base-rpc-grpc-inproc diff --git a/base-rpc/base-rpc-common/pom.xml b/base-rpc/base-rpc-common/pom.xml index bd63a9dbf..d2d9e309e 100644 --- a/base-rpc/base-rpc-common/pom.xml +++ b/base-rpc/base-rpc-common/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-rpc 4.0.0-SNAPSHOT @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc diff --git a/base-rpc/base-rpc-grpc-inproc/pom.xml b/base-rpc/base-rpc-grpc-inproc/pom.xml index d71560f59..7d4b61fa2 100644 --- a/base-rpc/base-rpc-grpc-inproc/pom.xml +++ b/base-rpc/base-rpc-grpc-inproc/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-rpc 4.0.0-SNAPSHOT @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider diff --git a/base-rpc/base-rpc-server/pom.xml b/base-rpc/base-rpc-server/pom.xml index ae6b34a74..3725e2c1f 100644 --- a/base-rpc/base-rpc-server/pom.xml +++ b/base-rpc/base-rpc-server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-rpc 4.0.0-SNAPSHOT @@ -13,19 +13,19 @@ - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-rpc-common - com.baidu.bifromq + org.apache.bifromq base-rpc-grpc-inproc - com.baidu.bifromq + org.apache.bifromq base-rpc-traffic-governor diff --git a/base-rpc/base-rpc-traffic-governor/pom.xml b/base-rpc/base-rpc-traffic-governor/pom.xml index 55fbce3b9..469df4712 100644 --- a/base-rpc/base-rpc-traffic-governor/pom.xml +++ b/base-rpc/base-rpc-traffic-governor/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq base-rpc 4.0.0-SNAPSHOT @@ -12,11 +12,11 @@ base-rpc-traffic-governor - com.baidu.bifromq + org.apache.bifromq base-crdt-service - com.baidu.bifromq + org.apache.bifromq base-rpc-grpc-inproc diff --git a/base-rpc/pom.xml b/base-rpc/pom.xml index 5214b1cef..578c8693e 100644 --- a/base-rpc/pom.xml +++ b/base-rpc/pom.xml @@ -18,7 +18,7 @@ 4.0.0 bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT diff --git a/base-scheduler/pom.xml b/base-scheduler/pom.xml index 85dbe135a..51e813054 100644 --- a/base-scheduler/pom.xml +++ b/base-scheduler/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-hookloader diff --git a/base-util/pom.xml b/base-util/pom.xml index ea75741d3..d157ceb13 100644 --- a/base-util/pom.xml +++ b/base-util/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/bifromq-apiserver/pom.xml b/bifromq-apiserver/pom.xml index b6b103efd..962f23b9b 100644 --- a/bifromq-apiserver/pom.xml +++ b/bifromq-apiserver/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT @@ -25,43 +25,43 @@ bifromq-apiserver - com.baidu.bifromq + org.apache.bifromq base-cluster - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-client - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client - com.baidu.bifromq + org.apache.bifromq bifromq-retain-client - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider diff --git a/bifromq-common-type/pom.xml b/bifromq-common-type/pom.xml index 8edab395f..1aba69665 100644 --- a/bifromq-common-type/pom.xml +++ b/bifromq-common-type/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 diff --git a/bifromq-deliverer/pom.xml b/bifromq-deliverer/pom.xml index eafce33f8..c6a7baf6c 100644 --- a/bifromq-deliverer/pom.xml +++ b/bifromq-deliverer/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT @@ -13,23 +13,23 @@ - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker-helper diff --git a/bifromq-dist/bifromq-dist-client/pom.xml b/bifromq-dist/bifromq-dist-client/pom.xml index 0ae8ce449..6246702ae 100644 --- a/bifromq-dist/bifromq-dist-client/pom.xml +++ b/bifromq-dist/bifromq-dist-client/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -25,35 +25,35 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-dist-rpc-definition diff --git a/bifromq-dist/bifromq-dist-coproc-proto/pom.xml b/bifromq-dist/bifromq-dist-coproc-proto/pom.xml index 6bc4ae1c0..1fc9b3b8c 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/pom.xml +++ b/bifromq-dist/bifromq-dist-coproc-proto/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -25,11 +25,11 @@ bifromq-dist-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker-schema diff --git a/bifromq-dist/bifromq-dist-rpc-definition/pom.xml b/bifromq-dist/bifromq-dist-rpc-definition/pom.xml index 90cc4c583..b71351332 100644 --- a/bifromq-dist/bifromq-dist-rpc-definition/pom.xml +++ b/bifromq-dist/bifromq-dist-rpc-definition/pom.xml @@ -15,7 +15,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -24,11 +24,11 @@ bifromq-dist-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq base-rpc-common diff --git a/bifromq-dist/bifromq-dist-server/pom.xml b/bifromq-dist/bifromq-dist-server/pom.xml index e575d6baf..39b8b6561 100644 --- a/bifromq-dist/bifromq-dist-server/pom.xml +++ b/bifromq-dist/bifromq-dist-server/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -24,61 +24,61 @@ bifromq-dist-server - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-dist-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client test - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker test diff --git a/bifromq-dist/bifromq-dist-worker-schema/pom.xml b/bifromq-dist/bifromq-dist-worker-schema/pom.xml index 540ac4914..4f801caa2 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/pom.xml +++ b/bifromq-dist/bifromq-dist-worker-schema/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -12,7 +12,7 @@ bifromq-dist-worker-schema - com.baidu.bifromq + org.apache.bifromq bifromq-util diff --git a/bifromq-dist/bifromq-dist-worker-spi/pom.xml b/bifromq-dist/bifromq-dist-worker-spi/pom.xml index fe5eb08f4..1c461cdcd 100644 --- a/bifromq-dist/bifromq-dist-worker-spi/pom.xml +++ b/bifromq-dist/bifromq-dist-worker-spi/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -13,11 +13,11 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-spi - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker-schema diff --git a/bifromq-dist/bifromq-dist-worker/pom.xml b/bifromq-dist/bifromq-dist-worker/pom.xml index 69a921ffa..47a6bed1c 100644 --- a/bifromq-dist/bifromq-dist-worker/pom.xml +++ b/bifromq-dist/bifromq-dist-worker/pom.xml @@ -11,12 +11,12 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-dist 4.0.0-SNAPSHOT @@ -25,67 +25,67 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-deliverer - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-kv-store-server - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-controller - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-dist-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-dist-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker-spi diff --git a/bifromq-dist/pom.xml b/bifromq-dist/pom.xml index fb7b8f7dd..e998d4fdc 100644 --- a/bifromq-dist/pom.xml +++ b/bifromq-dist/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 diff --git a/bifromq-inbox/bifromq-inbox-client/pom.xml b/bifromq-inbox/bifromq-inbox-client/pom.xml index e96ee1078..edcf590bf 100644 --- a/bifromq-inbox/bifromq-inbox-client/pom.xml +++ b/bifromq-inbox/bifromq-inbox-client/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -26,15 +26,15 @@ - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-rpc-definition diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/pom.xml b/bifromq-inbox/bifromq-inbox-coproc-proto/pom.xml index 98b417d7f..6b17df03d 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/pom.xml +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -25,11 +25,11 @@ bifromq-inbox-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/pom.xml b/bifromq-inbox/bifromq-inbox-rpc-definition/pom.xml index 145139fb6..db15397a8 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/pom.xml +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -24,23 +24,23 @@ bifromq-inbox-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq base-rpc-common diff --git a/bifromq-inbox/bifromq-inbox-server/pom.xml b/bifromq-inbox/bifromq-inbox-server/pom.xml index 17d2d4600..d4399bcf9 100644 --- a/bifromq-inbox/bifromq-inbox-server/pom.xml +++ b/bifromq-inbox/bifromq-inbox-server/pom.xml @@ -16,7 +16,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -25,83 +25,83 @@ bifromq-inbox-server - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-retain-client - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store-schema @@ -110,7 +110,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store test @@ -137,7 +137,7 @@ test - com.baidu.bifromq + org.apache.bifromq bifromq-dist-rpc-definition diff --git a/bifromq-inbox/bifromq-inbox-store-schema/pom.xml b/bifromq-inbox/bifromq-inbox-store-schema/pom.xml index 771b68501..eabbc1209 100644 --- a/bifromq-inbox/bifromq-inbox-store-schema/pom.xml +++ b/bifromq-inbox/bifromq-inbox-store-schema/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-util diff --git a/bifromq-inbox/bifromq-inbox-store-spi/pom.xml b/bifromq-inbox/bifromq-inbox-store-spi/pom.xml index 859134df3..9adc6c729 100644 --- a/bifromq-inbox/bifromq-inbox-store-spi/pom.xml +++ b/bifromq-inbox/bifromq-inbox-store-spi/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -13,11 +13,11 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-spi - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store-schema diff --git a/bifromq-inbox/bifromq-inbox-store/pom.xml b/bifromq-inbox/bifromq-inbox-store/pom.xml index 0a6b5b0d0..5f3774946 100644 --- a/bifromq-inbox/bifromq-inbox-store/pom.xml +++ b/bifromq-inbox/bifromq-inbox-store/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-inbox 4.0.0-SNAPSHOT @@ -26,83 +26,83 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-kv-store-server - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-controller - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-retain-client - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-client - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store-spi - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store-schema diff --git a/bifromq-inbox/pom.xml b/bifromq-inbox/pom.xml index 9c7819e70..842504732 100644 --- a/bifromq-inbox/pom.xml +++ b/bifromq-inbox/pom.xml @@ -18,7 +18,7 @@ 4.0.0 bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT pom diff --git a/bifromq-metrics/pom.xml b/bifromq-metrics/pom.xml index 1a733dfb0..2c0745476 100644 --- a/bifromq-metrics/pom.xml +++ b/bifromq-metrics/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/pom.xml b/bifromq-mqtt/bifromq-mqtt-broker-client/pom.xml index 886230e61..c176538b8 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/pom.xml +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt 4.0.0-SNAPSHOT @@ -26,19 +26,19 @@ - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-rpc-definition diff --git a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/pom.xml b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/pom.xml index f284c6472..dab2c5de2 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/pom.xml +++ b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt 4.0.0-SNAPSHOT @@ -26,19 +26,19 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker - com.baidu.bifromq + org.apache.bifromq base-rpc-common diff --git a/bifromq-mqtt/bifromq-mqtt-server/pom.xml b/bifromq-mqtt/bifromq-mqtt-server/pom.xml index 40701fd81..9cbd1640a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/pom.xml +++ b/bifromq-mqtt/bifromq-mqtt-server/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt 4.0.0-SNAPSHOT @@ -26,67 +26,67 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-client-balancer - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-client - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-retain-client @@ -115,52 +115,52 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service test - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker-helper test - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store test - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-server test - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store test - com.baidu.bifromq + org.apache.bifromq bifromq-retain-server test - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-client test - com.baidu.bifromq + org.apache.bifromq bifromq-dist-server test - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker test - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-server test diff --git a/bifromq-mqtt/pom.xml b/bifromq-mqtt/pom.xml index 12ea11e97..d4f5d7758 100644 --- a/bifromq-mqtt/pom.xml +++ b/bifromq-mqtt/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 diff --git a/bifromq-plugin/bifromq-plugin-archetype/pom.xml b/bifromq-plugin/bifromq-plugin-archetype/pom.xml index af0ae4c37..5de22a25e 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/pom.xml +++ b/bifromq-plugin/bifromq-plugin-archetype/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/pom.xml b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/pom.xml index b123f7c9b..adaa2a4bf 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/pom.xml +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context @@ -21,7 +21,7 @@ plugin-context - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/pom.xml b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/pom.xml index b0dafed92..f564e54f5 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/pom.xml +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -35,11 +35,11 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-main diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/pom.xml b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/pom.xml index 965eed203..18e2717ae 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/pom.xml +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/pom.xml index 68566697d..fcd1f13e2 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/pom.xml +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/pom.xml @@ -66,37 +66,37 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context ${bifromq.version} provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-main ${bifromq.version} provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider ${bifromq.version} provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector ${bifromq.version} provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider ${bifromq.version} provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler ${bifromq.version} provided diff --git a/bifromq-plugin/bifromq-plugin-auth-provider-helper/pom.xml b/bifromq-plugin/bifromq-plugin-auth-provider-helper/pom.xml index 11376818f..cf4b28777 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider-helper/pom.xml +++ b/bifromq-plugin/bifromq-plugin-auth-provider-helper/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops @@ -34,15 +34,15 @@ caffeine - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper diff --git a/bifromq-plugin/bifromq-plugin-auth-provider/pom.xml b/bifromq-plugin/bifromq-plugin-auth-provider/pom.xml index c3b5a998c..5299061af 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider/pom.xml +++ b/bifromq-plugin/bifromq-plugin-auth-provider/pom.xml @@ -12,13 +12,13 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -27,11 +27,11 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-client-balancer-helper/pom.xml b/bifromq-plugin/bifromq-plugin-client-balancer-helper/pom.xml index 1487cb19f..360e388eb 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer-helper/pom.xml +++ b/bifromq-plugin/bifromq-plugin-client-balancer-helper/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-client-balancer diff --git a/bifromq-plugin/bifromq-plugin-client-balancer/pom.xml b/bifromq-plugin/bifromq-plugin-client-balancer/pom.xml index c5ac7763d..11e5bbaf7 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer/pom.xml +++ b/bifromq-plugin/bifromq-plugin-client-balancer/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -12,11 +12,11 @@ bifromq-plugin-client-balancer - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-context/pom.xml b/bifromq-plugin/bifromq-plugin-context/pom.xml index 41a49a71b..cad67fda7 100644 --- a/bifromq-plugin/bifromq-plugin-context/pom.xml +++ b/bifromq-plugin/bifromq-plugin-context/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/pom.xml b/bifromq-plugin/bifromq-plugin-event-collector-helper/pom.xml index 26a771658..ef60bbb70 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/pom.xml +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq bifromq-metrics @@ -46,7 +46,7 @@ reflections - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector diff --git a/bifromq-plugin/bifromq-plugin-event-collector/pom.xml b/bifromq-plugin/bifromq-plugin-event-collector/pom.xml index 2550e7186..39cb47921 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/pom.xml +++ b/bifromq-plugin/bifromq-plugin-event-collector/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -25,11 +25,11 @@ bifromq-plugin-event-collector - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-main/pom.xml b/bifromq-plugin/bifromq-plugin-main/pom.xml index ef733e32f..bdfae1b0e 100644 --- a/bifromq-plugin/bifromq-plugin-main/pom.xml +++ b/bifromq-plugin/bifromq-plugin-main/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -12,7 +12,7 @@ bifromq-plugin-main - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-manager/pom.xml b/bifromq-plugin/bifromq-plugin-manager/pom.xml index e9b177814..89be90997 100644 --- a/bifromq-plugin/bifromq-plugin-manager/pom.xml +++ b/bifromq-plugin/bifromq-plugin-manager/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> bifromq-plugin - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-main diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/pom.xml b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/pom.xml index e0be5fc7f..f21b7c8aa 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/pom.xml +++ b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler/pom.xml b/bifromq-plugin/bifromq-plugin-resource-throttler/pom.xml index dbf34894f..3d812bdf4 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler/pom.xml +++ b/bifromq-plugin/bifromq-plugin-resource-throttler/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -12,7 +12,7 @@ bifromq-plugin-resource-throttler - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/pom.xml b/bifromq-plugin/bifromq-plugin-setting-provider-helper/pom.xml index 55f33c604..b2e7cd333 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/pom.xml +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider diff --git a/bifromq-plugin/bifromq-plugin-setting-provider/pom.xml b/bifromq-plugin/bifromq-plugin-setting-provider/pom.xml index 06a15a040..27a0407d5 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider/pom.xml +++ b/bifromq-plugin/bifromq-plugin-setting-provider/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -25,7 +25,7 @@ bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context diff --git a/bifromq-plugin/bifromq-plugin-sub-broker-helper/pom.xml b/bifromq-plugin/bifromq-plugin-sub-broker-helper/pom.xml index 585e853d9..c7a4e7464 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker-helper/pom.xml +++ b/bifromq-plugin/bifromq-plugin-sub-broker-helper/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker diff --git a/bifromq-plugin/bifromq-plugin-sub-broker/pom.xml b/bifromq-plugin/bifromq-plugin-sub-broker/pom.xml index 447230f00..2eecc69bf 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker/pom.xml +++ b/bifromq-plugin/bifromq-plugin-sub-broker/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-plugin 4.0.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-common-type diff --git a/bifromq-plugin/pom.xml b/bifromq-plugin/pom.xml index a720d41b6..5168aaf27 100644 --- a/bifromq-plugin/pom.xml +++ b/bifromq-plugin/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 diff --git a/bifromq-retain/bifromq-retain-client/pom.xml b/bifromq-retain/bifromq-retain-client/pom.xml index b82f2433c..77fa9e0b7 100644 --- a/bifromq-retain/bifromq-retain-client/pom.xml +++ b/bifromq-retain/bifromq-retain-client/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -26,15 +26,15 @@ - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-retain-rpc-definition diff --git a/bifromq-retain/bifromq-retain-coproc-proto/pom.xml b/bifromq-retain/bifromq-retain-coproc-proto/pom.xml index 7081c606f..e28a37f1c 100644 --- a/bifromq-retain/bifromq-retain-coproc-proto/pom.xml +++ b/bifromq-retain/bifromq-retain-coproc-proto/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-common-type diff --git a/bifromq-retain/bifromq-retain-gc/pom.xml b/bifromq-retain/bifromq-retain-gc/pom.xml index ccd33cb8e..dc6d223f5 100644 --- a/bifromq-retain/bifromq-retain-gc/pom.xml +++ b/bifromq-retain/bifromq-retain-gc/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -13,15 +13,15 @@ - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq bifromq-retain-coproc-proto diff --git a/bifromq-retain/bifromq-retain-rpc-definition/pom.xml b/bifromq-retain/bifromq-retain-rpc-definition/pom.xml index 1b0bf2e20..aa9ba39c3 100644 --- a/bifromq-retain/bifromq-retain-rpc-definition/pom.xml +++ b/bifromq-retain/bifromq-retain-rpc-definition/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq base-rpc-common diff --git a/bifromq-retain/bifromq-retain-server/pom.xml b/bifromq-retain/bifromq-retain-server/pom.xml index b8d2fa791..b5f498534 100644 --- a/bifromq-retain/bifromq-retain-server/pom.xml +++ b/bifromq-retain/bifromq-retain-server/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -25,67 +25,67 @@ bifromq-retain-server - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-deliverer - com.baidu.bifromq + org.apache.bifromq bifromq-retain-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store-schema - com.baidu.bifromq + org.apache.bifromq bifromq-retain-gc - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider-helper - com.baidu.bifromq + org.apache.bifromq bifromq-retain-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops diff --git a/bifromq-retain/bifromq-retain-store-schema/pom.xml b/bifromq-retain/bifromq-retain-store-schema/pom.xml index 45acb15dc..8e3ce16a2 100644 --- a/bifromq-retain/bifromq-retain-store-schema/pom.xml +++ b/bifromq-retain/bifromq-retain-store-schema/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -12,11 +12,11 @@ bifromq-retain-store-schema - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-util diff --git a/bifromq-retain/bifromq-retain-store-spi/pom.xml b/bifromq-retain/bifromq-retain-store-spi/pom.xml index 455b3eb44..0bc7f6e73 100644 --- a/bifromq-retain/bifromq-retain-store-spi/pom.xml +++ b/bifromq-retain/bifromq-retain-store-spi/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -13,11 +13,11 @@ - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-spi - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store-schema diff --git a/bifromq-retain/bifromq-retain-store/pom.xml b/bifromq-retain/bifromq-retain-store/pom.xml index 994f2555c..a15e9df06 100644 --- a/bifromq-retain/bifromq-retain-store/pom.xml +++ b/bifromq-retain/bifromq-retain-store/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-retain 4.0.0-SNAPSHOT @@ -25,75 +25,75 @@ bifromq-retain-store - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-util - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-kv-store-server - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-controller - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-retain-coproc-proto - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store-schema - com.baidu.bifromq + org.apache.bifromq bifromq-retain-gc - com.baidu.bifromq + org.apache.bifromq bifromq-retain-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store-spi - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops diff --git a/bifromq-retain/pom.xml b/bifromq-retain/pom.xml index 973bc699a..25d70b6a9 100644 --- a/bifromq-retain/pom.xml +++ b/bifromq-retain/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 diff --git a/bifromq-session-dict/bifromq-session-dict-client/pom.xml b/bifromq-session-dict/bifromq-session-dict-client/pom.xml index 8b3948a72..58f411c24 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/pom.xml +++ b/bifromq-session-dict/bifromq-session-dict-client/pom.xml @@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict 4.0.0-SNAPSHOT @@ -25,19 +25,19 @@ - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-rpc-definition diff --git a/bifromq-session-dict/bifromq-session-dict-rpc-definition/pom.xml b/bifromq-session-dict/bifromq-session-dict-rpc-definition/pom.xml index e48973cb6..7d295c26d 100644 --- a/bifromq-session-dict/bifromq-session-dict-rpc-definition/pom.xml +++ b/bifromq-session-dict/bifromq-session-dict-rpc-definition/pom.xml @@ -11,12 +11,12 @@ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict 4.0.0-SNAPSHOT @@ -25,15 +25,15 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops - com.baidu.bifromq + org.apache.bifromq base-rpc-common diff --git a/bifromq-session-dict/bifromq-session-dict-server/pom.xml b/bifromq-session-dict/bifromq-session-dict-server/pom.xml index ffe582d54..e6a6bef32 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/pom.xml +++ b/bifromq-session-dict/bifromq-session-dict-server/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict 4.0.0-SNAPSHOT @@ -26,31 +26,31 @@ - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq bifromq-common-type - com.baidu.bifromq + org.apache.bifromq bifromq-util - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-client diff --git a/bifromq-session-dict/pom.xml b/bifromq-session-dict/pom.xml index 5f2277454..76df77e37 100644 --- a/bifromq-session-dict/pom.xml +++ b/bifromq-session-dict/pom.xml @@ -12,11 +12,11 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT diff --git a/bifromq-sysprops/pom.xml b/bifromq-sysprops/pom.xml index c0ebd6d7f..d31cc5923 100644 --- a/bifromq-sysprops/pom.xml +++ b/bifromq-sysprops/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT @@ -26,7 +26,7 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider diff --git a/bifromq-util/pom.xml b/bifromq-util/pom.xml index 00cacb549..03cd12a19 100644 --- a/bifromq-util/pom.xml +++ b/bifromq-util/pom.xml @@ -1,10 +1,10 @@ - 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT @@ -13,7 +13,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-common-type diff --git a/build/build-bifromq-starters/pom.xml b/build/build-bifromq-starters/pom.xml index e7df9c312..3e2ecb80e 100644 --- a/build/build-bifromq-starters/pom.xml +++ b/build/build-bifromq-starters/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - build - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 @@ -26,11 +26,11 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service @@ -68,86 +68,86 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-dist-server - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-client - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-server - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-server - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-server - com.baidu.bifromq + org.apache.bifromq bifromq-retain-server - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store - com.baidu.bifromq + org.apache.bifromq bifromq-apiserver - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-manager - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-client-balancer-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker-helper - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops diff --git a/build/build-plugin-demo/pom.xml b/build/build-plugin-demo/pom.xml index 4d16dc90f..b9806cbbe 100644 --- a/build/build-plugin-demo/pom.xml +++ b/build/build-plugin-demo/pom.xml @@ -16,7 +16,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.baidu.bifromq + org.apache.bifromq build 4.0.0-SNAPSHOT @@ -26,36 +26,36 @@ bifromq-demo-plugin - com.baidu.demo.plugin.DemoPlugin + org.apache.demo.plugin.DemoPlugin - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-main provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector provided - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler provided diff --git a/build/pom.xml b/build/pom.xml index b30aa4656..cd135fd74 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -12,13 +12,13 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - 4.0.0 bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT pom diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 3a21511fc..a734939c1 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -12,12 +12,12 @@ ~ See the License for the specific language governing permissions and limitations under the License. --> - bifromq-parent - com.baidu.bifromq + org.apache.bifromq 4.0.0-SNAPSHOT 4.0.0 @@ -27,163 +27,163 @@ - com.baidu.bifromq + org.apache.bifromq base-cluster - com.baidu.bifromq + org.apache.bifromq base-hookloader - com.baidu.bifromq + org.apache.bifromq base-hlc - com.baidu.bifromq + org.apache.bifromq base-kv-raft-type - com.baidu.bifromq + org.apache.bifromq base-kv-local-engine - com.baidu.bifromq + org.apache.bifromq base-kv-raft - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-controller - com.baidu.bifromq + org.apache.bifromq base-kv-store-client - com.baidu.bifromq + org.apache.bifromq base-kv-store-rpc-definition - com.baidu.bifromq + org.apache.bifromq base-kv-store-server - com.baidu.bifromq + org.apache.bifromq base-rpc-client - com.baidu.bifromq + org.apache.bifromq base-rpc-server - com.baidu.bifromq + org.apache.bifromq base-rpc-traffic-governor - com.baidu.bifromq + org.apache.bifromq base-scheduler - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client - com.baidu.bifromq + org.apache.bifromq bifromq-dist-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-dist-server - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-server - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store - com.baidu.bifromq + org.apache.bifromq bifromq-metrics - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-client - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-server - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-client-balancer-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker-helper - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider-helper - com.baidu.bifromq + org.apache.bifromq bifromq-retain-client - com.baidu.bifromq + org.apache.bifromq bifromq-retain-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-retain-server - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-client - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-rpc-definition - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-server - com.baidu.bifromq + org.apache.bifromq bifromq-apiserver diff --git a/pom.xml b/pom.xml index b83aefeaa..7cd939b49 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT @@ -82,13 +82,13 @@ - bifromq Developer List + BifroMQ Developer List dev@bifromq.apache.org dev-subscribe@bifromq.apache.org dev-unsubscribe@bifromq.apache.org - bifromq Commits + BifroMQ Commits commits@bifromq.apache.org commits-subscribe@bifromq.apache.org commits-unsubscribe@bifromq.apache.org @@ -160,390 +160,390 @@ - com.baidu.bifromq + org.apache.bifromq base-env-provider ${project.version} - com.baidu.bifromq + org.apache.bifromq base-env-provider-spi ${project.version} - com.baidu.bifromq + org.apache.bifromq base-hlc ${project.version} - com.baidu.bifromq + org.apache.bifromq base-logger ${project.version} - com.baidu.bifromq + org.apache.bifromq base-rpc-grpc-inproc ${project.version} - com.baidu.bifromq + org.apache.bifromq base-rpc-common ${project.version} - com.baidu.bifromq + org.apache.bifromq base-rpc-client ${project.version} - com.baidu.bifromq + org.apache.bifromq base-rpc-server ${project.version} - com.baidu.bifromq + org.apache.bifromq base-rpc-traffic-governor ${project.version} - com.baidu.bifromq + org.apache.bifromq base-cluster ${project.version} - com.baidu.bifromq + org.apache.bifromq base-crdt-store ${project.version} - com.baidu.bifromq + org.apache.bifromq base-crdt-service ${project.version} - com.baidu.bifromq + org.apache.bifromq base-scheduler ${project.version} - com.baidu.bifromq + org.apache.bifromq base-hookloader ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-type-proto ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-raft-type ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-raft ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-local-engine ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-meta-service ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-store-rpc-definition ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-store-client ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-store-server ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-spi ${project.version} - com.baidu.bifromq + org.apache.bifromq base-kv-store-balance-controller ${project.version} - com.baidu.bifromq + org.apache.bifromq base-util ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-util ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-common-type ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-metrics ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-sysprops ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-auth-provider-helper ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-client-balancer ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-client-balancer-helper ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-event-collector-helper ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-resource-throttler-helper ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-setting-provider-helper ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-sub-broker-helper ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-manager ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-context ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-main ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-plugin-archetype ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-deliverer ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-client ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-coproc-proto ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-rpc-definition ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-gc ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store-spi ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store-schema ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-store ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-retain-server ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-client ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-coproc-proto ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-rpc-definition ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store-spi ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-store-schema ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-inbox-server ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-client ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker-spi ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-server ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-rpc-definition ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-coproc-proto ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-dist-worker-schema ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-client ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-server ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-session-dict-rpc-definition ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-client ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-broker-rpc-definition ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-mqtt-server ${project.version} - com.baidu.bifromq + org.apache.bifromq build-plugin-demo ${project.version} - com.baidu.bifromq + org.apache.bifromq bifromq-apiserver ${project.version} @@ -734,7 +734,7 @@ test - com.baidu.bifromq + org.apache.bifromq testsuites ${project.version} @@ -907,7 +907,7 @@ - com.baidu.bifromq + org.apache.bifromq testsuites ${project.version} @@ -1007,6 +1007,12 @@ org.apache.maven.plugins maven-archetype-plugin ${maven.archetype.plugin.version} + + + default-integration-test + none + + diff --git a/testsuites/pom.xml b/testsuites/pom.xml index fe4941bb9..405e6ff78 100644 --- a/testsuites/pom.xml +++ b/testsuites/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baidu.bifromq + org.apache.bifromq bifromq-parent 4.0.0-SNAPSHOT From 17152ca3631c9f942eb2830fae8a446bd4b10330 Mon Sep 17 00:00:00 2001 From: Yonny Hao Date: Sat, 31 May 2025 10:33:12 +0800 Subject: [PATCH 2/2] Rename package: com.baidu.bifromq -> org.apache.bifromq --- README.md | 11 +- README.zh_Hans.md | 4 +- .../bifromq/basecluster/AgentHost.java | 46 ++-- .../bifromq/basecluster/AgentHostOptions.java | 4 +- .../bifromq/basecluster/IAgentHost.java | 16 +- .../basecluster/fd/DirectProbingInfo.java | 4 +- .../basecluster/fd/FailureDetector.java | 16 +- .../basecluster/fd/FailureDetectorMath.java | 2 +- .../basecluster/fd/IFailureDetector.java | 2 +- .../basecluster/fd/IProbingTarget.java | 4 +- .../fd/IProbingTargetSelector.java | 2 +- .../basecluster/memberlist/AutoDropper.java | 30 +-- .../basecluster/memberlist/AutoHealer.java | 18 +- .../basecluster/memberlist/AutoSeeder.java | 10 +- .../basecluster/memberlist/CRDTUtil.java | 14 +- .../memberlist/HostAddressResolver.java | 4 +- .../memberlist/HostMemberList.java | 54 ++--- .../memberlist/IHostAddressResolver.java | 4 +- .../memberlist/IHostMemberList.java | 8 +- .../memberlist/MemberSelector.java | 6 +- .../basecluster/memberlist/agent/Agent.java | 18 +- .../agent/AgentAddressProvider.java | 8 +- .../memberlist/agent/AgentMember.java | 24 +- .../memberlist/agent/AgentMessenger.java | 14 +- .../memberlist/agent/CRDTUtil.java | 16 +- .../basecluster/memberlist/agent/IAgent.java | 8 +- .../agent/IAgentAddressProvider.java | 4 +- .../memberlist/agent/IAgentMember.java | 8 +- .../memberlist/agent/IAgentMessenger.java | 8 +- .../basecluster/messenger/Gossiper.java | 4 +- .../basecluster/messenger/IMessenger.java | 4 +- .../basecluster/messenger/IRecipient.java | 2 +- .../messenger/IRecipientSelector.java | 2 +- .../messenger/MessageEnvelope.java | 4 +- .../basecluster/messenger/Messenger.java | 14 +- .../messenger/MessengerMessageEnvelope.java | 4 +- .../messenger/MessengerOptions.java | 2 +- .../messenger/MessengerTransport.java | 8 +- .../transport/AbstractTransport.java | 6 +- .../basecluster/transport/ITransport.java | 2 +- .../basecluster/transport/PacketEnvelope.java | 2 +- .../basecluster/transport/ProbeHandler.java | 2 +- .../basecluster/transport/TCPTransport.java | 8 +- .../basecluster/transport/Transport.java | 2 +- .../basecluster/transport/UDPTransport.java | 8 +- .../bifromq/basecluster/util/RandomUtils.java | 2 +- .../proto/basecluster/ClusterMessage.proto | 2 +- .../proto/basecluster/agent/AgentMember.proto | 2 +- .../basecluster/agent/AgentMessage.proto | 2 +- .../src/main/proto/basecluster/fd/Ack.proto | 2 +- .../src/main/proto/basecluster/fd/Nack.proto | 2 +- .../src/main/proto/basecluster/fd/Ping.proto | 2 +- .../main/proto/basecluster/fd/PingReq.proto | 2 +- .../proto/basecluster/membership/Doubt.proto | 2 +- .../basecluster/membership/Endorse.proto | 2 +- .../proto/basecluster/membership/Fail.proto | 2 +- .../basecluster/membership/HostMember.proto | 2 +- .../proto/basecluster/membership/Join.proto | 2 +- .../proto/basecluster/membership/Quit.proto | 2 +- .../messenger/MessengerMessage.proto | 2 +- .../proto/basecluster/transport/Packet.proto | 2 +- .../bifromq/basecluster/AgentHostNode1.java | 6 +- .../bifromq/basecluster/AgentHostNode2.java | 6 +- .../bifromq/basecluster/AgentHostNode3.java | 6 +- .../bifromq/basecluster/AgentHostTest.java | 2 +- .../bifromq/basecluster/AgentHostsTest.java | 18 +- .../bifromq/basecluster/AgentTestCluster.java | 16 +- .../basecluster/AgentTestTemplate.java | 8 +- .../bifromq/basecluster/MockNetwork.java | 6 +- .../basecluster/annotation/StoreCfg.java | 2 +- .../basecluster/annotation/StoreCfgs.java | 2 +- .../basecluster/fd/DirectProbingInfoTest.java | 2 +- .../fd/FailureDetectorMathTest.java | 4 +- .../basecluster/fd/FailureDetectorTest.java | 16 +- .../bifromq/basecluster/fd/Fixtures.java | 12 +- .../memberlist/AutoHealerTest.java | 32 +-- .../memberlist/AutoSeederTest.java | 18 +- .../basecluster/memberlist/Fixtures.java | 22 +- .../memberlist/HostAddressResolverTest.java | 4 +- .../memberlist/HostMemberListTest.java | 52 ++--- .../memberlist/MemberSelectorTest.java | 6 +- .../agent/AgentHostProviderTest.java | 8 +- .../memberlist/agent/AgentMemberTest.java | 28 +-- .../memberlist/agent/AgentMessengerTest.java | 18 +- .../memberlist/agent/AgentTest.java | 26 +-- .../memberlist/agent/MockUtil.java | 20 +- .../basecluster/messenger/GossiperTest.java | 4 +- .../messenger/MessengerFuncTest.java | 12 +- .../basecluster/messenger/MessengerTest.java | 4 +- .../messenger/MessengerTransportTest.java | 12 +- .../basecluster/transport/TCPReceiver.java | 2 +- .../basecluster/transport/TCPSender.java | 2 +- .../transport/TCPTransportFuncTest.java | 2 +- .../transport/TCPTransportTest.java | 2 +- .../basecluster/transport/TransportTest.java | 2 +- .../basecluster/transport/UDPReceiver.java | 2 +- .../basecluster/transport/UDPSender.java | 2 +- .../transport/UDPTransportFuncTest.java | 4 +- .../transport/UDPTransportTest.java | 2 +- .../basecluster/utils/RandomUtilTest.java | 4 +- .../bifromq/basecrdt/service/AgentUtil.java | 4 +- .../bifromq/basecrdt/service/CRDTCluster.java | 24 +- .../bifromq/basecrdt/service/CRDTService.java | 22 +- .../basecrdt/service/CRDTServiceOptions.java | 4 +- .../basecrdt/service/ICRDTService.java | 10 +- .../basecrdt/service/BasicCRDTObjectTest.java | 14 +- .../basecrdt/service/CCounterTest.java | 14 +- .../service/CRDTServiceTestCluster.java | 6 +- .../service/CRDTServiceTestTemplate.java | 8 +- .../service/annotation/ServiceCfg.java | 2 +- .../service/annotation/ServiceCfgs.java | 2 +- .../bifromq/basecrdt/ReplicaLogger.java | 8 +- .../basecrdt/core/api/AWORSetOperation.java | 2 +- .../basecrdt/core/api/CCounterOperation.java | 2 +- .../bifromq/basecrdt/core/api/CRDTURI.java | 2 +- .../basecrdt/core/api/CausalCRDTType.java | 2 +- .../basecrdt/core/api/DWFlagOperation.java | 2 +- .../basecrdt/core/api/EWFlagOperation.java | 2 +- .../bifromq/basecrdt/core/api/IAWORSet.java | 2 +- .../basecrdt/core/api/IAWORSetInflater.java | 2 +- .../bifromq/basecrdt/core/api/ICCounter.java | 2 +- .../basecrdt/core/api/ICCounterInflater.java | 2 +- .../basecrdt/core/api/ICRDTOperation.java | 2 +- .../basecrdt/core/api/ICausalCRDT.java | 4 +- .../core/api/ICausalCRDTInflater.java | 6 +- .../bifromq/basecrdt/core/api/IDWFlag.java | 2 +- .../basecrdt/core/api/IDWFlagInflater.java | 2 +- .../bifromq/basecrdt/core/api/IEWFlag.java | 2 +- .../basecrdt/core/api/IEWFlagInflater.java | 2 +- .../bifromq/basecrdt/core/api/IMVReg.java | 2 +- .../basecrdt/core/api/IMVRegInflater.java | 2 +- .../bifromq/basecrdt/core/api/IORMap.java | 2 +- .../basecrdt/core/api/IORMapInflater.java | 2 +- .../bifromq/basecrdt/core/api/IRWORSet.java | 2 +- .../basecrdt/core/api/IRWORSetInflater.java | 2 +- .../basecrdt/core/api/MVRegOperation.java | 2 +- .../basecrdt/core/api/ORMapOperation.java | 2 +- .../basecrdt/core/api/RWORSetOperation.java | 2 +- .../core/exception/CRDTCloseException.java | 2 +- .../core/exception/CRDTEngineException.java | 2 +- .../core/exception/CRDTNotFoundException.java | 2 +- .../basecrdt/core/internal/AWORSet.java | 8 +- .../internal/AWORSetCoalesceOperation.java | 6 +- .../core/internal/AWORSetInflater.java | 12 +- .../basecrdt/core/internal/CCounter.java | 12 +- .../internal/CCounterCoalesceOperation.java | 8 +- .../core/internal/CCounterInflater.java | 12 +- .../basecrdt/core/internal/CausalCRDT.java | 10 +- .../core/internal/CausalCRDTInflater.java | 22 +- .../internal/CausalCRDTInflaterFactory.java | 8 +- .../core/internal/CoalesceOperation.java | 4 +- .../basecrdt/core/internal/DWFlag.java | 10 +- .../internal/DWFlagCoalesceOperation.java | 6 +- .../core/internal/DWFlagInflater.java | 12 +- .../basecrdt/core/internal/DotFunc.java | 6 +- .../basecrdt/core/internal/DotMap.java | 6 +- .../basecrdt/core/internal/DotSet.java | 6 +- .../basecrdt/core/internal/DotStore.java | 4 +- .../basecrdt/core/internal/EWFlag.java | 10 +- .../internal/EWFlagCoalesceOperation.java | 6 +- .../core/internal/EWFlagInflater.java | 12 +- .../core/internal/EventHistoryUtil.java | 2 +- .../core/internal/ICoalesceOperation.java | 6 +- .../basecrdt/core/internal/IDotFunc.java | 4 +- .../basecrdt/core/internal/IDotMap.java | 2 +- .../basecrdt/core/internal/IDotSet.java | 2 +- .../basecrdt/core/internal/IDotStore.java | 4 +- .../core/internal/IReplicaStateLattice.java | 6 +- .../internal/InMemReplicaStateLattice.java | 20 +- .../bifromq/basecrdt/core/internal/MVReg.java | 8 +- .../core/internal/MVRegCoalesceOperation.java | 12 +- .../basecrdt/core/internal/MVRegInflater.java | 12 +- .../bifromq/basecrdt/core/internal/ORMap.java | 42 ++-- .../core/internal/ORMapCoalesceOperation.java | 24 +- .../basecrdt/core/internal/ORMapInflater.java | 12 +- .../basecrdt/core/internal/ORMapUtil.java | 4 +- .../basecrdt/core/internal/ProtoUtils.java | 14 +- .../basecrdt/core/internal/RWORSet.java | 8 +- .../internal/RWORSetCoalesceOperation.java | 12 +- .../core/internal/RWORSetInflater.java | 12 +- .../basecrdt/core/internal/VarLong.java | 2 +- .../basecrdt/core/util/LatticeIndexUtil.java | 2 +- .../bifromq/basecrdt/store/AntiEntropy.java | 16 +- .../basecrdt/store/AntiEntropyManager.java | 20 +- .../bifromq/basecrdt/store/CRDTStore.java | 38 ++-- .../basecrdt/store/CRDTStoreOptions.java | 4 +- .../basecrdt/store/CompressAlgorithm.java | 2 +- .../bifromq/basecrdt/store/ICRDTStore.java | 10 +- .../basecrdt/store/MessagePayloadUtil.java | 12 +- .../basecrdt/store/NeighborMessage.java | 4 +- .../bifromq/basecrdt/store/PartialMesh.java | 2 +- .../basecrdt/store/ReplicaIdGenerator.java | 6 +- .../basecrdt/store/compressor/Compressor.java | 4 +- .../store/compressor/GzipCompressor.java | 2 +- .../store/compressor/NoopCompressor.java | 2 +- .../bifromq/basecrdt/util/Formatter.java | 12 +- .../bifromq/basecrdt/util/ProtoUtil.java | 4 +- .../proto/basecrdt/CRDTStoreMessage.proto | 2 +- .../src/main/proto/basecrdt/Dot.proto | 2 +- .../src/main/proto/basecrdt/Replica.proto | 2 +- .../apache}/bifromq/basecrdt/LoggerTest.java | 10 +- .../core/benchmark/CCounterBenchmark.java | 14 +- .../core/benchmark/CCounterMapBenchmark.java | 16 +- .../core/benchmark/CRDTBenchmarkTemplate.java | 4 +- .../basecrdt/core/internal/AWORSetTest.java | 12 +- .../basecrdt/core/internal/CCounterTest.java | 14 +- .../basecrdt/core/internal/CRDTTest.java | 6 +- .../basecrdt/core/internal/DWFlagTest.java | 12 +- .../basecrdt/core/internal/DotFuncTest.java | 8 +- .../basecrdt/core/internal/DotMapTest.java | 10 +- .../basecrdt/core/internal/DotSetTest.java | 6 +- .../basecrdt/core/internal/EWFlagTest.java | 12 +- .../core/internal/EventHistoryUtilTest.java | 8 +- .../InMemReplicaStateLatticeTest.java | 18 +- .../basecrdt/core/internal/MVRegTest.java | 12 +- .../basecrdt/core/internal/ORMapTest.java | 40 ++-- .../basecrdt/core/internal/RWORSetTest.java | 12 +- .../basecrdt/core/internal/TestUtil.java | 2 +- .../basecrdt/core/internal/VarLongTest.java | 2 +- .../core/util/LatticeIndexUtilTest.java | 2 +- .../bifromq/basecrdt/store/CRDTStoreTest.java | 26 +-- .../basecrdt/store/CRDTStoreTestCluster.java | 12 +- .../basecrdt/store/CRDTStoreTestTemplate.java | 6 +- .../basecrdt/store/PartialMeshTest.java | 2 +- .../basecrdt/store/annotation/StoreCfg.java | 2 +- .../basecrdt/store/annotation/StoreCfgs.java | 2 +- .../store/compressor/CompressorTest.java | 2 +- .../apache}/bifromq/baseenv/IEnvProvider.java | 2 +- .../apache}/bifromq/baseenv/EnvProvider.java | 4 +- .../apache}/bifromq/baseenv/MemUsage.java | 2 +- .../apache}/bifromq/baseenv/NettyEnv.java | 2 +- .../bifromq/baseenv/ZeroCopyParser.java | 2 +- .../bifromq/baseenv/EnvProviderTest.java | 2 +- .../bifromq/baseenv/TestEnvProvider.java | 2 +- .../baseenv/benchmark/MemUsageBenchmark.java | 4 +- .../com.baidu.bifromq.baseenv.IEnvProvider | 1 - .../org.apache.bifromq.baseenv.IEnvProvider | 14 ++ .../apache}/bifromq/basehlc/HLC.java | 2 +- .../apache}/bifromq/basehlc/HLCTest.java | 2 +- .../basehlc/benchmark/HLCBenchmark.java | 4 +- .../basehookloader/BaseHookLoader.java | 2 +- .../basehookloader/BaseHookLoaderTest.java | 2 +- .../bifromq/basehookloader/ITestHookAPI.java | 2 +- .../bifromq/basehookloader/TestHookImpl.java | 2 +- ...pache.bifromq.basehookloader.ITestHookAPI} | 2 +- .../basekv/localengine/AbstractKVEngine.java | 6 +- .../localengine/AbstractKVSpaceReader.java | 6 +- .../ICPableKVEngineConfigurator.java | 2 +- .../basekv/localengine/ICPableKVSpace.java | 2 +- .../bifromq/basekv/localengine/IKVEngine.java | 2 +- .../localengine/IKVEngineConfigurator.java | 2 +- .../bifromq/basekv/localengine/IKVSpace.java | 2 +- .../localengine/IKVSpaceCheckpoint.java | 2 +- .../localengine/IKVSpaceDataUpdatable.java | 4 +- .../basekv/localengine/IKVSpaceIterator.java | 2 +- .../basekv/localengine/IKVSpaceMetadata.java | 4 +- .../IKVSpaceMetadataUpdatable.java | 2 +- .../localengine/IKVSpaceMetadataWriter.java | 2 +- .../basekv/localengine/IKVSpaceReader.java | 4 +- .../basekv/localengine/IKVSpaceWriteable.java | 2 +- .../basekv/localengine/IKVSpaceWriter.java | 2 +- .../basekv/localengine/ISyncContext.java | 2 +- .../IWALableKVEngineConfigurator.java | 2 +- .../basekv/localengine/IWALableKVSpace.java | 2 +- .../basekv/localengine/KVEngineException.java | 2 +- .../basekv/localengine/KVEngineFactory.java | 16 +- .../basekv/localengine/KVSpaceDescriptor.java | 2 +- .../basekv/localengine/SyncContext.java | 2 +- .../memory/InMemCPableKVEngine.java | 4 +- .../memory/InMemCPableKVSpace.java | 12 +- .../localengine/memory/InMemKVEngine.java | 4 +- .../memory/InMemKVEngineConfigurator.java | 6 +- .../localengine/memory/InMemKVSpace.java | 14 +- .../memory/InMemKVSpaceCheckpoint.java | 6 +- .../memory/InMemKVSpaceIterator.java | 6 +- .../memory/InMemKVSpaceReader.java | 10 +- .../memory/InMemKVSpaceWriter.java | 18 +- .../memory/InMemKVSpaceWriterHelper.java | 6 +- .../memory/InMemWALableKVEngine.java | 4 +- .../memory/InMemWALableKVSpace.java | 6 +- .../metrics/GeneralKVSpaceMetric.java | 2 +- .../localengine/metrics/IKVSpaceMetric.java | 2 +- .../localengine/metrics/KVSpaceMeters.java | 2 +- .../localengine/metrics/KVSpaceOpMeters.java | 6 +- .../localengine/rocksdb/AutoCleaner.java | 2 +- .../rocksdb/IRocksDBKVSpaceCheckpoint.java | 4 +- .../rocksdb/IWriteStatsRecorder.java | 2 +- .../basekv/localengine/rocksdb/Keys.java | 2 +- .../rocksdb/NoopWriteStatsRecorder.java | 2 +- .../rocksdb/RocksDBCPableKVEngine.java | 6 +- .../RocksDBCPableKVEngineConfigurator.java | 4 +- .../rocksdb/RocksDBCPableKVSpace.java | 20 +- .../localengine/rocksdb/RocksDBKVEngine.java | 6 +- .../rocksdb/RocksDBKVEngineConfigurator.java | 8 +- .../rocksdb/RocksDBKVEngineIterator.java | 4 +- .../localengine/rocksdb/RocksDBKVSpace.java | 34 +-- .../rocksdb/RocksDBKVSpaceCheckpoint.java | 14 +- .../RocksDBKVSpaceCompactionTrigger.java | 6 +- .../rocksdb/RocksDBKVSpaceIterator.java | 22 +- .../rocksdb/RocksDBKVSpaceReader.java | 24 +- .../rocksdb/RocksDBKVSpaceSnapshot.java | 20 +- .../rocksdb/RocksDBKVSpaceWriter.java | 18 +- .../rocksdb/RocksDBKVSpaceWriterHelper.java | 24 +- .../rocksdb/RocksDBWALableKVEngine.java | 4 +- .../RocksDBWALableKVEngineConfigurator.java | 4 +- .../rocksdb/RocksDBWALableKVSpace.java | 14 +- .../rocksdb/metrics/RocksDBKVSpaceMetric.java | 4 +- .../localengine/AbstractKVEngineTest.java | 4 +- .../basekv/localengine/MockableTest.java | 2 +- .../basekv/localengine/SyncContextTest.java | 2 +- .../bifromq/basekv/localengine/TestUtil.java | 2 +- .../localengine/benchmark/BenchmarkState.java | 10 +- .../benchmark/BenchmarkTemplate.java | 10 +- .../ContinuousKeyDeleteAndGet_Benchmark.java | 12 +- .../ContinuousKeyDeleteAndSeek_Benchmark.java | 12 +- .../ContinuousKeySingleDeleteAndSeek.java | 4 +- ...ContinuousKeySingleDeleteAndSeekState.java | 10 +- .../localengine/benchmark/HybridWorkload.java | 2 +- .../benchmark/HybridWorkloadState.java | 8 +- .../benchmark/SingleKeyUpdateAndGet.java | 4 +- .../benchmark/SingleKeyUpdateAndGetState.java | 6 +- .../localengine/memory/InMemKVEngineTest.java | 8 +- .../metrics/KVSpaceMetersTest.java | 4 +- .../rocksdb/AbstractRawRocksDBTest.java | 6 +- .../rocksdb/AbstractRocksDBKVEngineTest.java | 10 +- .../rocksdb/KVSpaceCheckpointTest.java | 6 +- .../rocksdb/KVSpaceSnapshotTest.java | 4 +- .../rocksdb/OverrideIdentityTest.java | 12 +- .../rocksdb/RocksDBCPableKVEngineTest.java | 8 +- .../RocksDBKVSpaceCompactionTriggerTest.java | 4 +- .../rocksdb/RocksDBWALableKVEngineTest.java | 6 +- .../rocksdb/metrics/KVSpaceMetersTest.java | 6 +- .../src/test/resources/logback.xml | 2 +- .../BaseKVClusterMetadataManager.java | 38 ++-- .../basekv/metaservice/BaseKVMetaService.java | 4 +- .../IBaseKVClusterMetadataManager.java | 4 +- .../metaservice/IBaseKVMetaService.java | 4 +- .../metaservice/LoadRulesProposalHandler.java | 2 +- .../bifromq/basekv/metaservice/NameUtil.java | 6 +- .../src/main/proto/DescriptorKey.proto | 2 +- .../src/main/proto/LoadRules.proto | 2 +- .../BaseKVClusterMetadataManagerTest.java | 20 +- .../metaservice/BaseKVMetaServiceTest.java | 10 +- .../metaservice/LandscapeCleanupTest.java | 14 +- .../proto/basekv/raft/ClusterConfig.proto | 2 +- .../src/main/proto/basekv/raft/Enums.proto | 2 +- .../src/main/proto/basekv/raft/LogEntry.proto | 2 +- .../main/proto/basekv/raft/RaftMessage.proto | 2 +- .../src/main/proto/basekv/raft/Snapshot.proto | 2 +- .../src/main/proto/basekv/raft/Voting.proto | 2 +- .../basekv/raft/BasicStateStoreTest.java | 10 +- .../basekv/raft/IPeerLogReplicator.java | 4 +- .../bifromq/basekv/raft/IRaftNode.java | 12 +- .../bifromq/basekv/raft/IRaftNodeState.java | 6 +- .../bifromq/basekv/raft/IRaftStateStore.java | 10 +- .../basekv/raft/InMemoryStateStore.java | 10 +- .../raft/MetricMonitoredStateStore.java | 10 +- .../basekv/raft/PeerLogReplicator.java | 4 +- .../basekv/raft/PeerLogReplicatorState.java | 4 +- .../raft/PeerLogReplicatorStateProbing.java | 4 +- .../PeerLogReplicatorStateReplicating.java | 6 +- ...PeerLogReplicatorStateSnapshotSyncing.java | 4 +- .../bifromq/basekv/raft/PeerLogTracker.java | 6 +- .../bifromq/basekv/raft/QuorumTracker.java | 6 +- .../bifromq/basekv/raft/RaftConfig.java | 2 +- .../basekv/raft/RaftConfigChanger.java | 20 +- .../bifromq/basekv/raft/RaftLogger.java | 6 +- .../apache}/bifromq/basekv/raft/RaftNode.java | 20 +- .../bifromq/basekv/raft/RaftNodeState.java | 34 +-- .../basekv/raft/RaftNodeStateCandidate.java | 24 +- .../basekv/raft/RaftNodeStateFollower.java | 44 ++-- .../basekv/raft/RaftNodeStateLeader.java | 52 ++--- .../basekv/raft/ReadProgressTracker.java | 6 +- .../basekv/raft/event/CommitEvent.java | 2 +- .../basekv/raft/event/ElectionEvent.java | 2 +- .../bifromq/basekv/raft/event/RaftEvent.java | 2 +- .../basekv/raft/event/RaftEventType.java | 2 +- .../raft/event/SnapshotRestoredEvent.java | 4 +- .../basekv/raft/event/StatusChangedEvent.java | 4 +- .../raft/event/SyncStateChangedEvent.java | 4 +- .../ClusterConfigChangeException.java | 2 +- .../raft/exception/CompactionException.java | 2 +- .../raft/exception/DropProposalException.java | 2 +- .../basekv/raft/exception/InternalError.java | 2 +- .../exception/LeaderTransferException.java | 2 +- .../raft/exception/ReadIndexException.java | 2 +- .../raft/exception/RecoveryException.java | 2 +- .../raft/exception/SnapshotException.java | 2 +- .../basekv/raft/InMemoryStateStoreTest.java | 4 +- .../PeerLogReplicatorStateProbingTest.java | 8 +- ...PeerLogReplicatorStateReplicatingTest.java | 8 +- ...LogReplicatorStateSnapshotSyncingTest.java | 6 +- .../basekv/raft/PeerLogTrackerTest.java | 10 +- .../basekv/raft/QuorumTrackerTest.java | 4 +- .../basekv/raft/RaftConfigChangerTest.java | 10 +- .../raft/RaftNodeStateCandidateTest.java | 24 +- .../raft/RaftNodeStateFollowerTest.java | 46 ++-- .../basekv/raft/RaftNodeStateLeaderTest.java | 36 +-- .../basekv/raft/RaftNodeStateTest.java | 4 +- .../bifromq/basekv/raft/RaftNodeTest.java | 6 +- .../basekv/raft/ReadProgressTrackerTest.java | 6 +- .../bifromq/basekv/raft/ReflectionUtils.java | 2 +- .../basekv/raft/event/RaftEventTest.java | 6 +- .../basekv/raft/functest/AbnormalTest.java | 10 +- .../functest/ChangeClusterConfigTest.java | 18 +- .../basekv/raft/functest/CompactionTest.java | 8 +- .../raft/functest/LeaderElectionTest.java | 20 +- .../raft/functest/LogReplicationTest.java | 8 +- .../basekv/raft/functest/ProposeTest.java | 14 +- .../functest/RaftConfigMigrationTest.java | 8 +- .../basekv/raft/functest/RaftNodeGroup.java | 34 +-- .../basekv/raft/functest/RaftNodeNetwork.java | 6 +- .../raft/functest/RaftNodeNetworkTest.java | 8 +- .../basekv/raft/functest/ReadIndexTest.java | 14 +- .../basekv/raft/functest/RecoveryTest.java | 12 +- .../raft/functest/SnapshotRestoreTest.java | 14 +- .../raft/functest/annotation/Cluster.java | 2 +- .../raft/functest/annotation/Config.java | 2 +- .../raft/functest/annotation/Ticker.java | 2 +- .../template/RaftGroupTestTemplate.java | 6 +- .../SharedRaftConfigTestTemplate.java | 12 +- .../src/test/resources/logback.xml | 2 +- .../balance/KVStoreBalanceController.java | 60 ++--- .../RangeBootstrapBalancerFactory.java | 4 +- .../RedundantRangeRemovalBalancerFactory.java | 4 +- ...eachableReplicaRemovalBalancerFactory.java | 4 +- .../balance/impl/RangeBootstrapBalancer.java | 28 +-- .../balance/impl/RangeLeaderBalancer.java | 30 +-- .../balance/impl/RangeSplitBalancer.java | 24 +- .../impl/RedundantRangeRemovalBalancer.java | 26 +-- .../balance/impl/ReplicaCntBalancer.java | 14 +- .../impl/RuleBasedPlacementBalancer.java | 30 +-- .../UnreachableReplicaRemovalBalancer.java | 34 +-- .../balance/KVStoreBalanceControllerTest.java | 36 +-- .../impl/RangeBootstrapBalancerTest.java | 14 +- .../balance/impl/RangeLeaderBalancerTest.java | 28 +-- .../balance/impl/RangeSplitBalancerTest.java | 24 +- .../RedundantRangeRemovalBalancerTest.java | 22 +- .../balance/impl/ReplicaCntBalancerTest.java | 30 +-- ...UnreachableReplicaRemovalBalancerTest.java | 24 +- .../basekv/balance/utils/DescriptorUtils.java | 12 +- .../src/test/resources/logback.xml | 2 +- .../bifromq/basekv/balance/AwaitBalance.java | 2 +- .../bifromq/basekv/balance/BalanceNow.java | 4 +- .../bifromq/basekv/balance/BalanceResult.java | 2 +- .../basekv/balance/BalanceResultType.java | 2 +- .../basekv/balance/IStoreBalancerFactory.java | 2 +- .../bifromq/basekv/balance/NoNeedBalance.java | 2 +- .../bifromq/basekv/balance/StoreBalancer.java | 6 +- .../balance/command/BalanceCommand.java | 4 +- .../balance/command/BootstrapCommand.java | 6 +- .../balance/command/ChangeConfigCommand.java | 4 +- .../basekv/balance/command/CommandType.java | 2 +- .../basekv/balance/command/MergeCommand.java | 6 +- .../basekv/balance/command/RangeCommand.java | 2 +- .../balance/command/RecoveryCommand.java | 2 +- .../basekv/balance/command/SplitCommand.java | 4 +- .../command/TransferLeadershipCommand.java | 4 +- .../basekv/balance/util/CommandUtil.java | 36 +-- .../basekv/balance/util/CommandUtilTest.java | 40 ++-- .../basekv/client/BaseKVStoreClient.java | 100 ++++----- .../client/BaseKVStoreClientBuilder.java | 6 +- .../basekv/client/IBaseKVStoreClient.java | 42 ++-- .../basekv/client/IMutationPipeline.java | 6 +- .../bifromq/basekv/client/IQueryPipeline.java | 6 +- .../basekv/client/KVRangeRouterUtil.java | 10 +- .../bifromq/basekv/client/KVRangeSetting.java | 12 +- .../client/ManagedMutationPipeline.java | 10 +- .../basekv/client/ManagedQueryPipeline.java | 10 +- .../client/exception/BadRequestException.java | 2 +- .../client/exception/BadVersionException.java | 2 +- .../exception/InternalErrorException.java | 2 +- .../client/exception/TryLaterException.java | 2 +- .../client/scheduler/BatchMutationCall.java | 28 +-- .../BatchMutationCallBuilderFactory.java | 12 +- .../client/scheduler/BatchQueryCall.java | 28 +-- .../BatchQueryCallBuilderFactory.java | 12 +- .../scheduler/IBatchMutationCallBuilder.java | 4 +- .../scheduler/IBatchQueryCallBuilder.java | 4 +- .../scheduler/MutationCallBatcherKey.java | 4 +- .../scheduler/MutationCallScheduler.java | 10 +- .../client/scheduler/QueryCallBatcherKey.java | 4 +- .../client/scheduler/QueryCallScheduler.java | 10 +- .../basekv/client/KVRangeRouterUtilTest.java | 20 +- .../basekv/client/KVRangeSettingTest.java | 20 +- .../scheduler/BatchMutationCallTest.java | 20 +- .../client/scheduler/BatchQueryCallTest.java | 18 +- .../basekv/client/scheduler/Fixtures.java | 12 +- .../scheduler/TestBatchMutationCall.java | 10 +- .../client/scheduler/TestBatchQueryCall.java | 10 +- .../scheduler/TestMutationCallScheduler.java | 4 +- .../scheduler/TestQueryCallScheduler.java | 4 +- .../src/test/resources/logback.xml | 2 +- .../apache}/bifromq/basekv/InProcStores.java | 2 +- .../apache}/bifromq/basekv/RPCBluePrint.java | 24 +- .../bifromq/basekv/RPCServerMetadataUtil.java | 2 +- .../proto/basekv/BaseKVStoreService.proto | 2 +- .../src/main/proto/basekv/CoProc.proto | 2 +- .../src/main/proto/basekv/Command.proto | 2 +- .../src/main/proto/basekv/StoreMessage.proto | 2 +- .../bifromq/basekv/NullableValueTest.java | 4 +- .../bifromq/basekv/RPCBluePrintTest.java | 6 +- .../server/AgentHostStoreMessenger.java | 20 +- .../basekv/server/BaseKVStoreServer.java | 10 +- .../server/BaseKVStoreServerBuilder.java | 6 +- .../basekv/server/BaseKVStoreService.java | 60 ++--- .../server/BaseKVStoreServiceBuilder.java | 8 +- .../basekv/server/IBaseKVStoreServer.java | 2 +- .../bifromq/basekv/server/MutatePipeline.java | 22 +- .../bifromq/basekv/server/QueryPipeline.java | 24 +- .../bifromq/basekv/store/IKVRangeStore.java | 18 +- .../IKVRangeStoreDescriptorReporter.java | 4 +- .../bifromq/basekv/store/IStoreMessenger.java | 4 +- .../basekv/store/KVRangeMessenger.java | 12 +- .../bifromq/basekv/store/KVRangeStore.java | 78 +++---- .../store/KVRangeStoreStatsCollector.java | 12 +- .../basekv/store/api/IKVCloseableReader.java | 2 +- .../bifromq/basekv/store/api/IKVIterator.java | 2 +- .../basekv/store/api/IKVLoadRecord.java | 2 +- .../basekv/store/api/IKVRangeCoProc.java | 12 +- .../store/api/IKVRangeCoProcFactory.java | 4 +- .../basekv/store/api/IKVRangeMetadata.java | 10 +- .../basekv/store/api/IKVRangeReader.java | 2 +- .../basekv/store/api/IKVRangeSplitHinter.java | 10 +- .../bifromq/basekv/store/api/IKVReader.java | 4 +- .../bifromq/basekv/store/api/IKVWriter.java | 4 +- .../store/exception/KVRangeException.java | 4 +- .../exception/KVRangeStoreException.java | 2 +- .../basekv/store/option/KVRangeOptions.java | 4 +- .../store/option/KVRangeStoreOptions.java | 12 +- .../store/range/AbstractKVRangeMetadata.java | 18 +- .../AbstractKVRangeMetadataUpdatable.java | 28 +-- .../store/range/IKVCheckpointIterator.java | 4 +- .../store/range/IKVCheckpointReader.java | 4 +- .../basekv/store/range/IKVLoadRecorder.java | 4 +- .../basekv/store/range/IKVLoadTracker.java | 2 +- .../bifromq/basekv/store/range/IKVRange.java | 16 +- .../store/range/IKVRangeCheckpointReader.java | 4 +- .../basekv/store/range/IKVRangeFSM.java | 18 +- .../basekv/store/range/IKVRangeMessenger.java | 4 +- .../range/IKVRangeMetadataUpdatable.java | 10 +- .../store/range/IKVRangeMetadataWriter.java | 2 +- .../store/range/IKVRangeMetricManager.java | 8 +- .../store/range/IKVRangeQueryLinearizer.java | 2 +- .../store/range/IKVRangeQueryRunner.java | 6 +- .../basekv/store/range/IKVRangeWritable.java | 8 +- .../basekv/store/range/IKVRangeWriter.java | 2 +- .../basekv/store/range/IKVReseter.java | 2 +- .../store/range/KVCheckpointDataIterator.java | 4 +- .../store/range/KVCheckpointReader.java | 12 +- .../basekv/store/range/KVIterator.java | 6 +- .../basekv/store/range/KVLoadRecorder.java | 4 +- .../bifromq/basekv/store/range/KVRange.java | 36 +-- .../basekv/store/range/KVRangeCheckpoint.java | 24 +- .../store/range/KVRangeDumpSession.java | 18 +- .../basekv/store/range/KVRangeFSM.java | 170 +++++++------- .../basekv/store/range/KVRangeKeys.java | 2 +- .../store/range/KVRangeMetadataWriter.java | 22 +- .../store/range/KVRangeMetricManager.java | 14 +- .../store/range/KVRangeQueryLinearizer.java | 4 +- .../store/range/KVRangeQueryRunner.java | 30 +-- .../basekv/store/range/KVRangeRestorer.java | 18 +- .../store/range/KVRangeStatsCollector.java | 8 +- .../basekv/store/range/KVRangeWriter.java | 28 +-- .../bifromq/basekv/store/range/KVReader.java | 16 +- .../bifromq/basekv/store/range/KVWriter.java | 8 +- .../store/range/LoadRecordableKVIterator.java | 4 +- .../range/LoadRecordableKVRangeWriter.java | 8 +- .../store/range/LoadRecordableKVReader.java | 8 +- .../store/range/LoadRecordableKVWriter.java | 6 +- .../range/hinter/KVLoadBasedSplitHinter.java | 10 +- .../store/range/hinter/LoadRecordWindow.java | 2 +- .../MutationKVLoadBasedSplitHinter.java | 8 +- .../hinter/QueryKVLoadBasedSplitHinter.java | 8 +- .../basekv/store/stats/IStatsCollector.java | 2 +- .../basekv/store/stats/StatsCollector.java | 4 +- .../store/util/ExecutorServiceUtil.java | 2 +- .../bifromq/basekv/store/util/KVUtil.java | 6 +- .../basekv/store/util/ProcessUtil.java | 2 +- .../bifromq/basekv/store/util/VerUtil.java | 2 +- .../bifromq/basekv/store/wal/IKVRangeWAL.java | 24 +- .../basekv/store/wal/IKVRangeWALStore.java | 4 +- .../store/wal/IKVRangeWALStoreEngine.java | 6 +- .../store/wal/IKVRangeWALSubscriber.java | 6 +- .../store/wal/IKVRangeWALSubscription.java | 2 +- .../bifromq/basekv/store/wal/KVRangeWAL.java | 46 ++-- .../basekv/store/wal/KVRangeWALKeys.java | 4 +- .../store/wal/KVRangeWALStorageEngine.java | 26 +-- .../basekv/store/wal/KVRangeWALStore.java | 58 ++--- .../store/wal/KVRangeWALSubscription.java | 12 +- .../store/wal/LogEntryIteratorPool.java | 14 +- .../apache}/bifromq/basekv/MockableTest.java | 2 +- .../apache}/bifromq/basekv/TestCoProc.java | 22 +- .../bifromq/basekv/TestCoProcFactory.java | 10 +- .../apache}/bifromq/basekv/TestUtil.java | 2 +- .../bifromq/basekv/annotation/Cluster.java | 2 +- .../basekv/benchmark/SingleNodeBenchmark.java | 12 +- .../benchmark/SplitKeyEstimatorBenchmark.java | 8 +- .../server/AgentHostStoreMessengerTest.java | 24 +- .../basekv/server/MutatePipelineTest.java | 24 +- .../basekv/server/QueryPipelineTest.java | 22 +- .../basekv/store/KVRangeBootstrapTest.java | 36 +-- .../bifromq/basekv/store/KVRangeConfig.java | 10 +- .../basekv/store/KVRangeMessengerTest.java | 12 +- .../KVRangeStoreClusterBootstrapTest.java | 8 +- .../KVRangeStoreClusterConfigChangeTest.java | 6 +- .../store/KVRangeStoreClusterMergeTest.java | 18 +- .../store/KVRangeStoreClusterRWTest.java | 4 +- .../KVRangeStoreClusterRecoveryTest.java | 12 +- .../store/KVRangeStoreClusterSplitTest.java | 8 +- .../KVRangeStoreClusterTestTemplate.java | 16 +- .../store/KVRangeStoreStatsCollectorTest.java | 4 +- .../basekv/store/KVRangeStoreTest.java | 56 ++--- .../basekv/store/KVRangeStoreTestCluster.java | 38 ++-- .../KVRangeStoreTransferLeadershipTest.java | 8 +- .../store/range/AbstractKVRangeTest.java | 14 +- .../store/range/KVRangeDumpSessionTest.java | 18 +- .../store/range/KVRangeIteratorTest.java | 8 +- .../store/range/KVRangeMetadataTest.java | 16 +- .../range/KVRangeQueryLinearizerTest.java | 4 +- .../store/range/KVRangeQueryRunnerTest.java | 20 +- .../store/range/KVRangeRestorerTest.java | 12 +- .../range/KVRangeStatsCollectorTest.java | 12 +- .../basekv/store/range/KVRangeTest.java | 26 +-- .../basekv/store/range/KVReaderTest.java | 20 +- .../basekv/store/range/KVWriterTest.java | 10 +- .../store/range/hinter/LoadRecorderTest.java | 10 +- .../hinter/QueryKVIOBasedSplitHinterTest.java | 12 +- .../range/hinter/RecordingWindowSlotTest.java | 8 +- .../store/stats/StatsCollectorTest.java | 4 +- .../bifromq/basekv/store/util/KVUtilTest.java | 20 +- .../basekv/store/util/ProcessUtilTest.java | 4 +- .../basekv/store/util/VerUtilTest.java | 4 +- .../store/wal/KVRangeWALStoreEngineTest.java | 20 +- .../basekv/store/wal/KVRangeWALStoreTest.java | 14 +- .../store/wal/KVRangeWALSubscriptionTest.java | 14 +- .../basekv/store/wal/KVRangeWALTest.java | 36 +-- .../src/test/resources/logback.xml | 2 +- .../apache}/bifromq/basekv/Constants.java | 2 +- .../bifromq/basekv/utils/BoundaryUtil.java | 4 +- .../bifromq/basekv/utils/DescriptorUtil.java | 14 +- .../bifromq/basekv/utils/EffectiveEpoch.java | 4 +- .../bifromq/basekv/utils/EffectiveRoute.java | 4 +- .../bifromq/basekv/utils/KVRangeIdUtil.java | 6 +- .../bifromq/basekv/utils/LeaderRange.java | 6 +- .../src/main/proto/basekv/Descriptor.proto | 2 +- .../src/main/proto/basekv/Snapshot.proto | 2 +- .../src/main/proto/basekv/Type.proto | 2 +- .../basekv/utils/BoundaryUtilTest.java | 22 +- .../basekv/utils/DescriptorUtilTest.java | 16 +- .../basekv/utils/KVRangeIdUtilTest.java | 4 +- .../bifromq/logger/FormatableLogger.java | 6 +- .../apache}/bifromq/logger/LogFormatter.java | 2 +- .../apache}/bifromq/logger/SiftKeyUtil.java | 2 +- .../apache}/bifromq/logger/SiftLogger.java | 2 +- .../bifromq/baserpc/client/BiDiStream.java | 6 +- .../bifromq/baserpc/client/ClientChannel.java | 22 +- .../baserpc/client/ConnStateListener.java | 2 +- .../baserpc/client/DummyServerSelector.java | 6 +- .../bifromq/baserpc/client/IBiDiStream.java | 2 +- .../baserpc/client/IClientChannel.java | 4 +- .../bifromq/baserpc/client/IConnectable.java | 2 +- .../bifromq/baserpc/client/IRPCClient.java | 2 +- .../bifromq/baserpc/client/IUnaryCaller.java | 2 +- .../baserpc/client/ManagedBiDiStream.java | 8 +- .../baserpc/client/ManagedMessageStream.java | 10 +- .../client/ManagedRequestPipeline.java | 18 +- .../bifromq/baserpc/client/RPCClient.java | 8 +- .../baserpc/client/RPCClientBuilder.java | 6 +- .../bifromq/baserpc/client/UnaryCaller.java | 22 +- .../client/exception/ExceptionUtil.java | 2 +- .../exception/RequestAbortException.java | 2 +- .../exception/RequestCanceledException.java | 2 +- .../exception/RequestRejectedException.java | 2 +- .../exception/RequestThrottledException.java | 2 +- .../exception/ServerNotFoundException.java | 2 +- .../ServiceUnavailableException.java | 2 +- .../TenantAwareClientInterceptor.java | 12 +- .../client/loadbalancer/ChannelList.java | 2 +- .../client/loadbalancer/Constants.java | 2 +- .../loadbalancer/IServerGroupRouter.java | 2 +- .../client/loadbalancer/IServerSelector.java | 2 +- .../IServerSelectorUpdateListener.java | 2 +- .../client/loadbalancer/ITenantRouter.java | 2 +- .../baserpc/client/loadbalancer/LBUtils.java | 2 +- .../client/loadbalancer/SubChannelPicker.java | 6 +- .../client/loadbalancer/TenantRouter.java | 2 +- .../TrafficDirectiveLoadBalancer.java | 10 +- .../TrafficDirectiveLoadBalancerProvider.java | 4 +- .../baserpc/client/loadbalancer/TrieMap.java | 2 +- .../client/loadbalancer/WCHRouter.java | 2 +- .../WeightedServerGroupRouter.java | 2 +- .../TrafficGovernorNameResolver.java | 12 +- .../TrafficGovernorNameResolverProvider.java | 4 +- .../client/util/FastBehaviorSubject.java | 2 +- .../client/loadbalancer/LBUtilsTest.java | 2 +- .../loadbalancer/TrafficRouterTest.java | 2 +- .../client/loadbalancer/TrieMapTest.java | 2 +- .../client/loadbalancer/WCHRouterTest.java | 2 +- .../WeightedServerGroupRouterTest.java | 2 +- .../protobuf/lite/EnhancedMarshaller.java | 2 +- .../apache}/bifromq/baserpc/BluePrint.java | 2 +- .../apache}/bifromq/baserpc/MetadataKeys.java | 2 +- .../apache}/bifromq/baserpc/RPCContext.java | 4 +- .../bifromq/baserpc/metrics/IRPCMeter.java | 2 +- .../bifromq/baserpc/metrics/MetricTag.java | 2 +- .../bifromq/baserpc/metrics/RPCMeter.java | 4 +- .../baserpc/metrics/RPCMethodMeter.java | 4 +- .../bifromq/baserpc/metrics/RPCMetric.java | 4 +- .../main/proto/baserpc/PipelineMetadata.proto | 2 +- .../server/AbstractResponsePipeline.java | 6 +- .../server/AbstractStreamObserver.java | 6 +- .../bifromq/baserpc/server/AckStream.java | 4 +- .../bifromq/baserpc/server/IRPCServer.java | 2 +- .../bifromq/baserpc/server/RPCServer.java | 10 +- .../baserpc/server/RPCServerBuilder.java | 8 +- .../baserpc/server/ResponsePipeline.java | 4 +- .../bifromq/baserpc/server/UnaryResponse.java | 8 +- .../TenantAwareServerInterceptor.java | 14 +- .../trafficgovernor/GlobalProcessId.java | 2 +- .../trafficgovernor/IRPCServiceLandscape.java | 2 +- .../IRPCServiceServerRegister.java | 2 +- .../IRPCServiceTrafficGovernor.java | 2 +- .../IRPCServiceTrafficService.java | 4 +- .../baserpc/trafficgovernor/NameUtil.java | 6 +- .../trafficgovernor/RPCServiceAnnouncer.java | 26 +-- .../RPCServiceTrafficManager.java | 10 +- .../RPCServiceTrafficService.java | 4 +- .../trafficgovernor/ServerEndpoint.java | 2 +- .../trafficgovernor/SharedScheduler.java | 4 +- .../main/proto/baserpc/LoadDirective.proto | 2 +- .../src/main/proto/baserpc/RPCServer.proto | 2 +- .../RPCServiceAnnouncerTest.java | 10 +- .../RPCServiceLandscapeTest.java | 12 +- .../RPCServiceTrafficGovernorTest.java | 12 +- .../basescheduler/BatchCallScheduler.java | 10 +- .../bifromq/basescheduler/Batcher.java | 6 +- .../basescheduler/CallSchedulerFactory.java | 8 +- .../bifromq/basescheduler/CallTask.java | 2 +- .../CapacityEstimatorFactory.java | 8 +- .../bifromq/basescheduler/EMALong.java | 2 +- .../bifromq/basescheduler/IBatchCall.java | 2 +- .../basescheduler/IBatchCallBuilder.java | 2 +- .../IBatchCallBuilderFactory.java | 2 +- .../basescheduler/IBatchCallScheduler.java | 2 +- .../bifromq/basescheduler/ICallTask.java | 2 +- .../bifromq/basescheduler/MovingAverage.java | 2 +- .../exception/AbortException.java | 2 +- .../exception/BackPressureException.java | 2 +- .../BatcherUnavailableException.java | 2 +- .../exception/DropException.java | 2 +- .../basescheduler/spi/ICallScheduler.java | 2 +- .../spi/ICallSchedulerFactory.java | 2 +- .../basescheduler/spi/ICapacityEstimator.java | 2 +- .../spi/ICapacityEstimatorFactory.java | 2 +- .../basescheduler/BatchCallSchedulerTest.java | 4 +- .../bifromq/basescheduler/CallTaskTest.java | 2 +- .../bifromq/basescheduler/EMALongTest.java | 2 +- .../basescheduler/MovingAverageTest.java | 2 +- .../basescheduler/TestBatchCallScheduler.java | 2 +- .../benchmark/MovingAverageBenchmark.java | 4 +- .../apache}/bifromq/base/util/AsyncRetry.java | 8 +- .../bifromq/base/util/AsyncRunner.java | 2 +- .../base/util/CompletableFutureUtil.java | 2 +- .../bifromq/base/util/FutureTracker.java | 2 +- .../util/exception/NeedRetryException.java | 2 +- .../util/exception/RetryTimeoutException.java | 2 +- .../bifromq/base/util/AsyncRetryTest.java | 4 +- .../bifromq/base/util/AsyncRunnerTest.java | 2 +- .../base/util/CompletableFutureUtilTest.java | 2 +- .../bifromq/base/util/FutureTrackerTest.java | 2 +- bifromq-apiserver/pom.xml | 2 +- .../apache}/bifromq/apiserver/APIServer.java | 30 +-- .../apiserver/AbstractServerInitializer.java | 6 +- .../bifromq/apiserver/ExceptionHandler.java | 2 +- .../apache}/bifromq/apiserver/Headers.java | 2 +- .../apache}/bifromq/apiserver/IAPIServer.java | 2 +- .../apiserver/NonTLSServerInitializer.java | 8 +- .../apiserver/TLSServerInitializer.java | 8 +- .../apiserver/http/AnnotationUtil.java | 2 +- .../apiserver/http/HTTPRequestRouter.java | 8 +- .../bifromq/apiserver/http/HTTPRouteMap.java | 4 +- .../apiserver/http/IHTTPRequestHandler.java | 2 +- .../http/IHTTPRequestHandlersFactory.java | 2 +- .../bifromq/apiserver/http/IHTTPRouteMap.java | 2 +- .../handler/AbstractLoadRulesHandler.java | 10 +- .../handler/AbstractTrafficRulesHandler.java | 10 +- .../http/handler/ExpireRetainHandler.java | 16 +- .../http/handler/ExpireSessionHandler.java | 16 +- .../http/handler/GetClusterHandler.java | 8 +- .../http/handler/GetLoadRulesHandler.java | 10 +- .../handler/GetServiceLandscapeHandler.java | 12 +- .../http/handler/GetSessionInfoHandler.java | 16 +- .../handler/GetStoreLandscapeHandler.java | 18 +- .../http/handler/GetStoreRangesHandler.java | 12 +- .../http/handler/GetTrafficRulesHandler.java | 10 +- .../apiserver/http/handler/HeaderUtils.java | 14 +- .../apiserver/http/handler/JSONUtils.java | 12 +- .../apiserver/http/handler/KillHandler.java | 28 +-- .../http/handler/ListAllServicesHandler.java | 4 +- .../http/handler/ListAllStoreHandler.java | 4 +- .../apiserver/http/handler/PubHandler.java | 30 +-- .../http/handler/RequestHandlersFactory.java | 22 +- .../apiserver/http/handler/RetainHandler.java | 26 +-- .../http/handler/SetLoadRulesHandler.java | 12 +- .../handler/SetServerGroupTagsHandler.java | 14 +- .../http/handler/SetTrafficRulesHandler.java | 10 +- .../apiserver/http/handler/SubHandler.java | 20 +- .../http/handler/TenantAwareHandler.java | 12 +- .../handler/UnsetTrafficRulesHandler.java | 10 +- .../apiserver/http/handler/UnsubHandler.java | 17 +- .../bifromq/apiserver/utils/TopicUtil.java | 16 +- .../bifromq/apiserver/APIServerTest.java | 30 +-- .../bifromq/apiserver/MockableTest.java | 2 +- .../NonTLSServerInitializerTest.java | 8 +- .../apiserver/TLSServerInitializerTest.java | 8 +- .../apiserver/http/HTTPRequestRouterTest.java | 10 +- .../apiserver/http/HTTPRouteMapTest.java | 12 +- .../AbstractHTTPRequestHandlerTest.java | 16 +- .../AbstractTrafficRulesHandlerTest.java | 6 +- .../http/handler/ExpireRetainHandlerTest.java | 12 +- .../handler/ExpireSessionHandlerTest.java | 12 +- .../http/handler/GetLoadRulesHandlerTest.java | 8 +- .../GetServiceLandscapeHandlerTest.java | 4 +- .../handler/GetSessionInfoHandlerTest.java | 14 +- .../http/handler/HeaderUtilsTest.java | 8 +- .../http/handler/KillHandlerTest.java | 22 +- .../handler/ListAllServicesHandlerTest.java | 2 +- .../handler/ListAllStoresHandlerTest.java | 2 +- .../http/handler/PubHandlerTest.java | 24 +- .../http/handler/RetainHandlerTest.java | 20 +- .../http/handler/SetLoadRulesHandlerTest.java | 8 +- .../http/handler/SubHandlerTest.java | 16 +- .../http/handler/UnsubHandlerTest.java | 12 +- .../bifromq/type/MQTTClientInfoConstants.java | 2 +- .../main/proto/commontype/ClientInfo.proto | 2 +- .../src/main/proto/commontype/MatchInfo.proto | 2 +- .../src/main/proto/commontype/QoS.proto | 2 +- .../main/proto/commontype/RouteMatcher.proto | 2 +- .../main/proto/commontype/TopicMessage.proto | 2 +- .../proto/commontype/UserProperties.proto | 2 +- .../bifromq/deliverer/BatchDeliveryCall.java | 34 +-- .../BatchDeliveryCallBuilderFactory.java | 14 +- .../bifromq/deliverer/DelivererKey.java | 2 +- .../bifromq/deliverer/DeliveryCall.java | 4 +- .../bifromq/deliverer/DeliveryCallResult.java | 2 +- .../bifromq/deliverer/IMessageDeliverer.java | 4 +- .../bifromq/deliverer/MessageDeliverer.java | 10 +- .../deliverer/TopicMessagePackHolder.java | 4 +- .../exception/DeliveryException.java | 2 +- .../deliverer/DeliverySchedulerTest.java | 32 +-- .../bifromq/dist/client/DistClient.java | 30 +-- .../dist/client/DistClientBuilder.java | 8 +- .../bifromq/dist/client/IDistClient.java | 10 +- .../bifromq/dist/client/MatchResult.java | 2 +- .../bifromq/dist/client/PubResult.java | 2 +- .../bifromq/dist/client/UnmatchResult.java | 2 +- .../dist/client/scheduler/BatchPubCall.java | 22 +- .../scheduler/BatchPubCallBuilderFactory.java | 20 +- .../client/scheduler/IPubCallScheduler.java | 6 +- .../client/scheduler/PubCallBatcherKey.java | 2 +- .../client/scheduler/PubCallScheduler.java | 8 +- .../dist/client/scheduler/PubRequest.java | 6 +- .../src/test/resources/logback.xml | 2 +- .../dist/trie/ITopicFilterIterator.java | 2 +- .../dist/trie/MTopicFilterTrieNode.java | 4 +- .../dist/trie/NTopicFilterTrieNode.java | 6 +- .../dist/trie/STopicFilterTrieNode.java | 6 +- .../dist/trie/TopicFilterIterator.java | 4 +- .../dist/trie/TopicFilterTrieNode.java | 4 +- .../bifromq/dist/trie/TopicTrieNode.java | 6 +- .../proto/distservice/DistWorkerCoProc.proto | 2 +- .../src/main/proto/distservice/Fact.proto | 2 +- .../main/proto/distservice/TopicFanout.proto | 2 +- .../apache}/bifromq/dist/TestUtil.java | 18 +- .../apache}/bifromq/dist/TestUtilTest.java | 2 +- .../apache}/bifromq/dist/TopicMatcher.java | 12 +- .../bifromq/dist/TopicMatcherTest.java | 6 +- .../apache}/bifromq/dist/trie/Fixtures.java | 2 +- .../dist/trie/TopicFilterIteratorTest.java | 20 +- .../bifromq/dist/trie/TopicTrieNodeTest.java | 4 +- .../benchmark/TopicTrieBuilderBenchmark.java | 2 +- .../TopicTrieBuilderBenchmarkState.java | 8 +- .../src/test/resources/logback.xml | 2 +- .../apache}/bifromq/dist/RPCBluePrint.java | 6 +- .../main/proto/distservice/DistService.proto | 2 +- .../dist/server/DistResponsePipeline.java | 42 ++-- .../bifromq/dist/server/DistServer.java | 6 +- .../dist/server/DistServerBuilder.java | 10 +- .../bifromq/dist/server/DistService.java | 40 ++-- .../bifromq/dist/server/IDistServer.java | 2 +- .../handler/IDistServiceReqHandler.java | 2 +- .../dist/server/handler/MatchReqHandler.java | 20 +- .../server/handler/UnmatchReqHandler.java | 20 +- .../server/scheduler/BatchDistServerCall.java | 62 ++--- .../dist/server/scheduler/BatchMatchCall.java | 38 ++-- .../server/scheduler/BatchUnmatchCall.java | 32 +-- .../scheduler/DistServerCallBatcherKey.java | 2 +- .../scheduler/DistServerCallResult.java | 2 +- .../scheduler/DistWorkerCallScheduler.java | 6 +- .../scheduler/IDistWorkerCallScheduler.java | 4 +- .../server/scheduler/IMatchCallScheduler.java | 8 +- .../scheduler/IUnmatchCallScheduler.java | 8 +- .../server/scheduler/MatchCallScheduler.java | 22 +- .../server/scheduler/TenantPubRequest.java | 4 +- .../scheduler/UnmatchCallScheduler.java | 20 +- .../bifromq/dist/server/DistServiceTest.java | 48 ++-- .../apache}/bifromq/dist/server/DistTest.java | 34 +-- .../server/handler/MatchReqHandlerTest.java | 18 +- .../server/handler/UnmatchReqHandlerTest.java | 20 +- .../server/scheduler/BatchMatchCallTest.java | 30 +-- .../scheduler/BatchUnmatchCallTest.java | 26 +-- .../src/test/resources/logback.xml | 1 - .../dist/worker/schema/GroupMatching.java | 4 +- .../dist/worker/schema/KVSchemaUtil.java | 28 +-- .../bifromq/dist/worker/schema/Matching.java | 4 +- .../dist/worker/schema/NormalMatching.java | 6 +- .../dist/worker/schema/RouteDetail.java | 4 +- .../main/proto/distservice/MatchRoute.proto | 2 +- .../main/proto/distservice/RouteGroup.proto | 2 +- .../dist/worker/schema/GroupMatchingTest.java | 8 +- .../dist/worker/schema/KVSchemaUtilTest.java | 22 +- .../worker/schema/NormalMatchingTest.java | 10 +- .../spi/IDistWorkerBalancerFactory.java | 4 +- .../bifromq/dist/worker/spi/SplitKey.java | 14 +- .../bifromq/dist/worker/Comparators.java | 4 +- .../bifromq/dist/worker/DeliverExecutor.java | 22 +- .../dist/worker/DeliverExecutorGroup.java | 40 ++-- .../bifromq/dist/worker/DistWorker.java | 22 +- .../dist/worker/DistWorkerBuilder.java | 20 +- .../dist/worker/DistWorkerCleaner.java | 32 +-- .../bifromq/dist/worker/DistWorkerCoProc.java | 102 ++++----- .../dist/worker/DistWorkerCoProcFactory.java | 38 ++-- .../dist/worker/IDeliverExecutorGroup.java | 8 +- .../bifromq/dist/worker/IDistWorker.java | 2 +- .../dist/worker/ISubscriptionCleaner.java | 4 +- .../bifromq/dist/worker/ITenantsState.java | 2 +- .../bifromq/dist/worker/RendezvousHash.java | 2 +- .../dist/worker/SubscriptionCleaner.java | 14 +- .../bifromq/dist/worker/TenantRouteState.java | 8 +- .../bifromq/dist/worker/TenantsState.java | 16 +- .../bifromq/dist/worker/TopicIndex.java | 14 +- .../balance/DistWorkerSplitBalancer.java | 36 +-- .../DistWorkerSplitBalancerFactory.java | 6 +- .../balance/RangeLeaderBalancerFactory.java | 8 +- .../balance/ReplicaCntBalancerFactory.java | 8 +- .../dist/worker/cache/ISubscriptionCache.java | 8 +- .../dist/worker/cache/ITenantRouteCache.java | 8 +- .../cache/ITenantRouteCacheFactory.java | 2 +- .../worker/cache/ITenantRouteMatcher.java | 4 +- .../dist/worker/cache/SubscriptionCache.java | 32 +-- .../dist/worker/cache/TenantRouteCache.java | 16 +- .../worker/cache/TenantRouteCacheFactory.java | 4 +- .../dist/worker/cache/TenantRouteMatcher.java | 32 +-- .../worker/cache/ThreadLocalKVReader.java | 6 +- .../dist/worker/hinter/FanoutSplitHinter.java | 34 +-- .../dist/worker/hinter/RecordEstimation.java | 2 +- ...ist.worker.spi.IDistWorkerBalancerFactory} | 6 +- .../bifromq/dist/worker/BatchDistTest.java | 30 +-- .../bifromq/dist/worker/ComparatorsTest.java | 4 +- .../bifromq/dist/worker/DistQoS0Test.java | 20 +- .../bifromq/dist/worker/DistQoS1Test.java | 18 +- .../bifromq/dist/worker/DistQoS2Test.java | 18 +- .../dist/worker/DistWorkerCleanerTest.java | 20 +- .../dist/worker/DistWorkerCoProcTest.java | 72 +++--- .../bifromq/dist/worker/DistWorkerTest.java | 134 +++++------ .../bifromq/dist/worker/KeyLayoutTest.java | 18 +- .../bifromq/dist/worker/MeterTest.java | 6 +- .../dist/worker/RendezvousHashTest.java | 2 +- .../bifromq/dist/worker/StatsTest.java | 4 +- .../bifromq/dist/worker/SubUnsubTest.java | 10 +- .../dist/worker/SubscriptionCleanerTest.java | 20 +- .../dist/worker/TenantRouteStateTest.java | 6 +- .../dist/worker/TenantsStatesTest.java | 10 +- .../bifromq/dist/worker/TopicIndexTest.java | 2 +- .../balance/DistWorkerSplitBalancerTest.java | 36 +-- .../worker/cache/SubscriptionCacheTest.java | 18 +- .../worker/cache/TenantRouteCacheTest.java | 16 +- .../worker/cache/ThreadLocalKVReaderTest.java | 6 +- .../src/test/resources/logback.xml | 2 +- .../bifromq/inbox/client/IInboxClient.java | 46 ++-- .../bifromq/inbox/client/InboxClient.java | 56 ++--- .../inbox/client/InboxClientBuilder.java | 8 +- .../inbox/client/InboxDeliverPipeline.java | 20 +- .../inbox/client/InboxFetchPipeline.java | 18 +- .../bifromq/inbox/client/InboxReader.java | 6 +- .../inbox/client}/InboxClientTest.java | 40 ++-- .../inbox/client}/InboxReaderTest.java | 20 +- .../proto/inboxservice/InboxFetched.proto | 2 +- .../proto/inboxservice/InboxMessages.proto | 2 +- .../proto/inboxservice/InboxMetadata.proto | 2 +- .../proto/inboxservice/InboxStoreCoProc.proto | 2 +- .../src/main/proto/inboxservice/LWT.proto | 2 +- .../src/main/proto/inboxservice/Replica.proto | 2 +- .../inboxservice/TopicFilterOption.proto | 2 +- .../apache}/bifromq/inbox/RPCBluePrint.java | 26 +-- .../bifromq/inbox/record/InboxInstance.java | 4 +- .../inbox/record/TenantInboxInstance.java | 6 +- .../bifromq/inbox/util/InboxServiceUtil.java | 6 +- .../bifromq/inbox/util/PipelineUtil.java | 2 +- .../proto/inboxservice/InboxService.proto | 2 +- .../inbox/util/InboxServiceUtilTest.java | 6 +- .../bifromq/inbox/server/FetcherSignaler.java | 4 +- .../bifromq/inbox/server/IInboxFetcher.java | 2 +- .../inbox/server/IInboxFetcherRegistry.java | 2 +- .../bifromq/inbox/server/IInboxServer.java | 2 +- .../bifromq/inbox/server/ITenantGCRunner.java | 6 +- .../inbox/server/InboxFetchPipeline.java | 24 +- .../inbox/server/InboxFetcherRegistry.java | 2 +- .../bifromq/inbox/server/InboxServer.java | 28 +-- .../inbox/server/InboxServerBuilder.java | 10 +- .../bifromq/inbox/server/InboxService.java | 98 ++++---- .../bifromq/inbox/server/InboxWriter.java | 46 ++-- .../inbox/server/InboxWriterPipeline.java | 22 +- .../bifromq/inbox/server/TenantGCRunner.java | 40 ++-- .../server/scheduler/BatchAttachCall.java | 32 +-- .../server/scheduler/BatchCheckSubCall.java | 32 +-- .../server/scheduler/BatchCommitCall.java | 30 +-- .../server/scheduler/BatchDeleteCall.java | 32 +-- .../server/scheduler/BatchDetachCall.java | 34 +-- .../server/scheduler/BatchExistCall.java | 28 +-- .../server/scheduler/BatchFetchCall.java | 26 +-- .../server/scheduler/BatchInsertCall.java | 26 +-- .../server/scheduler/BatchSendLWTCall.java | 30 +-- .../inbox/server/scheduler/BatchSubCall.java | 32 +-- .../server/scheduler/BatchUnsubCall.java | 32 +-- .../server/scheduler/CheckMatchInfo.java | 4 +- .../inbox/server/scheduler/FetchRequest.java | 4 +- .../scheduler/IInboxAttachScheduler.java | 8 +- .../scheduler/IInboxCheckSubScheduler.java | 6 +- .../scheduler/IInboxCommitScheduler.java | 8 +- .../scheduler/IInboxDeleteScheduler.java | 8 +- .../scheduler/IInboxDetachScheduler.java | 8 +- .../scheduler/IInboxExistScheduler.java | 8 +- .../scheduler/IInboxFetchScheduler.java | 6 +- .../scheduler/IInboxInsertScheduler.java | 8 +- .../scheduler/IInboxSendLWTScheduler.java | 8 +- .../server/scheduler/IInboxSubScheduler.java | 8 +- .../scheduler/IInboxUnsubScheduler.java | 8 +- .../scheduler/InboxAttachScheduler.java | 14 +- .../scheduler/InboxCheckSubScheduler.java | 10 +- .../scheduler/InboxCommitScheduler.java | 14 +- .../scheduler/InboxDeleteScheduler.java | 14 +- .../scheduler/InboxDetachScheduler.java | 14 +- .../server/scheduler/InboxExistScheduler.java | 12 +- .../server/scheduler/InboxFetchScheduler.java | 10 +- .../scheduler/InboxInsertScheduler.java | 12 +- .../server/scheduler/InboxReadBatcherKey.java | 4 +- .../server/scheduler/InboxReadScheduler.java | 12 +- .../scheduler/InboxSendLWTScheduler.java | 12 +- .../server/scheduler/InboxSubScheduler.java | 14 +- .../server/scheduler/InboxUnSubScheduler.java | 14 +- .../bifromq/inbox/server/Fixtures.java | 30 +-- .../inbox/server/InboxAdminRPCTest.java | 20 +- .../bifromq/inbox/server/InboxExpiryTest.java | 38 ++-- .../server/InboxFetcherRegistryTest.java | 2 +- .../bifromq/inbox/server/InboxInsertTest.java | 46 ++-- .../inbox/server/InboxServiceTest.java | 50 ++--- .../bifromq/inbox/server/InboxSubRPCTest.java | 36 +-- .../inbox/server/InboxUnsubRPCTest.java | 40 ++-- .../inbox/server/InboxWriterPipelineTest.java | 30 +-- .../bifromq/inbox/server/InboxWriterTest.java | 22 +- .../bifromq/inbox/server/MockedFetchTest.java | 2 +- .../inbox/server/MockedInboxAdminTest.java | 18 +- .../inbox/server/MockedInboxCommitTest.java | 10 +- .../inbox/server/MockedInboxService.java | 44 ++-- .../inbox/server/MockedInboxSubTest.java | 28 +-- .../inbox/server/MockedInboxUnsubTest.java | 12 +- .../src/test/resources/logback.xml | 2 +- .../inbox/store/schema/KVSchemaUtil.java | 6 +- .../inbox/store/schema/KVSchemaUtilTest.java | 2 +- .../store/spi/IInboxStoreBalancerFactory.java | 4 +- .../bifromq/inbox/store/spi/SplitKey.java | 14 +- .../bifromq/inbox/store/IInboxStore.java | 2 +- .../inbox/store/IInboxStoreGCProcessor.java | 2 +- .../bifromq/inbox/store/InboxStore.java | 20 +- .../inbox/store/InboxStoreBuilder.java | 28 +-- .../bifromq/inbox/store/InboxStoreCoProc.java | 204 ++++++++--------- .../inbox/store/InboxStoreCoProcFactory.java | 44 ++-- .../inbox/store/InboxStoreGCProcessor.java | 28 +-- .../bifromq/inbox/store/TenantInboxSet.java | 20 +- .../bifromq/inbox/store/TenantsState.java | 20 +- .../balance/RangeLeaderBalancerFactory.java | 8 +- .../balance/RangeSplitBalancerFactory.java | 10 +- .../balance/ReplicaCntBalancerFactory.java | 8 +- .../inbox/store/delay/DelayTaskRunner.java | 4 +- .../inbox/store/delay/ExpireInboxTask.java | 12 +- .../inbox/store/delay/IDelayTaskRunner.java | 2 +- .../inbox/store/delay/IDelayedTask.java | 2 +- .../store/delay/RetryableDelayedTask.java | 4 +- .../inbox/store/delay/SendLWTTask.java | 14 +- ...nbox.store.spi.IInboxStoreBalancerFactory} | 6 +- .../apache}/bifromq/inbox/store/GCTest.java | 14 +- .../bifromq/inbox/store/InboxAdminTest.java | 26 +-- .../bifromq/inbox/store/InboxExistTest.java | 18 +- .../inbox/store/InboxGCProcessorTest.java | 28 +-- .../bifromq/inbox/store/InboxInsertTest.java | 36 +-- .../inbox/store/InboxLWTDelayTest.java | 20 +- .../bifromq/inbox/store/InboxLWTTest.java | 30 +-- .../inbox/store/InboxSessionEventTest.java | 18 +- .../bifromq/inbox/store/InboxStoreTest.java | 144 ++++++------ .../inbox/store/InboxSubUnsubTest.java | 20 +- .../bifromq/inbox/store/LoadExistingTest.java | 16 +- .../bifromq/inbox/store/LoadSubStatsTest.java | 16 +- .../bifromq/inbox/store/MessageUtil.java | 26 +-- .../bifromq/inbox/store/MeterTest.java | 6 +- .../apache}/bifromq/inbox/store/QoS0Test.java | 4 +- .../apache}/bifromq/inbox/store/QoS1Test.java | 4 +- .../apache}/bifromq/inbox/store/QoS2Test.java | 4 +- .../bifromq/inbox/store/SendLWTEventTest.java | 48 ++-- .../bifromq/inbox/store/SubStatsTest.java | 20 +- .../inbox/store/TenantInboxSetTest.java | 20 +- .../bifromq/inbox/store/TenantsStateTest.java | 16 +- .../store/delay/DelayTaskRunnerTest.java | 2 +- .../store/delay/RetryableDelayedTaskTest.java | 6 +- .../apache}/bifromq/metrics/ITenantMeter.java | 2 +- .../apache}/bifromq/metrics/TenantGauges.java | 4 +- .../apache}/bifromq/metrics/TenantMeter.java | 2 +- .../bifromq/metrics/TenantMeterCache.java | 2 +- .../apache}/bifromq/metrics/TenantMetric.java | 2 +- .../bifromq/metrics/TenantMeterTest.java | 4 +- .../benchmark/TenantMeterBenchmark.java | 4 +- .../benchmark/TenantMeterBenchmarkState.java | 4 +- .../bifromq/mqtt/inbox/DeliveryPipeline.java | 28 +-- .../bifromq/mqtt/inbox/IMqttBrokerClient.java | 12 +- .../mqtt/inbox/IMqttBrokerClientBuilder.java | 2 +- .../bifromq/mqtt/inbox/MqttBrokerClient.java | 38 ++-- .../mqtt/inbox/MqttBrokerClientBuilder.java | 6 +- .../mqtt/inbox/DeliveryPipelineTest.java | 24 +- .../bifromq/mqtt/inbox/RPCBluePrint.java | 6 +- .../mqtt/inbox/util/DelivererKeyUtil.java | 4 +- .../proto/mqttbroker/MessageReceiver.proto | 2 +- .../mqtt/inbox/util/DeliveryKeyUtilTest.java | 2 +- .../bifromq/mqtt/ConnListenerBuilder.java | 2 +- .../apache}/bifromq/mqtt/IMQTTBroker.java | 2 +- .../bifromq/mqtt/IMQTTBrokerBuilder.java | 2 +- .../apache}/bifromq/mqtt/MQTTBroker.java | 34 +-- .../bifromq/mqtt/MQTTBrokerBuilder.java | 34 +-- .../bifromq/mqtt/handler/ChannelAttrs.java | 4 +- .../mqtt/handler/ClientAddrHandler.java | 4 +- .../handler/ConditionalRejectHandler.java | 10 +- .../handler/ConditionalSlowDownHandler.java | 18 +- .../handler/ConnectionRateLimitHandler.java | 8 +- .../mqtt/handler/IMQTTProtocolHelper.java | 22 +- .../bifromq/mqtt/handler/MPSThrottler.java | 2 +- .../mqtt/handler/MQTTConnectHandler.java | 96 ++++---- .../handler/MQTTMessageDebounceHandler.java | 2 +- .../mqtt/handler/MQTTMessageHandler.java | 2 +- .../mqtt/handler/MQTTPacketFilter.java | 30 +-- .../handler/MQTTPersistentSessionHandler.java | 94 ++++---- .../mqtt/handler/MQTTPreludeHandler.java | 24 +- .../mqtt/handler/MQTTSessionHandler.java | 212 +++++++++--------- .../mqtt/handler/MQTTSessionIdUtil.java | 10 +- .../handler/MQTTTransientSessionHandler.java | 82 +++---- .../mqtt/handler/ProxyProtocolDetector.java | 2 +- .../mqtt/handler/ProxyProtocolHandler.java | 2 +- .../handler/SendBufferCapacityHinter.java | 2 +- .../bifromq/mqtt/handler/TenantSettings.java | 68 +++--- .../mqtt/handler/condition/Condition.java | 2 +- .../condition/DirectMemPressureCondition.java | 6 +- .../condition/HeapMemPressureCondition.java | 6 +- .../condition/InboundResourceCondition.java | 8 +- .../mqtt/handler/condition/ORCondition.java | 2 +- .../bifromq/mqtt/handler/record/GoAway.java | 4 +- .../mqtt/handler/record/ProtocolResponse.java | 4 +- .../mqtt/handler/v3/MQTT3ConnectHandler.java | 114 +++++----- .../mqtt/handler/v3/MQTT3MessageBuilders.java | 4 +- .../mqtt/handler/v3/MQTT3MessageUtils.java | 8 +- .../v3/MQTT3PersistentSessionHandler.java | 18 +- .../mqtt/handler/v3/MQTT3ProtocolHelper.java | 98 ++++---- .../v3/MQTT3TransientSessionHandler.java | 16 +- .../mqtt/handler/v5/IReAuthenticator.java | 18 +- .../mqtt/handler/v5/MQTT5ConnectHandler.java | 142 ++++++------ .../mqtt/handler/v5/MQTT5MessageBuilders.java | 28 +-- .../mqtt/handler/v5/MQTT5MessageUtils.java | 14 +- .../v5/MQTT5PersistentSessionHandler.java | 18 +- .../mqtt/handler/v5/MQTT5ProtocolHelper.java | 132 +++++------ .../v5/MQTT5TransientSessionHandler.java | 16 +- .../mqtt/handler/v5/ReAuthenticator.java | 34 +-- .../handler/v5/ReceiverTopicAliasManager.java | 2 +- .../handler/v5/SenderTopicAliasManager.java | 2 +- .../v5/reason/MQTT5AuthReasonCode.java | 2 +- .../v5/reason/MQTT5DisconnectReasonCode.java | 2 +- .../v5/reason/MQTT5PubAckReasonCode.java | 2 +- .../v5/reason/MQTT5PubCompReasonCode.java | 2 +- .../v5/reason/MQTT5PubRecReasonCode.java | 2 +- .../v5/reason/MQTT5PubRelReasonCode.java | 2 +- .../v5/reason/MQTT5SubAckReasonCode.java | 2 +- .../v5/reason/MQTT5UnsubAckReasonCode.java | 2 +- .../ws/ByteBufToWebSocketFrameEncoder.java | 2 +- .../mqtt/handler/ws/MqttOverWSHandler.java | 16 +- .../ws/WebSocketFrameToByteBufDecoder.java | 2 +- .../mqtt/handler/ws/WebSocketOnlyHandler.java | 2 +- .../mqtt/service/ILocalDistService.java | 18 +- .../mqtt/service/ILocalSessionRegistry.java | 4 +- .../mqtt/service/ILocalSessionServer.java | 2 +- .../service/ILocalSessionServerBuilder.java | 2 +- .../mqtt/service/ILocalTopicRouter.java | 30 +-- .../mqtt/service/LocalDistService.java | 44 ++-- .../service/LocalSessionBrokerService.java | 26 +-- .../mqtt/service/LocalSessionRegistry.java | 4 +- .../mqtt/service/LocalSessionServer.java | 4 +- .../service/LocalSessionServerBuilder.java | 4 +- .../service/LocalSessionWritePipeline.java | 16 +- .../mqtt/service/LocalTopicRouter.java | 16 +- .../mqtt/session/IMQTTPersistentSession.java | 2 +- .../bifromq/mqtt/session/IMQTTSession.java | 10 +- .../mqtt/session/IMQTTTransientSession.java | 4 +- .../mqtt/session/MQTTSessionAuthProvider.java | 22 +- .../mqtt/session/MQTTSessionContext.java | 32 +-- .../bifromq/mqtt/session/TenantGauge.java | 6 +- .../apache}/bifromq/mqtt/utils/AuthUtil.java | 32 +-- .../bifromq/mqtt/utils/IMQTTMessageSizer.java | 2 +- .../bifromq/mqtt/utils/MQTT3MessageSizer.java | 2 +- .../bifromq/mqtt/utils/MQTT5MessageSizer.java | 2 +- .../mqtt/utils/MQTTMessageTrimmer.java | 2 +- .../apache}/bifromq/mqtt/MockableTest.java | 2 +- .../apache}/bifromq/mqtt/TestUtils.java | 2 +- .../mqtt/condition/ORConditionTest.java | 6 +- .../mqtt/handler/BaseSessionHandlerTest.java | 126 +++++------ .../mqtt/handler/ClientAddrHandlerTest.java | 4 +- .../handler/ConditionalRejectHandlerTest.java | 10 +- .../ConditionalSlowDownHandlerTest.java | 18 +- .../ConnectionRateLimitHandlerTest.java | 6 +- .../handler/InboundResourceConditionTest.java | 12 +- .../mqtt/handler/MQTTConnectHandlerTest.java | 26 +-- .../MQTTMessageDebounceHandlerTest.java | 4 +- .../mqtt/handler/MQTTPacketFilterTest.java | 24 +- .../mqtt/handler/MQTTPreludeHandlerTest.java | 20 +- .../handler/ProxyProtocolDetectorTest.java | 2 +- .../handler/ProxyProtocolHandlerTest.java | 2 +- .../bifromq/mqtt/handler/v3/BaseMQTTTest.java | 132 +++++------ .../handler/v3/MQTT3ConnectHandlerTest.java | 48 ++-- .../v3/MQTT3PersistentSessionHandlerTest.java | 80 +++---- .../v3/MQTT3TransientSessionHandlerTest.java | 128 +++++------ .../mqtt/handler/v3/MQTTBadConnectTest.java | 6 +- .../mqtt/handler/v3/MQTTC2SPubTest.java | 44 ++-- .../mqtt/handler/v3/MQTTConnectTest.java | 26 +-- .../mqtt/handler/v3/MQTTDisconnectTest.java | 24 +- .../bifromq/mqtt/handler/v3/MQTTKickTest.java | 18 +- .../v3/MQTTMessageDebounceHandlerTest.java | 4 +- .../handler/v3/MQTTPersistentS2CPubTest.java | 58 ++--- .../mqtt/handler/v3/MQTTRetainPubTest.java | 24 +- .../bifromq/mqtt/handler/v3/MQTTSubTest.java | 24 +- .../handler/v3/MQTTTransientS2CPubTest.java | 2 +- .../mqtt/handler/v3/MQTTUnSubTest.java | 26 +-- .../mqtt/handler/v3/MQTTWillMessageTest.java | 44 ++-- .../mqtt/handler/v5/EnhancedAuthTest.java | 70 +++--- .../handler/v5/MQTT5ConnectHandlerTest.java | 68 +++--- .../v5/MQTT5PersistentSessionHandlerTest.java | 66 +++--- .../v5/MQTT5TransientSessionHandlerTest.java | 124 +++++----- .../v5/ReceiverTopicAliasManagerTest.java | 2 +- .../v5/SenderTopicAliasManagerTest.java | 2 +- .../ByteBufToWebSocketFrameEncoderTest.java | 2 +- .../handler/ws/MqttOverWSHandlerTest.java | 14 +- .../WebSocketFrameToByteBufDecoderTest.java | 2 +- .../handler/ws/WebSocketOnlyHandlerTest.java | 2 +- .../bifromq/mqtt/integration/MQTTTest.java | 78 +++---- .../v3/MQTTBadConnectMessageTest.java | 10 +- .../mqtt/integration/v3/MQTTConnectTest.java | 34 +-- .../integration/v3/MQTTDisconnectTest.java | 22 +- .../mqtt/integration/v3/MQTTFanInTest.java | 18 +- .../mqtt/integration/v3/MQTTFanOutTest.java | 18 +- .../mqtt/integration/v3/MQTTKickTest.java | 18 +- .../mqtt/integration/v3/MQTTLastWillTest.java | 20 +- .../mqtt/integration/v3/MQTTPubSubTest.java | 20 +- .../mqtt/integration/v3/MQTTRetainTest.java | 22 +- .../mqtt/integration/v3/client/MqttMsg.java | 2 +- .../integration/v3/client/MqttResponse.java | 2 +- .../v3/client/MqttTestAsyncClient.java | 2 +- .../integration/v3/client/MqttTestClient.java | 2 +- .../bifromq/mqtt/integration/v5/LWTTest.java | 26 +-- .../mqtt/integration/v5/MQTTConnectTest.java | 18 +- .../mqtt/integration/v5/PubFailTest.java | 24 +- .../mqtt/integration/v5/PubSubTest.java | 18 +- .../mqtt/integration/v5/client/MqttMsg.java | 2 +- .../integration/v5/client/MqttResponse.java | 2 +- .../v5/client/MqttTestAsyncClient.java | 2 +- .../integration/v5/client/MqttTestClient.java | 2 +- .../mqtt/service/LocalDistServiceTest.java | 36 +-- .../service/LocalSessionRegistryTest.java | 6 +- .../mqtt/service/LocalTopicRouterTest.java | 16 +- .../session/MQTTSessionAuthProviderTest.java | 16 +- .../bifromq/mqtt/session/TenantGaugeTest.java | 8 +- .../mqtt/utils/MQTT3MessageSizerTest.java | 6 +- .../mqtt/utils/MQTT5MessageSizerTest.java | 36 +-- .../bifromq/mqtt/utils/MQTTMessageUtils.java | 6 +- .../bifromq/mqtt/utils/TestTicker.java | 2 +- .../src/test/resources/logback.xml | 2 +- .../resources/archetype-resources/README.md | 2 +- .../main/java/__pluginName__AuthProvider.java | 24 +- .../src/main/java/__pluginName__.java | 2 +- .../src/main/java/__pluginContextName__.java | 2 +- .../authprovider/AuthProviderManager.java | 38 ++-- .../authprovider/DevOnlyAuthProvider.java | 17 +- .../plugin/authprovider/MetricConstants.java | 2 +- .../plugin/authprovider/MetricManager.java | 10 +- .../authprovider/AuthProviderManagerTest.java | 48 ++-- .../plugin/authprovider/IAuthProvider.java | 30 +-- .../src/main/proto/mqtt3_auth_types.proto | 2 +- .../src/main/proto/mqtt5_auth_types.proto | 2 +- .../src/main/proto/mqtt_actions.proto | 2 +- .../clientbalancer/ClientBalancerManager.java | 4 +- .../clientbalancer/DummyClientBalancer.java | 4 +- .../ClientBalancerManagerTest.java | 4 +- .../ClientBalancerTestStub.java | 4 +- .../clientbalancer/IClientBalancer.java | 4 +- .../plugin/clientbalancer/Redirection.java | 2 +- .../bifromq/plugin/BifroMQPluginContext.java | 2 +- .../plugin/BifroMQPluginDescriptor.java | 2 +- .../eventcollector/EventCollectorManager.java | 4 +- .../plugin/eventcollector/EventPool.java | 2 +- .../eventcollector/ThreadLocalEventPool.java | 2 +- .../EventCollectorManagerTest.java | 6 +- .../EventCollectorTestStub.java | 2 +- .../plugin/eventcollector/EventPoolTest.java | 2 +- .../ThreadLocalEventPoolTest.java | 4 +- .../plugin/eventcollector/ClientEvent.java | 4 +- .../bifromq/plugin/eventcollector/Event.java | 2 +- .../plugin/eventcollector/EventType.java | 2 +- .../eventcollector/IEventCollector.java | 2 +- .../eventcollector/OutOfTenantResource.java | 4 +- .../distservice/DeliverError.java | 10 +- .../distservice/DeliverNoInbox.java | 10 +- .../eventcollector/distservice/Delivered.java | 10 +- .../eventcollector/distservice/DistError.java | 16 +- .../eventcollector/distservice/Disted.java | 8 +- .../distservice/MatchError.java | 6 +- .../eventcollector/distservice/Matched.java | 6 +- .../distservice/SubscribeError.java | 8 +- .../distservice/Subscribed.java | 8 +- .../distservice/UnmatchError.java | 6 +- .../eventcollector/distservice/Unmatched.java | 6 +- .../distservice/UnsubscribeError.java | 6 +- .../distservice/Unsubscribed.java | 6 +- .../inboxservice/Overflowed.java | 6 +- .../mqttbroker/OversizePacketDropped.java | 8 +- .../eventcollector/mqttbroker/PingReq.java | 6 +- .../accessctrl/AccessControlError.java | 6 +- .../accessctrl/PubActionDisallow.java | 8 +- .../accessctrl/SubActionDisallow.java | 8 +- .../accessctrl/UnsubActionDisallow.java | 6 +- .../mqttbroker/channelclosed/AuthError.java | 4 +- .../channelclosed/ChannelClosedEvent.java | 4 +- .../channelclosed/ChannelError.java | 4 +- .../channelclosed/ConnectTimeout.java | 4 +- .../EnhancedAuthAbortByClient.java | 4 +- .../channelclosed/IdentifierRejected.java | 4 +- .../MalformedClientIdentifier.java | 4 +- .../channelclosed/MalformedUserName.java | 4 +- .../channelclosed/MalformedWillTopic.java | 4 +- .../channelclosed/NotAuthorizedClient.java | 4 +- .../channelclosed/ProtocolError.java | 4 +- .../channelclosed/UnacceptedProtocolVer.java | 4 +- .../channelclosed/UnauthenticatedClient.java | 4 +- .../clientconnected/ClientConnected.java | 8 +- .../clientdisconnect/BadPacket.java | 4 +- .../mqttbroker/clientdisconnect/ByClient.java | 4 +- .../mqttbroker/clientdisconnect/ByServer.java | 4 +- .../clientdisconnect/ClientChannelError.java | 4 +- .../ClientDisconnectEvent.java | 4 +- .../clientdisconnect/ExceedPubRate.java | 4 +- .../ExceedReceivingLimit.java | 4 +- .../mqttbroker/clientdisconnect/Idle.java | 4 +- .../clientdisconnect/InboxTransientError.java | 4 +- .../clientdisconnect/InvalidTopic.java | 4 +- .../clientdisconnect/InvalidTopicFilter.java | 4 +- .../mqttbroker/clientdisconnect/Kicked.java | 6 +- .../clientdisconnect/MalformedTopic.java | 4 +- .../MalformedTopicFilter.java | 4 +- .../clientdisconnect/NoPubPermission.java | 6 +- .../clientdisconnect/ProtocolViolation.java | 4 +- .../clientdisconnect/ReAuthFailed.java | 4 +- .../mqttbroker/clientdisconnect/Redirect.java | 4 +- .../clientdisconnect/ResourceThrottled.java | 4 +- .../clientdisconnect/ServerBusy.java | 4 +- .../TooLargeSubscription.java | 4 +- .../TooLargeUnsubscription.java | 4 +- .../mqttbroker/disthandling/Discard.java | 6 +- .../mqttbroker/disthandling/DistEvent.java | 4 +- .../disthandling/QoS0DistError.java | 4 +- .../disthandling/QoS1DistError.java | 4 +- .../disthandling/QoS1PubAckDropped.java | 4 +- .../mqttbroker/disthandling/QoS1PubAcked.java | 4 +- .../disthandling/QoS2DistError.java | 4 +- .../disthandling/QoS2PubRecDropped.java | 4 +- .../mqttbroker/disthandling/QoS2PubReced.java | 4 +- .../disthandling/WillDistError.java | 6 +- .../mqttbroker/disthandling/WillDisted.java | 6 +- .../mqttbroker/pushhandling/DropReason.java | 2 +- .../mqttbroker/pushhandling/PushEvent.java | 6 +- .../mqttbroker/pushhandling/QoS0Dropped.java | 4 +- .../mqttbroker/pushhandling/QoS0Pushed.java | 4 +- .../pushhandling/QoS1Confirmed.java | 4 +- .../mqttbroker/pushhandling/QoS1Dropped.java | 4 +- .../mqttbroker/pushhandling/QoS1Pushed.java | 4 +- .../pushhandling/QoS2Confirmed.java | 4 +- .../mqttbroker/pushhandling/QoS2Dropped.java | 4 +- .../mqttbroker/pushhandling/QoS2Pushed.java | 4 +- .../mqttbroker/pushhandling/QoS2Received.java | 4 +- .../retainhandling/MatchRetainError.java | 4 +- .../retainhandling/MsgRetained.java | 6 +- .../retainhandling/MsgRetainedError.java | 6 +- .../retainhandling/RetainEvent.java | 4 +- .../retainhandling/RetainMsgCleared.java | 4 +- .../mqttbroker/subhandling/SubAcked.java | 6 +- .../mqttbroker/subhandling/UnsubAcked.java | 6 +- .../session/MQTTSessionStart.java | 8 +- .../session/MQTTSessionStop.java | 8 +- .../apache}/bifromq/plugin/BifroMQPlugin.java | 2 +- .../bifromq/plugin/BifroMQPluginTest.java | 2 +- .../manager/BifroMQDefaultPluginLoader.java | 2 +- .../BifroMQDevelopmentPluginLoader.java | 2 +- .../manager/BifroMQExtensionFactory.java | 6 +- .../manager/BifroMQExtensionFinder.java | 2 +- .../manager/BifroMQJarPluginLoader.java | 2 +- .../manager/BifroMQPluginClassLoader.java | 2 +- .../plugin/manager/BifroMQPluginFactory.java | 6 +- .../plugin/manager/BifroMQPluginManager.java | 2 +- .../plugin/manager/ProvidedPackages.java | 6 +- .../DevOnlyResourceThrottler.java | 5 +- .../ResourceThrottlerManager.java | 4 +- .../ResourceThrottlerTestStub.java | 4 +- .../TenantResourceThrottlerManagerTest.java | 3 +- .../resourcethrottler/IResourceThrottler.java | 2 +- .../resourcethrottler/TenantResourceType.java | 2 +- .../plugin/settingprovider/CacheOptions.java | 2 +- .../CacheableSettingProvider.java | 2 +- .../DevOnlySettingProvider.java | 2 +- .../MonitoredSettingProvider.java | 2 +- .../SettingProviderManager.java | 2 +- .../CacheableSettingProviderTest.java | 2 +- .../MonitoredSettingProviderTest.java | 2 +- .../SettingProviderManagerTest.java | 2 +- .../SettingProviderTestStub.java | 2 +- .../settingprovider/ISettingProvider.java | 2 +- .../plugin/settingprovider/Setting.java | 2 +- .../plugin/settingprovider/SettingTest.java | 2 +- .../plugin/subbroker/ISubBrokerManager.java | 2 +- .../plugin/subbroker/MonitoredSubBroker.java | 2 +- .../plugin/subbroker/NoInboxSubBroker.java | 4 +- .../plugin/subbroker/SubBrokerManager.java | 2 +- .../subbroker/SubBrokerManagerTest.java | 6 +- .../bifromq/plugin/subbroker/IDeliverer.java | 2 +- .../bifromq/plugin/subbroker/ISubBroker.java | 2 +- .../bifromq/plugin/subbroker/TypeUtil.java | 4 +- .../src/main/proto/subbroker/type.proto | 2 +- .../bifromq/retain/client/IRetainClient.java | 18 +- .../bifromq/retain/client/RetainClient.java | 34 +-- .../retain/client/RetainClientBuilder.java | 8 +- .../retainservice/RetainStoreCoProc.proto | 2 +- .../store/gc/IRetainStoreGCProcessor.java | 2 +- .../store/gc/RetainStoreGCProcessor.java | 40 ++-- .../store/gc/RetainStoreGCProcessorTest.java | 20 +- .../apache}/bifromq/retain/RPCBluePrint.java | 6 +- .../proto/retainservice/RetainService.proto | 2 +- .../bifromq/retain/server/IRetainServer.java | 2 +- .../bifromq/retain/server/RetainServer.java | 18 +- .../retain/server/RetainServerBuilder.java | 12 +- .../bifromq/retain/server/RetainService.java | 52 ++--- .../server/scheduler/BatchMatchCall.java | 56 ++--- .../scheduler/BatchMatchCallHelper.java | 8 +- .../server/scheduler/BatchRetainCall.java | 28 +-- .../scheduler/BatchRetainCallHelper.java | 10 +- .../server/scheduler/DeleteCallScheduler.java | 14 +- .../server/scheduler/IMatchCallScheduler.java | 4 +- .../scheduler/IRetainCallScheduler.java | 8 +- .../server/scheduler/MatchCallBatcherKey.java | 2 +- .../scheduler/MatchCallRangeRouter.java | 44 ++-- .../server/scheduler/MatchCallScheduler.java | 10 +- .../scheduler/MatchRetainedRequest.java | 2 +- .../server/scheduler/MatchRetainedResult.java | 6 +- .../server/scheduler/RetainCallScheduler.java | 14 +- .../retain/server/RetainServiceTest.java | 40 ++-- .../BatchMatchRetainedRequestHelperTest.java | 14 +- .../scheduler/BatchRetainCallHelperTest.java | 14 +- .../MatchRetainedRequestRangeRouterTest.java | 20 +- .../retain/store/schema/KVSchemaUtil.java | 14 +- .../retain/store/schema/LevelHash.java | 2 +- .../retain/store/schema/KVSchemaUtilTest.java | 20 +- .../retain/store/schema/LevelHashTest.java | 2 +- .../spi/IRetainStoreBalancerFactory.java | 4 +- .../bifromq/retain/store/spi/SplitKey.java | 16 +- .../bifromq/retain/store/IRetainStore.java | 2 +- .../bifromq/retain/store/RetainMatcher.java | 2 +- .../bifromq/retain/store/RetainStore.java | 24 +- .../retain/store/RetainStoreBuilder.java | 12 +- .../retain/store/RetainStoreCoProc.java | 70 +++--- .../store/RetainStoreCoProcFactory.java | 16 +- .../retain/store/TenantRetainedSet.java | 22 +- .../bifromq/retain/store/TenantsState.java | 4 +- .../balance/RangeLeaderBalancerFactory.java | 8 +- .../balance/RangeSplitBalancerFactory.java | 10 +- .../balance/ReplicaCntBalancerFactory.java | 8 +- .../retain/store/index/IRetainTopicIndex.java | 2 +- .../retain/store/index/RetainTopicIndex.java | 14 +- .../retain/store/index/RetainedMsgInfo.java | 2 +- ...ain.store.spi.IRetainStoreBalancerFactory} | 6 +- .../retain/store/DeleteBehaviorTest.java | 6 +- .../apache}/bifromq/retain/store/GCTest.java | 6 +- .../retain/store/LoadMetadataTest.java | 4 +- .../retain/store/ReplaceBehaviorTest.java | 8 +- .../retain/store/RetainBehaviorTest.java | 8 +- .../bifromq/retain/store/RetainMatchTest.java | 6 +- .../retain/store/RetainMatcherTest.java | 14 +- .../bifromq/retain/store/RetainStoreTest.java | 94 ++++---- .../bifromq/retain/store/StatsTest.java | 8 +- .../retain/store/TenantRetainSetTest.java | 18 +- .../retain/store/TenantsStateTest.java | 8 +- .../store/index/RetainTopicIndexTest.java | 2 +- .../client/ISessionDictClient.java | 30 +-- .../client/ISessionRegistration.java | 2 +- .../sessiondict/client/SessionDictClient.java | 40 ++-- .../client/SessionDictClientBuilder.java | 8 +- .../sessiondict/client/SessionRegister.java | 14 +- .../client/SessionRegistration.java | 13 +- .../scheduler/BatchSessionExistCall.java | 23 +- .../scheduler/IOnlineCheckScheduler.java | 8 +- .../scheduler/OnlineCheckScheduler.java | 31 +-- .../client/type/OnlineCheckRequest.java | 2 +- .../client/type/OnlineCheckResult.java | 2 +- .../bifromq/sessiondict/client/KillTest.java | 16 +- .../client/SessionRegisterTest.java | 36 +-- .../bifromq/sessiondict/RPCBluePrint.java | 14 +- .../sessiondict/SessionRegisterKeyUtil.java | 10 +- .../sessiondict/SessionDictService.proto | 2 +- .../server/ISessionDictServer.java | 2 +- .../sessiondict/server/ISessionRegister.java | 14 +- .../sessiondict/server/ISessionRegistry.java | 18 +- .../sessiondict/server/MqttClientKey.java | 8 +- .../sessiondict/server/SessionDictServer.java | 6 +- .../server/SessionDictServerBuilder.java | 6 +- .../server/SessionDictService.java | 42 ++-- .../server/SessionExistPipeline.java | 10 +- .../sessiondict/server/SessionRegister.java | 12 +- .../sessiondict/server/SessionRegistry.java | 20 +- .../server/SessionRegisterTest.java | 28 ++- .../server/SessionRegistryTest.java | 34 +-- .../bifromq/sysprops/BifroMQSysProp.java | 4 +- .../sysprops/parser/BooleanParser.java | 2 +- .../bifromq/sysprops/parser/DoubleParser.java | 2 +- .../sysprops/parser/IntegerParser.java | 2 +- .../bifromq/sysprops/parser/LongParser.java | 2 +- .../bifromq/sysprops/parser/PropParser.java | 2 +- .../parser/SysPropParseException.java | 2 +- .../ClientRedirectCheckIntervalSeconds.java | 6 +- .../ClusterDomainResolveTimeoutSeconds.java | 6 +- .../ControlPlaneMaxBurstLatencyMillis.java | 6 +- .../props/DataPlaneMaxBurstLatencyMillis.java | 6 +- .../props/DeliverersPerMqttServer.java | 8 +- .../sysprops/props/DistFanOutParallelism.java | 8 +- .../props/DistInlineFanOutThreshold.java | 6 +- .../sysprops/props/DistMatchParallelism.java | 8 +- .../props/DistMaxCachedRoutesPerTenant.java | 6 +- .../props/DistTopicMatchExpirySeconds.java | 6 +- .../props/DistWorkerCallQueueNum.java | 8 +- .../props/DistWorkerFanOutSplitThreshold.java | 6 +- ...DistWorkerLoadEstimationWindowSeconds.java | 6 +- .../props/InboxCheckQueuesPerRange.java | 6 +- .../sysprops/props/InboxDelivererNum.java | 6 +- .../props/InboxFetchQueuesPerRange.java | 8 +- ...InboxStoreLoadEstimationWindowSeconds.java | 6 +- .../props/InboxTouchQueuesPerRange.java | 8 +- .../IngressSlowDownDirectMemoryUsage.java | 6 +- .../props/IngressSlowDownHeapMemoryUsage.java | 6 +- .../props/MaxMqtt3ClientIdLength.java | 6 +- .../props/MaxMqtt5ClientIdLength.java | 6 +- .../props/MaxSlowDownTimeoutSeconds.java | 6 +- .../PersistentSessionDetachTimeoutSecond.java | 6 +- ...etainStoreLoadEstimationWindowSeconds.java | 6 +- .../props/SanityCheckMqttUtf8String.java | 6 +- .../sysprops/props/SessionRegisterNumber.java | 6 +- .../bifromq/sysprops/BifroMQSysPropTest.java | 4 +- .../sysprops/parser/BooleanParserTest.java | 2 +- .../sysprops/parser/DoubleParserTest.java | 2 +- .../sysprops/parser/IntegerParserTest.java | 2 +- .../sysprops/parser/LongParserTest.java | 2 +- .../apache}/bifromq/util/BSUtil.java | 2 +- .../apache}/bifromq/util/SizeUtil.java | 6 +- .../apache}/bifromq/util/TopicConst.java | 2 +- .../apache}/bifromq/util/TopicUtil.java | 22 +- .../apache}/bifromq/util/UTF8Util.java | 2 +- .../apache}/bifromq/util/index/Branch.java | 2 +- .../apache}/bifromq/util/index/CNode.java | 2 +- .../apache}/bifromq/util/index/INode.java | 2 +- .../apache}/bifromq/util/index/MainNode.java | 2 +- .../apache}/bifromq/util/index/TNode.java | 2 +- .../bifromq/util/index/TopicLevelTrie.java | 2 +- .../apache}/bifromq/util/TopicUtilsTest.java | 12 +- .../apache}/bifromq/util/UTF8UtilTest.java | 2 +- .../build-bifromq-starters/bin/standalone.bat | 2 +- .../build-bifromq-starters/bin/standalone.sh | 4 +- build/build-bifromq-starters/conf/logback.xml | 10 +- .../conf/standalone.yml | 6 +- .../bifromq/starter/ServiceBootstrapper.java | 26 +-- .../bifromq/starter/StandaloneStarter.java | 56 +++-- .../starter/config/StandaloneConfig.java | 22 +- .../config/StandaloneConfigConsolidator.java | 14 +- .../starter/config/model/BalancerOptions.java | 2 +- .../starter/config/model/ClusterConfig.java | 2 +- .../starter/config/model/ExecutorConfig.java | 2 +- .../config/model/InMemEngineConfig.java | 2 +- .../starter/config/model/RPCConfig.java | 2 +- .../config/model/RocksDBEngineConfig.java | 4 +- .../config/model/SSLContextConfig.java | 2 +- .../config/model/ServerSSLContextConfig.java | 2 +- .../config/model/StorageEngineConfig.java | 2 +- .../config/model/api/APIServerConfig.java | 4 +- .../model/dict/SessionDictClientConfig.java | 2 +- .../model/dict/SessionDictServerConfig.java | 2 +- .../model/dict/SessionDictServiceConfig.java | 2 +- .../config/model/dist/DistClientConfig.java | 2 +- .../config/model/dist/DistServerConfig.java | 2 +- .../config/model/dist/DistServiceConfig.java | 2 +- .../model/dist/DistWorkerClientConfig.java | 2 +- .../config/model/dist/DistWorkerConfig.java | 12 +- .../config/model/inbox/InboxClientConfig.java | 2 +- .../config/model/inbox/InboxServerConfig.java | 2 +- .../model/inbox/InboxServiceConfig.java | 2 +- .../model/inbox/InboxStoreClientConfig.java | 2 +- .../config/model/inbox/InboxStoreConfig.java | 16 +- .../model/mqtt/MQTTBrokerClientConfig.java | 2 +- .../config/model/mqtt/MQTTServerConfig.java | 12 +- .../config/model/mqtt/MQTTServiceConfig.java | 2 +- .../mqtt/listener/TCPListenerConfig.java | 2 +- .../mqtt/listener/TLSListenerConfig.java | 4 +- .../model/mqtt/listener/WSListenerConfig.java | 2 +- .../mqtt/listener/WSSListenerConfig.java | 4 +- .../model/retain/RetainClientConfig.java | 2 +- .../model/retain/RetainServerConfig.java | 2 +- .../model/retain/RetainServiceConfig.java | 2 +- .../model/retain/RetainStoreClientConfig.java | 2 +- .../model/retain/RetainStoreConfig.java | 14 +- .../metrics/netty/PooledByteBufAllocator.java | 2 +- .../netty/PooledByteBufAllocatorMetric.java | 4 +- .../starter/module/APIServerModule.java | 42 ++-- .../bifromq/starter/module/ConfigModule.java | 4 +- .../starter/module/CoreServiceModule.java | 42 ++-- .../starter/module/DistServiceModule.java | 40 ++-- .../starter/module/EngineConfUtil.java | 18 +- .../starter/module/ExecutorsModule.java | 8 +- .../starter/module/InboxServiceModule.java | 44 ++-- .../starter/module/MQTTServiceModule.java | 32 +-- .../bifromq/starter/module/PluginModule.java | 26 +-- .../module/RPCClientSSLContextModule.java | 10 +- .../module/RPCServerBuilderModule.java | 18 +- .../starter/module/RetainServiceModule.java | 36 +-- .../bifromq/starter/module/SSLUtil.java | 6 +- .../starter/module/ServiceInjector.java | 2 +- .../starter/module/ServiceInjectorModule.java | 2 +- .../module/SessionDictServiceModule.java | 12 +- .../module/SharedResourceProvider.java | 2 +- .../starter/module/SharedResourcesHolder.java | 2 +- .../starter/utils/ClusterDomainUtil.java | 2 +- .../bifromq/starter/utils/ConfigFileUtil.java | 2 +- .../bifromq/starter/utils/ResourceUtil.java | 2 +- .../starter/utils/ClusterDomainUtilTest.java | 2 +- .../starter/utils/ResourceUtilTest.java | 2 +- .../baidu/demo/plugin/DemoPluginContext.java | 22 -- .../demo/plugin/DemoAuthProvider.java | 14 +- .../bifromq}/demo/plugin/DemoPlugin.java | 12 +- .../demo/plugin/DemoPluginContext.java | 35 +++ .../demo/plugin/DemoResourceThrottler.java | 6 +- .../demo/plugin/DemoSettingProvider.java | 6 +- .../bifromq}/demo/plugin/EventLogger.java | 12 +- .../demo/plugin/WebHookBasedAuthProvider.java | 16 +- .../plugin/WebHookBasedResourceThrottler.java | 13 +- .../plugin/WebHookBasedSettingProvider.java | 6 +- .../demo/plugin/util/VariableUtil.java | 15 +- .../bifromq}/demo/plugin/TestAuthServer.java | 48 ++-- .../demo/plugin/TestSettingServer.java | 31 ++- .../demo/plugin/TestThrottlerServer.java | 30 +-- .../plugin/WebHookBasedAuthProviderTest.java | 16 +- .../WebHookBasedResourceThrottlerTest.java | 4 +- .../WebHookBasedSettingProviderTest.java | 4 +- pom.xml | 6 +- testsuites/CoverageTests.xml | 6 +- testsuites/IntegrationTests.xml | 6 +- testsuites/UnitTests.xml | 6 +- .../apache}/bifromq/test/RetryAnalyser.java | 2 +- .../apache}/bifromq/test/RetryListener.java | 2 +- .../bifromq/test/RetryTransformer.java | 2 +- 1682 files changed, 9703 insertions(+), 9681 deletions(-) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHost.java (85%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHostOptions.java (98%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/IAgentHost.java (86%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/fd/DirectProbingInfo.java (91%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/fd/FailureDetector.java (97%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/fd/FailureDetectorMath.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/fd/IFailureDetector.java (97%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/fd/IProbingTarget.java (87%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/fd/IProbingTargetSelector.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/AutoDropper.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/AutoHealer.java (94%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/AutoSeeder.java (96%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/CRDTUtil.java (83%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/HostAddressResolver.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/HostMemberList.java (91%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/IHostAddressResolver.java (86%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/IHostMemberList.java (88%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/MemberSelector.java (91%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/Agent.java (94%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java (87%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentMember.java (91%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentMessenger.java (83%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/CRDTUtil.java (85%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/IAgent.java (85%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java (88%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/IAgentMember.java (88%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/IAgentMessenger.java (81%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/Gossiper.java (98%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/IMessenger.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/IRecipient.java (93%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/IRecipientSelector.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessageEnvelope.java (88%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/Messenger.java (96%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessengerMessageEnvelope.java (87%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessengerOptions.java (96%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessengerTransport.java (92%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/AbstractTransport.java (95%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/ITransport.java (96%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/PacketEnvelope.java (94%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/ProbeHandler.java (97%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/TCPTransport.java (98%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/Transport.java (98%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/transport/UDPTransport.java (97%) rename base-cluster/src/main/java/{com/baidu => org/apache}/bifromq/basecluster/util/RandomUtils.java (97%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHostNode1.java (93%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHostNode2.java (93%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHostNode3.java (91%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHostTest.java (96%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentHostsTest.java (96%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentTestCluster.java (92%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/AgentTestTemplate.java (94%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/MockNetwork.java (96%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/annotation/StoreCfg.java (95%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/annotation/StoreCfgs.java (94%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/fd/DirectProbingInfoTest.java (96%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/fd/FailureDetectorMathTest.java (90%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/fd/FailureDetectorTest.java (98%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/fd/Fixtures.java (93%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/AutoHealerTest.java (90%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/AutoSeederTest.java (89%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/Fixtures.java (86%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/HostAddressResolverTest.java (94%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/HostMemberListTest.java (93%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/MemberSelectorTest.java (95%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java (92%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentMemberTest.java (94%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java (91%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/AgentTest.java (92%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/memberlist/agent/MockUtil.java (84%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/GossiperTest.java (98%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessengerFuncTest.java (95%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessengerTest.java (95%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/messenger/MessengerTransportTest.java (91%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/TCPReceiver.java (97%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/TCPSender.java (97%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/TCPTransportFuncTest.java (99%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/TCPTransportTest.java (95%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/TransportTest.java (96%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/UDPReceiver.java (97%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/UDPSender.java (97%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/UDPTransportFuncTest.java (92%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/transport/UDPTransportTest.java (95%) rename base-cluster/src/test/java/{com/baidu => org/apache}/bifromq/basecluster/utils/RandomUtilTest.java (95%) rename base-crdt/base-crdt-service/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/service/AgentUtil.java (93%) rename base-crdt/base-crdt-service/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/service/CRDTCluster.java (90%) rename base-crdt/base-crdt-service/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/service/CRDTService.java (89%) rename base-crdt/base-crdt-service/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/service/CRDTServiceOptions.java (91%) rename base-crdt/base-crdt-service/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/service/ICRDTService.java (90%) rename base-crdt/base-crdt-service/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/service/BasicCRDTObjectTest.java (88%) rename base-crdt/base-crdt-service/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/service/CCounterTest.java (84%) rename base-crdt/base-crdt-service/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/service/CRDTServiceTestCluster.java (95%) rename base-crdt/base-crdt-service/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/service/CRDTServiceTestTemplate.java (94%) rename base-crdt/base-crdt-service/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/service/annotation/ServiceCfg.java (94%) rename base-crdt/base-crdt-service/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/service/annotation/ServiceCfgs.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/ReplicaLogger.java (81%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/AWORSetOperation.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/CCounterOperation.java (97%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/CRDTURI.java (97%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/CausalCRDTType.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/DWFlagOperation.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/EWFlagOperation.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IAWORSet.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IAWORSetInflater.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/ICCounter.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/ICCounterInflater.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/ICRDTOperation.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/ICausalCRDT.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/ICausalCRDTInflater.java (90%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IDWFlag.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IDWFlagInflater.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IEWFlag.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IEWFlagInflater.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IMVReg.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IMVRegInflater.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IORMap.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IORMapInflater.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IRWORSet.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/IRWORSetInflater.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/MVRegOperation.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/ORMapOperation.java (98%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/api/RWORSetOperation.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/exception/CRDTCloseException.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/exception/CRDTEngineException.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/exception/CRDTNotFoundException.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/AWORSet.java (85%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/AWORSetInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CCounter.java (87%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CCounterInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CausalCRDT.java (90%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CausalCRDTInflater.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java (92%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CoalesceOperation.java (89%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DWFlag.java (82%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java (89%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DWFlagInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotFunc.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotMap.java (97%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotSet.java (91%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotStore.java (87%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/EWFlag.java (82%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java (89%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/EWFlagInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/EventHistoryUtil.java (99%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ICoalesceOperation.java (84%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/IDotFunc.java (89%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/IDotMap.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/IDotSet.java (92%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/IDotStore.java (89%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/IReplicaStateLattice.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/MVReg.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java (78%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/MVRegInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ORMap.java (88%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ORMapInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ORMapUtil.java (90%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ProtoUtils.java (87%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/RWORSet.java (91%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java (88%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/RWORSetInflater.java (83%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/VarLong.java (98%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/core/util/LatticeIndexUtil.java (98%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/AntiEntropy.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/AntiEntropyManager.java (93%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/CRDTStore.java (88%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/CRDTStoreOptions.java (95%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/CompressAlgorithm.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/ICRDTStore.java (91%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/MessagePayloadUtil.java (81%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/NeighborMessage.java (87%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/PartialMesh.java (98%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/ReplicaIdGenerator.java (89%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/compressor/Compressor.java (90%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/compressor/GzipCompressor.java (96%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/store/compressor/NoopCompressor.java (94%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/util/Formatter.java (84%) rename base-crdt/base-crdt-store/src/main/java/{com/baidu => org/apache}/bifromq/basecrdt/util/ProtoUtil.java (94%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/LoggerTest.java (82%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java (82%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java (84%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java (94%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/AWORSetTest.java (92%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CCounterTest.java (93%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/CRDTTest.java (93%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DWFlagTest.java (90%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotFuncTest.java (91%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotMapTest.java (95%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/DotSetTest.java (90%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/EWFlagTest.java (89%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java (96%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java (97%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/MVRegTest.java (92%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/ORMapTest.java (92%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/RWORSetTest.java (91%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/TestUtil.java (97%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/internal/VarLongTest.java (97%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java (98%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/CRDTStoreTest.java (96%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/CRDTStoreTestCluster.java (95%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/CRDTStoreTestTemplate.java (93%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/PartialMeshTest.java (99%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/annotation/StoreCfg.java (95%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/annotation/StoreCfgs.java (94%) rename base-crdt/base-crdt-store/src/test/java/{com/baidu => org/apache}/bifromq/basecrdt/store/compressor/CompressorTest.java (96%) rename base-env/base-env-provider-spi/src/main/java/{com/baidu => org/apache}/bifromq/baseenv/IEnvProvider.java (98%) rename base-env/base-env-provider/src/main/java/{com/baidu => org/apache}/bifromq/baseenv/EnvProvider.java (97%) rename base-env/base-env-provider/src/main/java/{com/baidu => org/apache}/bifromq/baseenv/MemUsage.java (99%) rename base-env/base-env-provider/src/main/java/{com/baidu => org/apache}/bifromq/baseenv/NettyEnv.java (99%) rename base-env/base-env-provider/src/main/java/{com/baidu => org/apache}/bifromq/baseenv/ZeroCopyParser.java (97%) rename base-env/base-env-provider/src/test/java/{com/baidu => org/apache}/bifromq/baseenv/EnvProviderTest.java (98%) rename base-env/base-env-provider/src/test/java/{com/baidu => org/apache}/bifromq/baseenv/TestEnvProvider.java (96%) rename base-env/base-env-provider/src/test/java/{com/baidu => org/apache}/bifromq/baseenv/benchmark/MemUsageBenchmark.java (95%) delete mode 100644 base-env/base-env-provider/src/test/resources/META-INF/services/com.baidu.bifromq.baseenv.IEnvProvider create mode 100644 base-env/base-env-provider/src/test/resources/META-INF/services/org.apache.bifromq.baseenv.IEnvProvider rename base-hlc/src/main/java/{com/baidu => org/apache}/bifromq/basehlc/HLC.java (98%) rename base-hlc/src/test/java/{com/baidu => org/apache}/bifromq/basehlc/HLCTest.java (97%) rename base-hlc/src/test/java/{com/baidu => org/apache}/bifromq/basehlc/benchmark/HLCBenchmark.java (95%) rename base-hookloader/src/main/java/{com/baidu => org/apache}/bifromq/basehookloader/BaseHookLoader.java (98%) rename base-hookloader/src/test/java/{com/baidu => org/apache}/bifromq/basehookloader/BaseHookLoaderTest.java (95%) rename base-hookloader/src/test/java/{com/baidu => org/apache}/bifromq/basehookloader/ITestHookAPI.java (93%) rename base-hookloader/src/test/java/{com/baidu => org/apache}/bifromq/basehookloader/TestHookImpl.java (94%) rename base-hookloader/src/test/resources/META-INF/services/{com.baidu.bifromq.basehookloader.ITestHookAPI => org.apache.bifromq.basehookloader.ITestHookAPI} (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/AbstractKVEngine.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/AbstractKVSpaceReader.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java (93%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/ICPableKVSpace.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVEngine.java (97%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVEngineConfigurator.java (93%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpace.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceCheckpoint.java (93%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceIterator.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceMetadata.java (93%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceReader.java (90%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceWriteable.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IKVSpaceWriter.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/ISyncContext.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java (93%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/IWALableKVSpace.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/KVEngineException.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/KVEngineFactory.java (78%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/KVSpaceDescriptor.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/SyncContext.java (98%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java (91%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java (86%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVEngine.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java (86%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVSpace.java (89%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java (90%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java (89%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java (97%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java (88%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/metrics/KVSpaceMeters.java (99%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/AutoCleaner.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java (85%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/Keys.java (97%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java (94%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java (91%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java (97%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java (96%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java (91%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java (95%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java (82%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java (79%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java (86%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java (93%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java (87%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java (91%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java (92%) rename base-kv/base-kv-local-engine/src/main/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java (93%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/AbstractKVEngineTest.java (99%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/MockableTest.java (97%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/SyncContextTest.java (97%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/TestUtil.java (98%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/BenchmarkState.java (88%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java (89%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java (89%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java (90%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java (94%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java (83%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/HybridWorkload.java (97%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java (91%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java (94%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java (86%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/memory/InMemKVEngineTest.java (78%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java (95%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java (90%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java (93%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java (95%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java (92%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java (91%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java (90%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java (96%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java (88%) rename base-kv/base-kv-local-engine/src/test/java/{com/baidu => org/apache}/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java (94%) rename base-kv/base-kv-meta-service/src/main/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java (93%) rename base-kv/base-kv-meta-service/src/main/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/BaseKVMetaService.java (95%) rename base-kv/base-kv-meta-service/src/main/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java (95%) rename base-kv/base-kv-meta-service/src/main/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/IBaseKVMetaService.java (93%) rename base-kv/base-kv-meta-service/src/main/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/LoadRulesProposalHandler.java (95%) rename base-kv/base-kv-meta-service/src/main/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/NameUtil.java (91%) rename base-kv/base-kv-meta-service/src/test/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java (91%) rename base-kv/base-kv-meta-service/src/test/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java (92%) rename base-kv/base-kv-meta-service/src/test/java/{com/baidu => org/apache}/bifromq/basekv/metaservice/LandscapeCleanupTest.java (89%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/BasicStateStoreTest.java (98%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/IPeerLogReplicator.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/IRaftNode.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/IRaftNodeState.java (84%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/IRaftStateStore.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/InMemoryStateStore.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/MetricMonitoredStateStore.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicator.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorState.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogTracker.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/QuorumTracker.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftConfig.java (98%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftConfigChanger.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftLogger.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNode.java (98%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeState.java (94%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateCandidate.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateFollower.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateLeader.java (96%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/ReadProgressTracker.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/CommitEvent.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/ElectionEvent.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/RaftEvent.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/RaftEventType.java (94%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/SnapshotRestoredEvent.java (90%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/StatusChangedEvent.java (90%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/SyncStateChangedEvent.java (91%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/ClusterConfigChangeException.java (98%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/CompactionException.java (95%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/DropProposalException.java (98%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/InternalError.java (94%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/LeaderTransferException.java (98%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/ReadIndexException.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/RecoveryException.java (97%) rename base-kv/base-kv-raft/src/main/java/{com/baidu => org/apache}/bifromq/basekv/raft/exception/SnapshotException.java (94%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/InMemoryStateStoreTest.java (90%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java (96%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java (97%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java (96%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/PeerLogTrackerTest.java (95%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/QuorumTrackerTest.java (98%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftConfigChangerTest.java (98%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateCandidateTest.java (97%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateFollowerTest.java (97%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateLeaderTest.java (95%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeStateTest.java (94%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/RaftNodeTest.java (97%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/ReadProgressTrackerTest.java (96%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/ReflectionUtils.java (96%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/event/RaftEventTest.java (93%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/AbnormalTest.java (93%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java (97%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/CompactionTest.java (91%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/LeaderElectionTest.java (96%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/LogReplicationTest.java (95%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/ProposeTest.java (96%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java (91%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/RaftNodeGroup.java (95%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/RaftNodeNetwork.java (98%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java (98%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/ReadIndexTest.java (94%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/RecoveryTest.java (97%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/SnapshotRestoreTest.java (90%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/annotation/Cluster.java (94%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/annotation/Config.java (95%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/annotation/Ticker.java (94%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java (93%) rename base-kv/base-kv-raft/src/test/java/{com/baidu => org/apache}/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java (89%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/KVStoreBalanceController.java (92%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java (90%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java (88%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java (90%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java (85%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RangeLeaderBalancer.java (87%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RangeSplitBalancer.java (91%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java (84%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/ReplicaCntBalancer.java (98%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java (89%) rename base-kv/base-kv-store-balance-controller/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java (90%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/KVStoreBalanceControllerTest.java (94%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java (85%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java (93%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java (90%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java (93%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java (95%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java (93%) rename base-kv/base-kv-store-balance-controller/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/utils/DescriptorUtils.java (84%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/AwaitBalance.java (96%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/BalanceNow.java (90%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/BalanceResult.java (94%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/BalanceResultType.java (94%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/IStoreBalancerFactory.java (94%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/NoNeedBalance.java (95%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/StoreBalancer.java (93%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/BalanceCommand.java (89%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/BootstrapCommand.java (88%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/ChangeConfigCommand.java (92%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/CommandType.java (93%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/MergeCommand.java (88%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/RangeCommand.java (94%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/RecoveryCommand.java (95%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/SplitCommand.java (92%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/command/TransferLeadershipCommand.java (92%) rename base-kv/base-kv-store-balance-spi/src/main/java/{com/baidu => org/apache}/bifromq/basekv/balance/util/CommandUtil.java (89%) rename base-kv/base-kv-store-balance-spi/src/test/java/{com/baidu => org/apache}/bifromq/basekv/balance/util/CommandUtilTest.java (94%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/BaseKVStoreClient.java (88%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/BaseKVStoreClientBuilder.java (86%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/IBaseKVStoreClient.java (78%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/IMutationPipeline.java (82%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/IQueryPipeline.java (82%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/KVRangeRouterUtil.java (92%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/KVRangeSetting.java (94%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/ManagedMutationPipeline.java (88%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/ManagedQueryPipeline.java (88%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/exception/BadRequestException.java (92%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/exception/BadVersionException.java (92%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/exception/InternalErrorException.java (92%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/exception/TryLaterException.java (92%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/BatchMutationCall.java (88%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java (84%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/BatchQueryCall.java (86%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java (85%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java (91%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java (91%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java (89%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/MutationCallScheduler.java (86%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java (90%) rename base-kv/base-kv-store-client/src/main/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/QueryCallScheduler.java (87%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/KVRangeRouterUtilTest.java (93%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/KVRangeSettingTest.java (90%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/BatchMutationCallTest.java (90%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/BatchQueryCallTest.java (91%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/Fixtures.java (76%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/TestBatchMutationCall.java (91%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/TestBatchQueryCall.java (87%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java (90%) rename base-kv/base-kv-store-client/src/test/java/{com/baidu => org/apache}/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java (92%) rename base-kv/base-kv-store-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/basekv/InProcStores.java (97%) rename base-kv/base-kv-store-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/basekv/RPCBluePrint.java (79%) rename base-kv/base-kv-store-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/basekv/RPCServerMetadataUtil.java (95%) rename base-kv/base-kv-store-rpc-definition/src/test/java/{com/baidu => org/apache}/bifromq/basekv/NullableValueTest.java (92%) rename base-kv/base-kv-store-rpc-definition/src/test/java/{com/baidu => org/apache}/bifromq/basekv/RPCBluePrintTest.java (92%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/AgentHostStoreMessenger.java (84%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/BaseKVStoreServer.java (93%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/BaseKVStoreServerBuilder.java (88%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/BaseKVStoreService.java (84%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/BaseKVStoreServiceBuilder.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/IBaseKVStoreServer.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/MutatePipeline.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/server/QueryPipeline.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/IKVRangeStore.java (93%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java (88%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/IStoreMessenger.java (89%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeMessenger.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStore.java (92%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreStatsCollector.java (86%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVCloseableReader.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVIterator.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVLoadRecord.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVRangeCoProc.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVRangeCoProcFactory.java (93%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVRangeMetadata.java (77%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVRangeReader.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVRangeSplitHinter.java (76%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVReader.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/api/IKVWriter.java (92%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/exception/KVRangeException.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/exception/KVRangeStoreException.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/option/KVRangeOptions.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/option/KVRangeStoreOptions.java (83%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/AbstractKVRangeMetadata.java (81%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java (69%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVCheckpointIterator.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVCheckpointReader.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVLoadRecorder.java (91%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVLoadTracker.java (97%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRange.java (84%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeCheckpointReader.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeFSM.java (85%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeMessenger.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java (78%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeMetadataWriter.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeMetricManager.java (91%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeQueryRunner.java (86%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeWritable.java (82%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVRangeWriter.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/IKVReseter.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVCheckpointDataIterator.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVCheckpointReader.java (83%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVIterator.java (91%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVLoadRecorder.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRange.java (85%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeCheckpoint.java (73%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeDumpSession.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeFSM.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeKeys.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeMetadataWriter.java (74%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeMetricManager.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeQueryLinearizer.java (97%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeQueryRunner.java (89%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeRestorer.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeStatsCollector.java (85%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeWriter.java (77%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVReader.java (82%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVWriter.java (85%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/LoadRecordableKVIterator.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java (86%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/LoadRecordableKVReader.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/LoadRecordableKVWriter.java (92%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/LoadRecordWindow.java (98%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java (86%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java (89%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/stats/IStatsCollector.java (94%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/stats/StatsCollector.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/util/ExecutorServiceUtil.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/util/KVUtil.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/util/ProcessUtil.java (98%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/util/VerUtil.java (97%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/IKVRangeWAL.java (85%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/IKVRangeWALStore.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java (86%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java (90%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/IKVRangeWALSubscription.java (93%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWAL.java (88%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALKeys.java (95%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java (87%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALStore.java (88%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALSubscription.java (96%) rename base-kv/base-kv-store-server/src/main/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/LogEntryIteratorPool.java (90%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/MockableTest.java (98%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/TestCoProc.java (77%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/TestCoProcFactory.java (78%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/TestUtil.java (97%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/annotation/Cluster.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/benchmark/SingleNodeBenchmark.java (92%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java (91%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/server/AgentHostStoreMessengerTest.java (90%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/server/MutatePipelineTest.java (90%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/server/QueryPipelineTest.java (93%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeBootstrapTest.java (86%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeConfig.java (82%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeMessengerTest.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java (91%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java (98%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java (97%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterRWTest.java (98%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java (91%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java (92%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java (93%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreTest.java (93%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreTestCluster.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/AbstractKVRangeTest.java (81%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeDumpSessionTest.java (96%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeIteratorTest.java (93%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeMetadataTest.java (89%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java (96%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java (94%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeRestorerTest.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java (85%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVRangeTest.java (95%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVReaderTest.java (84%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/KVWriterTest.java (88%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/LoadRecorderTest.java (87%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java (90%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java (94%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/stats/StatsCollectorTest.java (97%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/util/KVUtilTest.java (77%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/util/ProcessUtilTest.java (90%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/util/VerUtilTest.java (97%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java (93%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALStoreTest.java (83%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java (97%) rename base-kv/base-kv-store-server/src/test/java/{com/baidu => org/apache}/bifromq/basekv/store/wal/KVRangeWALTest.java (91%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/Constants.java (95%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/utils/BoundaryUtil.java (99%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/utils/DescriptorUtil.java (93%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/utils/EffectiveEpoch.java (89%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/utils/EffectiveRoute.java (90%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/utils/KVRangeIdUtil.java (93%) rename base-kv/base-kv-type-proto/src/main/java/{com/baidu => org/apache}/bifromq/basekv/utils/LeaderRange.java (84%) rename base-kv/base-kv-type-proto/src/test/java/{com/baidu => org/apache}/bifromq/basekv/utils/BoundaryUtilTest.java (97%) rename base-kv/base-kv-type-proto/src/test/java/{com/baidu => org/apache}/bifromq/basekv/utils/DescriptorUtilTest.java (97%) rename base-kv/base-kv-type-proto/src/test/java/{com/baidu => org/apache}/bifromq/basekv/utils/KVRangeIdUtilTest.java (92%) rename base-logger/src/main/java/{com/baidu => org/apache}/bifromq/logger/FormatableLogger.java (98%) rename base-logger/src/main/java/{com/baidu => org/apache}/bifromq/logger/LogFormatter.java (96%) rename base-logger/src/main/java/{com/baidu => org/apache}/bifromq/logger/SiftKeyUtil.java (96%) rename base-logger/src/main/java/{com/baidu => org/apache}/bifromq/logger/SiftLogger.java (99%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/BiDiStream.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/ClientChannel.java (90%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/ConnStateListener.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/DummyServerSelector.java (90%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/IBiDiStream.java (95%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/IClientChannel.java (90%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/IConnectable.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/IRPCClient.java (99%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/IUnaryCaller.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/ManagedBiDiStream.java (98%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/ManagedMessageStream.java (95%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/ManagedRequestPipeline.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/RPCClient.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/RPCClientBuilder.java (92%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/UnaryCaller.java (90%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/ExceptionUtil.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/RequestAbortException.java (93%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/RequestCanceledException.java (93%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/RequestRejectedException.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/RequestThrottledException.java (93%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/ServerNotFoundException.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/exception/ServiceUnavailableException.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java (85%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/ChannelList.java (95%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/Constants.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/IServerSelector.java (95%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java (93%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/ITenantRouter.java (93%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/LBUtils.java (97%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java (91%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/TenantRouter.java (98%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java (96%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java (93%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/TrieMap.java (99%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/WCHRouter.java (98%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java (98%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java (87%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java (94%) rename base-rpc/base-rpc-client/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/client/util/FastBehaviorSubject.java (99%) rename base-rpc/base-rpc-client/src/test/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java (98%) rename base-rpc/base-rpc-client/src/test/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java (97%) rename base-rpc/base-rpc-client/src/test/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/TrieMapTest.java (98%) rename base-rpc/base-rpc-client/src/test/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java (98%) rename base-rpc/base-rpc-client/src/test/java/{com/baidu => org/apache}/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java (99%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/BluePrint.java (99%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/MetadataKeys.java (96%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/RPCContext.java (92%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/metrics/IRPCMeter.java (95%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/metrics/MetricTag.java (94%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/metrics/RPCMeter.java (94%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/metrics/RPCMethodMeter.java (97%) rename base-rpc/base-rpc-common/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/metrics/RPCMetric.java (98%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/AbstractResponsePipeline.java (97%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/AbstractStreamObserver.java (92%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/AckStream.java (95%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/IRPCServer.java (94%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/RPCServer.java (96%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/RPCServerBuilder.java (92%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/ResponsePipeline.java (97%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/UnaryResponse.java (91%) rename base-rpc/base-rpc-server/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java (89%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/GlobalProcessId.java (93%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java (95%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java (96%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java (97%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java (91%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/NameUtil.java (89%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java (91%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java (96%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java (95%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/ServerEndpoint.java (96%) rename base-rpc/base-rpc-traffic-governor/src/main/java/{com/baidu => org/apache}/bifromq/baserpc/trafficgovernor/SharedScheduler.java (93%) rename base-rpc/base-rpc-traffic-governor/src/test/java/{com/baidu => org/apache}/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java (90%) rename base-rpc/base-rpc-traffic-governor/src/test/java/{com/baidu => org/apache}/bifromq/trafficgovernor/RPCServiceLandscapeTest.java (92%) rename base-rpc/base-rpc-traffic-governor/src/test/java/{com/baidu => org/apache}/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java (92%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/BatchCallScheduler.java (94%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/Batcher.java (98%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/CallSchedulerFactory.java (90%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/CallTask.java (97%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/CapacityEstimatorFactory.java (91%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/EMALong.java (97%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/IBatchCall.java (97%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/IBatchCallBuilder.java (96%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/IBatchCallBuilderFactory.java (96%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/IBatchCallScheduler.java (96%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/ICallTask.java (97%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/MovingAverage.java (98%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/exception/AbortException.java (94%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/exception/BackPressureException.java (94%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/exception/BatcherUnavailableException.java (94%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/exception/DropException.java (94%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/spi/ICallScheduler.java (96%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/spi/ICallSchedulerFactory.java (94%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/spi/ICapacityEstimator.java (96%) rename base-scheduler/src/main/java/{com/baidu => org/apache}/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java (95%) rename base-scheduler/src/test/java/{com/baidu => org/apache}/bifromq/basescheduler/BatchCallSchedulerTest.java (96%) rename base-scheduler/src/test/java/{com/baidu => org/apache}/bifromq/basescheduler/CallTaskTest.java (97%) rename base-scheduler/src/test/java/{com/baidu => org/apache}/bifromq/basescheduler/EMALongTest.java (98%) rename base-scheduler/src/test/java/{com/baidu => org/apache}/bifromq/basescheduler/MovingAverageTest.java (98%) rename base-scheduler/src/test/java/{com/baidu => org/apache}/bifromq/basescheduler/TestBatchCallScheduler.java (98%) rename base-scheduler/src/test/java/{com/baidu => org/apache}/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java (94%) rename base-util/src/main/java/{com/baidu => org/apache}/bifromq/base/util/AsyncRetry.java (95%) rename base-util/src/main/java/{com/baidu => org/apache}/bifromq/base/util/AsyncRunner.java (99%) rename base-util/src/main/java/{com/baidu => org/apache}/bifromq/base/util/CompletableFutureUtil.java (98%) rename base-util/src/main/java/{com/baidu => org/apache}/bifromq/base/util/FutureTracker.java (98%) rename base-util/src/main/java/{com/baidu => org/apache}/bifromq/base/util/exception/NeedRetryException.java (95%) rename base-util/src/main/java/{com/baidu => org/apache}/bifromq/base/util/exception/RetryTimeoutException.java (95%) rename base-util/src/test/java/{com/baidu => org/apache}/bifromq/base/util/AsyncRetryTest.java (96%) rename base-util/src/test/java/{com/baidu => org/apache}/bifromq/base/util/AsyncRunnerTest.java (99%) rename base-util/src/test/java/{com/baidu => org/apache}/bifromq/base/util/CompletableFutureUtilTest.java (98%) rename base-util/src/test/java/{com/baidu => org/apache}/bifromq/base/util/FutureTrackerTest.java (98%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/APIServer.java (86%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/AbstractServerInitializer.java (88%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/ExceptionHandler.java (97%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/Headers.java (97%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/IAPIServer.java (95%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/NonTLSServerInitializer.java (86%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/TLSServerInitializer.java (87%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/AnnotationUtil.java (98%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/HTTPRequestRouter.java (95%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/HTTPRouteMap.java (95%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/IHTTPRequestHandler.java (96%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java (94%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/IHTTPRouteMap.java (94%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java (86%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java (91%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ExpireRetainHandler.java (88%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ExpireSessionHandler.java (88%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetClusterHandler.java (94%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetLoadRulesHandler.java (95%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java (93%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetSessionInfoHandler.java (90%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java (90%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetStoreRangesHandler.java (93%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java (93%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/HeaderUtils.java (85%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/JSONUtils.java (92%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/KillHandler.java (90%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ListAllServicesHandler.java (96%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ListAllStoreHandler.java (96%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/PubHandler.java (89%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/RequestHandlersFactory.java (81%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/RetainHandler.java (90%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/SetLoadRulesHandler.java (94%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java (91%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java (94%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/SubHandler.java (89%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/TenantAwareHandler.java (87%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java (93%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/UnsubHandler.java (89%) rename bifromq-apiserver/src/main/java/{com/baidu => org/apache}/bifromq/apiserver/utils/TopicUtil.java (69%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/APIServerTest.java (83%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/MockableTest.java (96%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/NonTLSServerInitializerTest.java (91%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/TLSServerInitializerTest.java (92%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/HTTPRequestRouterTest.java (95%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/HTTPRouteMapTest.java (85%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java (83%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java (94%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java (90%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java (90%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java (94%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java (96%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java (91%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/HeaderUtilsTest.java (93%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/KillHandlerTest.java (94%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java (97%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java (97%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/PubHandlerTest.java (91%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/RetainHandlerTest.java (83%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java (96%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/SubHandlerTest.java (87%) rename bifromq-apiserver/src/test/java/{com/baidu => org/apache}/bifromq/apiserver/http/handler/UnsubHandlerTest.java (90%) rename bifromq-common-type/src/main/java/{com/baidu => org/apache}/bifromq/type/MQTTClientInfoConstants.java (97%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/BatchDeliveryCall.java (87%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java (82%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/DelivererKey.java (94%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/DeliveryCall.java (94%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/DeliveryCallResult.java (95%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/IMessageDeliverer.java (87%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/MessageDeliverer.java (84%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/TopicMessagePackHolder.java (92%) rename bifromq-deliverer/src/main/java/{com/baidu => org/apache}/bifromq/deliverer/exception/DeliveryException.java (94%) rename bifromq-deliverer/src/test/java/{com/baidu => org/apache}/bifromq/deliverer/DeliverySchedulerTest.java (88%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/DistClient.java (86%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/DistClientBuilder.java (87%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/IDistClient.java (94%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/MatchResult.java (94%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/PubResult.java (94%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/UnmatchResult.java (94%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/scheduler/BatchPubCall.java (90%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java (77%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/scheduler/IPubCallScheduler.java (81%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/scheduler/PubCallBatcherKey.java (93%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/scheduler/PubCallScheduler.java (84%) rename bifromq-dist/bifromq-dist-client/src/main/java/{com/baidu => org/apache}/bifromq/dist/client/scheduler/PubRequest.java (85%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/ITopicFilterIterator.java (98%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/MTopicFilterTrieNode.java (95%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/NTopicFilterTrieNode.java (96%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/STopicFilterTrieNode.java (96%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/TopicFilterIterator.java (99%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/TopicFilterTrieNode.java (97%) rename bifromq-dist/bifromq-dist-coproc-proto/src/main/java/{com/baidu => org/apache}/bifromq/dist/trie/TopicTrieNode.java (96%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/TestUtil.java (95%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/TestUtilTest.java (97%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/TopicMatcher.java (92%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/TopicMatcherTest.java (95%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/trie/Fixtures.java (98%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/trie/TopicFilterIteratorTest.java (96%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/trie/TopicTrieNodeTest.java (97%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java (97%) rename bifromq-dist/bifromq-dist-coproc-proto/src/test/java/{com/baidu => org/apache}/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java (88%) rename bifromq-dist/bifromq-dist-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/dist/RPCBluePrint.java (89%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/DistResponsePipeline.java (78%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/DistServer.java (94%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/DistServerBuilder.java (83%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/DistService.java (67%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/IDistServer.java (95%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/handler/IDistServiceReqHandler.java (94%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/handler/MatchReqHandler.java (86%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/handler/UnmatchReqHandler.java (84%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/BatchDistServerCall.java (88%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/BatchMatchCall.java (82%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/BatchUnmatchCall.java (84%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java (93%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/DistServerCallResult.java (94%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java (89%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java (86%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/IMatchCallScheduler.java (76%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java (76%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/MatchCallScheduler.java (69%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/TenantPubRequest.java (88%) rename bifromq-dist/bifromq-dist-server/src/main/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/UnmatchCallScheduler.java (69%) rename bifromq-dist/bifromq-dist-server/src/test/java/{com/baidu => org/apache}/bifromq/dist/server/DistServiceTest.java (79%) rename bifromq-dist/bifromq-dist-server/src/test/java/{com/baidu => org/apache}/bifromq/dist/server/DistTest.java (91%) rename bifromq-dist/bifromq-dist-server/src/test/java/{com/baidu => org/apache}/bifromq/dist/server/handler/MatchReqHandlerTest.java (89%) rename bifromq-dist/bifromq-dist-server/src/test/java/{com/baidu => org/apache}/bifromq/dist/server/handler/UnmatchReqHandlerTest.java (88%) rename bifromq-dist/bifromq-dist-server/src/test/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/BatchMatchCallTest.java (88%) rename bifromq-dist/bifromq-dist-server/src/test/java/{com/baidu => org/apache}/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java (88%) rename bifromq-dist/bifromq-dist-worker-schema/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/GroupMatching.java (94%) rename bifromq-dist/bifromq-dist-worker-schema/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/KVSchemaUtil.java (91%) rename bifromq-dist/bifromq-dist-worker-schema/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/Matching.java (93%) rename bifromq-dist/bifromq-dist-worker-schema/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/NormalMatching.java (93%) rename bifromq-dist/bifromq-dist-worker-schema/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/RouteDetail.java (90%) rename bifromq-dist/bifromq-dist-worker-schema/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/GroupMatchingTest.java (91%) rename bifromq-dist/bifromq-dist-worker-schema/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/KVSchemaUtilTest.java (86%) rename bifromq-dist/bifromq-dist-worker-schema/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/schema/NormalMatchingTest.java (81%) rename bifromq-dist/bifromq-dist-worker-spi/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java (89%) rename bifromq-dist/bifromq-dist-worker-spi/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/spi/SplitKey.java (77%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/Comparators.java (94%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DeliverExecutor.java (86%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DeliverExecutorGroup.java (88%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorker.java (92%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerBuilder.java (77%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerCleaner.java (81%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerCoProc.java (89%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerCoProcFactory.java (79%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/IDeliverExecutorGroup.java (82%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/IDistWorker.java (95%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/ISubscriptionCleaner.java (89%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/ITenantsState.java (96%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/RendezvousHash.java (97%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/SubscriptionCleaner.java (90%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/TenantRouteState.java (87%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/TenantsState.java (88%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/TopicIndex.java (94%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java (86%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java (94%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java (78%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java (90%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/ISubscriptionCache.java (84%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/ITenantRouteCache.java (84%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java (94%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/ITenantRouteMatcher.java (90%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/SubscriptionCache.java (85%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/TenantRouteCache.java (93%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/TenantRouteCacheFactory.java (94%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/TenantRouteMatcher.java (82%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/ThreadLocalKVReader.java (89%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/hinter/FanoutSplitHinter.java (90%) rename bifromq-dist/bifromq-dist-worker/src/main/java/{com/baidu => org/apache}/bifromq/dist/worker/hinter/RecordEstimation.java (96%) rename bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/{com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory => org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory} (75%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/BatchDistTest.java (85%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/ComparatorsTest.java (97%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/DistQoS0Test.java (97%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/DistQoS1Test.java (93%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/DistQoS2Test.java (91%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerCleanerTest.java (93%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerCoProcTest.java (92%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/DistWorkerTest.java (81%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/KeyLayoutTest.java (85%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/MeterTest.java (95%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/RendezvousHashTest.java (98%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/StatsTest.java (92%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/SubUnsubTest.java (96%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/SubscriptionCleanerTest.java (92%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/TenantRouteStateTest.java (93%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/TenantsStatesTest.java (91%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/TopicIndexTest.java (99%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java (81%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/SubscriptionCacheTest.java (93%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/TenantRouteCacheTest.java (92%) rename bifromq-dist/bifromq-dist-worker/src/test/java/{com/baidu => org/apache}/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java (95%) rename bifromq-inbox/bifromq-inbox-client/src/main/java/{com/baidu => org/apache}/bifromq/inbox/client/IInboxClient.java (59%) rename bifromq-inbox/bifromq-inbox-client/src/main/java/{com/baidu => org/apache}/bifromq/inbox/client/InboxClient.java (83%) rename bifromq-inbox/bifromq-inbox-client/src/main/java/{com/baidu => org/apache}/bifromq/inbox/client/InboxClientBuilder.java (87%) rename bifromq-inbox/bifromq-inbox-client/src/main/java/{com/baidu => org/apache}/bifromq/inbox/client/InboxDeliverPipeline.java (74%) rename bifromq-inbox/bifromq-inbox-client/src/main/java/{com/baidu => org/apache}/bifromq/inbox/client/InboxFetchPipeline.java (89%) rename bifromq-inbox/bifromq-inbox-client/src/main/java/{com/baidu => org/apache}/bifromq/inbox/client/InboxReader.java (94%) rename bifromq-inbox/bifromq-inbox-client/src/test/java/{com.baidu.bifromq.inbox.client => org/apache/bifromq/inbox/client}/InboxClientTest.java (85%) rename bifromq-inbox/bifromq-inbox-client/src/test/java/{com.baidu.bifromq.inbox.client => org/apache/bifromq/inbox/client}/InboxReaderTest.java (89%) rename bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/inbox/RPCBluePrint.java (81%) rename bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/inbox/record/InboxInstance.java (90%) rename bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/inbox/record/TenantInboxInstance.java (89%) rename bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/inbox/util/InboxServiceUtil.java (95%) rename bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/inbox/util/PipelineUtil.java (95%) rename bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/{com/baidu => org/apache}/bifromq/inbox/util/InboxServiceUtilTest.java (93%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/FetcherSignaler.java (92%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/IInboxFetcher.java (95%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/IInboxFetcherRegistry.java (95%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/IInboxServer.java (94%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/ITenantGCRunner.java (83%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxFetchPipeline.java (93%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxFetcherRegistry.java (98%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxServer.java (79%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxServerBuilder.java (84%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxService.java (87%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxWriter.java (83%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxWriterPipeline.java (81%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/TenantGCRunner.java (77%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchAttachCall.java (84%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchCheckSubCall.java (78%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchCommitCall.java (85%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchDeleteCall.java (84%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchDetachCall.java (83%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchExistCall.java (80%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchFetchCall.java (80%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchInsertCall.java (81%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchSendLWTCall.java (82%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchSubCall.java (84%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/BatchUnsubCall.java (84%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/CheckMatchInfo.java (88%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/FetchRequest.java (86%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java (81%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxExistScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java (81%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java (75%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxSubScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxAttachScheduler.java (73%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java (80%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxCommitScheduler.java (73%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java (73%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxDetachScheduler.java (73%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxExistScheduler.java (77%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxFetchScheduler.java (83%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxInsertScheduler.java (74%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java (89%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxReadScheduler.java (80%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java (77%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxSubScheduler.java (73%) rename bifromq-inbox/bifromq-inbox-server/src/main/java/{com/baidu => org/apache}/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java (73%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/Fixtures.java (77%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxAdminRPCTest.java (96%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxExpiryTest.java (91%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxFetcherRegistryTest.java (98%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxInsertTest.java (87%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxServiceTest.java (81%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxSubRPCTest.java (93%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxUnsubRPCTest.java (92%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxWriterPipelineTest.java (88%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/InboxWriterTest.java (87%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/MockedFetchTest.java (94%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/MockedInboxAdminTest.java (85%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/MockedInboxCommitTest.java (85%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/MockedInboxService.java (76%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/MockedInboxSubTest.java (93%) rename bifromq-inbox/bifromq-inbox-server/src/test/java/{com/baidu => org/apache}/bifromq/inbox/server/MockedInboxUnsubTest.java (94%) rename bifromq-inbox/bifromq-inbox-store-schema/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/schema/KVSchemaUtil.java (97%) rename bifromq-inbox/bifromq-inbox-store-schema/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/schema/KVSchemaUtilTest.java (98%) rename bifromq-inbox/bifromq-inbox-store-spi/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java (90%) rename bifromq-inbox/bifromq-inbox-store-spi/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/spi/SplitKey.java (79%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/IInboxStore.java (95%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/IInboxStoreGCProcessor.java (95%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxStore.java (93%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxStoreBuilder.java (72%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxStoreCoProc.java (91%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxStoreCoProcFactory.java (74%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxStoreGCProcessor.java (78%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/TenantInboxSet.java (88%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/TenantsState.java (85%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java (78%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java (92%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java (87%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/DelayTaskRunner.java (98%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/ExpireInboxTask.java (87%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/IDelayTaskRunner.java (97%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/IDelayedTask.java (95%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/RetryableDelayedTask.java (95%) rename bifromq-inbox/bifromq-inbox-store/src/main/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/SendLWTTask.java (86%) rename bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/{com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory => org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory} (75%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/GCTest.java (90%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxAdminTest.java (94%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxExistTest.java (92%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxGCProcessorTest.java (85%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxInsertTest.java (97%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxLWTDelayTest.java (84%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxLWTTest.java (93%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxSessionEventTest.java (90%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxStoreTest.java (81%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/InboxSubUnsubTest.java (95%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/LoadExistingTest.java (85%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/LoadSubStatsTest.java (88%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/MessageUtil.java (79%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/MeterTest.java (94%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/QoS0Test.java (93%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/QoS1Test.java (93%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/QoS2Test.java (93%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/SendLWTEventTest.java (85%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/SubStatsTest.java (94%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/TenantInboxSetTest.java (94%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/TenantsStateTest.java (91%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/DelayTaskRunnerTest.java (99%) rename bifromq-inbox/bifromq-inbox-store/src/test/java/{com/baidu => org/apache}/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java (96%) rename bifromq-metrics/src/main/java/{com/baidu => org/apache}/bifromq/metrics/ITenantMeter.java (97%) rename bifromq-metrics/src/main/java/{com/baidu => org/apache}/bifromq/metrics/TenantGauges.java (95%) rename bifromq-metrics/src/main/java/{com/baidu => org/apache}/bifromq/metrics/TenantMeter.java (98%) rename bifromq-metrics/src/main/java/{com/baidu => org/apache}/bifromq/metrics/TenantMeterCache.java (98%) rename bifromq-metrics/src/main/java/{com/baidu => org/apache}/bifromq/metrics/TenantMetric.java (99%) rename bifromq-metrics/src/test/java/{com/baidu => org/apache}/bifromq/metrics/TenantMeterTest.java (94%) rename bifromq-metrics/src/test/java/{com/baidu => org/apache}/bifromq/metrics/benchmark/TenantMeterBenchmark.java (97%) rename bifromq-metrics/src/test/java/{com/baidu => org/apache}/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java (89%) rename bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/DeliveryPipeline.java (77%) rename bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/IMqttBrokerClient.java (83%) rename bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java (94%) rename bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/MqttBrokerClient.java (77%) rename bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java (89%) rename bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/DeliveryPipelineTest.java (84%) rename bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/RPCBluePrint.java (88%) rename bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/util/DelivererKeyUtil.java (93%) rename bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/ConnListenerBuilder.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/IMQTTBroker.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/IMQTTBrokerBuilder.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/MQTTBroker.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/MQTTBrokerBuilder.java (78%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ChannelAttrs.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ClientAddrHandler.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ConditionalRejectHandler.java (84%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ConditionalSlowDownHandler.java (87%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ConnectionRateLimitHandler.java (90%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/IMQTTProtocolHelper.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MPSThrottler.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTConnectHandler.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTMessageHandler.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTPacketFilter.java (82%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java (87%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTPreludeHandler.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTSessionHandler.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTSessionIdUtil.java (78%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTTransientSessionHandler.java (85%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ProxyProtocolDetector.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ProxyProtocolHandler.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/SendBufferCapacityHinter.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/TenantSettings.java (61%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/condition/Condition.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java (87%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java (87%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/condition/InboundResourceCondition.java (82%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/condition/ORCondition.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/record/GoAway.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/record/ProtocolResponse.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java (83%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java (79%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java (83%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java (79%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/IReAuthenticator.java (76%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java (84%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java (84%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/ReAuthenticator.java (87%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/MqttOverWSHandler.java (84%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/ILocalDistService.java (80%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/ILocalSessionRegistry.java (90%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/ILocalSessionServer.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/ILocalSessionServerBuilder.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/ILocalTopicRouter.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalDistService.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalSessionBrokerService.java (83%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalSessionRegistry.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalSessionServer.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalSessionServerBuilder.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalSessionWritePipeline.java (80%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalTopicRouter.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/session/IMQTTPersistentSession.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/session/IMQTTSession.java (80%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/session/IMQTTTransientSession.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/session/MQTTSessionAuthProvider.java (82%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/session/MQTTSessionContext.java (80%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/session/TenantGauge.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/utils/AuthUtil.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/utils/IMQTTMessageSizer.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/utils/MQTT3MessageSizer.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/utils/MQTT5MessageSizer.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/main/java/{com/baidu => org/apache}/bifromq/mqtt/utils/MQTTMessageTrimmer.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/MockableTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/TestUtils.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/condition/ORConditionTest.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/BaseSessionHandlerTest.java (81%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ClientAddrHandlerTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java (82%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/InboundResourceConditionTest.java (82%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTConnectHandlerTest.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTPacketFilterTest.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/BaseMQTTTest.java (80%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java (90%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTConnectTest.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTKickTest.java (74%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java (85%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java (73%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTSubTest.java (92%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTUnSubTest.java (84%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java (82%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/EnhancedAuthTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/MQTTTest.java (85%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java (85%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTConnectTest.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java (85%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTFanInTest.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTFanOutTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTKickTest.java (87%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTLastWillTest.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTPubSubTest.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/MQTTRetainTest.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/client/MqttMsg.java (95%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/client/MqttResponse.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v3/client/MqttTestClient.java (98%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/LWTTest.java (88%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/MQTTConnectTest.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/PubFailTest.java (84%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/PubSubTest.java (91%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/client/MqttMsg.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/client/MqttResponse.java (93%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/integration/v5/client/MqttTestClient.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalDistServiceTest.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalSessionRegistryTest.java (94%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/service/LocalTopicRouterTest.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java (90%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/session/TenantGaugeTest.java (96%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/utils/MQTT3MessageSizerTest.java (97%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/utils/MQTT5MessageSizerTest.java (89%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/utils/MQTTMessageUtils.java (99%) rename bifromq-mqtt/bifromq-mqtt-server/src/test/java/{com/baidu => org/apache}/bifromq/mqtt/utils/TestTicker.java (96%) rename bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/authprovider/AuthProviderManager.java (89%) rename bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/authprovider/DevOnlyAuthProvider.java (82%) rename bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/authprovider/MetricConstants.java (94%) rename bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/authprovider/MetricManager.java (87%) rename bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/authprovider/AuthProviderManagerTest.java (92%) rename bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/{com/baidu => org/apache}/bifromq/plugin/authprovider/IAuthProvider.java (85%) rename bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/clientbalancer/ClientBalancerManager.java (97%) rename bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/clientbalancer/DummyClientBalancer.java (89%) rename bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java (95%) rename bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java (93%) rename bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/{com/baidu => org/apache}/bifromq/plugin/clientbalancer/IClientBalancer.java (92%) rename bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/{com/baidu => org/apache}/bifromq/plugin/clientbalancer/Redirection.java (94%) rename bifromq-plugin/bifromq-plugin-context/src/main/java/{com/baidu => org/apache}/bifromq/plugin/BifroMQPluginContext.java (98%) rename bifromq-plugin/bifromq-plugin-context/src/main/java/{com/baidu => org/apache}/bifromq/plugin/BifroMQPluginDescriptor.java (98%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/EventCollectorManager.java (97%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/EventPool.java (97%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/ThreadLocalEventPool.java (97%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/EventCollectorManagerTest.java (91%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/EventCollectorTestStub.java (95%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/EventPoolTest.java (95%) rename bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java (91%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/ClientEvent.java (92%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/Event.java (96%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/EventType.java (98%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/IEventCollector.java (95%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/OutOfTenantResource.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/DeliverError.java (83%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java (84%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/Delivered.java (83%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/DistError.java (85%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/Disted.java (84%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/MatchError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/Matched.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/SubscribeError.java (88%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/Subscribed.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/UnmatchError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/Unmatched.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/distservice/Unsubscribed.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/inboxservice/Overflowed.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java (79%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/PingReq.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java (85%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java (85%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java (84%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java (85%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java (91%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java (88%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java (85%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java (88%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java (88%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java (91%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java (91%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java (92%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java (88%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java (89%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java (88%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java (90%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java (87%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java (86%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/session/MQTTSessionStart.java (80%) rename bifromq-plugin/bifromq-plugin-event-collector/src/main/java/{com/baidu => org/apache}/bifromq/plugin/eventcollector/session/MQTTSessionStop.java (80%) rename bifromq-plugin/bifromq-plugin-main/src/main/java/{com/baidu => org/apache}/bifromq/plugin/BifroMQPlugin.java (99%) rename bifromq-plugin/bifromq-plugin-main/src/test/java/{com/baidu => org/apache}/bifromq/plugin/BifroMQPluginTest.java (97%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java (96%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java (96%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQExtensionFactory.java (94%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQExtensionFinder.java (98%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQJarPluginLoader.java (96%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQPluginClassLoader.java (97%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQPluginFactory.java (93%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/BifroMQPluginManager.java (97%) rename bifromq-plugin/bifromq-plugin-manager/src/main/java/{com/baidu => org/apache}/bifromq/plugin/manager/ProvidedPackages.java (87%) rename bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java (81%) rename bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java (95%) rename bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java (87%) rename bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java (96%) rename bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/{com => org/apache}/bifromq/plugin/resourcethrottler/IResourceThrottler.java (95%) rename bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/{com => org/apache}/bifromq/plugin/resourcethrottler/TenantResourceType.java (96%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/CacheOptions.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/CacheableSettingProvider.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/DevOnlySettingProvider.java (95%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/MonitoredSettingProvider.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/SettingProviderManager.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/SettingProviderManagerTest.java (98%) rename bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/SettingProviderTestStub.java (95%) rename bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/ISettingProvider.java (96%) rename bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/Setting.java (99%) rename bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/{com/baidu => org/apache}/bifromq/plugin/settingprovider/SettingTest.java (98%) rename bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/ISubBrokerManager.java (94%) rename bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/MonitoredSubBroker.java (98%) rename bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/NoInboxSubBroker.java (97%) rename bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/SubBrokerManager.java (98%) rename bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/SubBrokerManagerTest.java (96%) rename bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/IDeliverer.java (96%) rename bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/ISubBroker.java (97%) rename bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/{com/baidu => org/apache}/bifromq/plugin/subbroker/TypeUtil.java (95%) rename bifromq-retain/bifromq-retain-client/src/main/java/{com/baidu => org/apache}/bifromq/retain/client/IRetainClient.java (74%) rename bifromq-retain/bifromq-retain-client/src/main/java/{com/baidu => org/apache}/bifromq/retain/client/RetainClient.java (81%) rename bifromq-retain/bifromq-retain-client/src/main/java/{com/baidu => org/apache}/bifromq/retain/client/RetainClientBuilder.java (86%) rename bifromq-retain/bifromq-retain-gc/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/gc/IRetainStoreGCProcessor.java (95%) rename bifromq-retain/bifromq-retain-gc/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/gc/RetainStoreGCProcessor.java (77%) rename bifromq-retain/bifromq-retain-gc/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java (94%) rename bifromq-retain/bifromq-retain-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/retain/RPCBluePrint.java (88%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/IRetainServer.java (94%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/RetainServer.java (83%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/RetainServerBuilder.java (81%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/RetainService.java (84%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/BatchMatchCall.java (78%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/BatchMatchCallHelper.java (96%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/BatchRetainCall.java (83%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/BatchRetainCallHelper.java (85%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/DeleteCallScheduler.java (72%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/IMatchCallScheduler.java (86%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/IRetainCallScheduler.java (76%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/MatchCallBatcherKey.java (93%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/MatchCallRangeRouter.java (79%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/MatchCallScheduler.java (81%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/MatchRetainedRequest.java (93%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/MatchRetainedResult.java (83%) rename bifromq-retain/bifromq-retain-server/src/main/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/RetainCallScheduler.java (73%) rename bifromq-retain/bifromq-retain-server/src/test/java/{com/baidu => org/apache}/bifromq/retain/server/RetainServiceTest.java (91%) rename bifromq-retain/bifromq-retain-server/src/test/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java (94%) rename bifromq-retain/bifromq-retain-server/src/test/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java (90%) rename bifromq-retain/bifromq-retain-server/src/test/java/{com/baidu => org/apache}/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java (89%) rename bifromq-retain/bifromq-retain-store-schema/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/schema/KVSchemaUtil.java (89%) rename bifromq-retain/bifromq-retain-store-schema/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/schema/LevelHash.java (96%) rename bifromq-retain/bifromq-retain-store-schema/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/schema/KVSchemaUtilTest.java (87%) rename bifromq-retain/bifromq-retain-store-schema/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/schema/LevelHashTest.java (95%) rename bifromq-retain/bifromq-retain-store-spi/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java (88%) rename bifromq-retain/bifromq-retain-store-spi/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/spi/SplitKey.java (81%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/IRetainStore.java (95%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/RetainMatcher.java (98%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/RetainStore.java (91%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/RetainStoreBuilder.java (84%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/RetainStoreCoProc.java (85%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/RetainStoreCoProcFactory.java (79%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/TenantRetainedSet.java (71%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/TenantsState.java (94%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java (78%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/balance/RangeSplitBalancerFactory.java (92%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java (90%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/index/IRetainTopicIndex.java (95%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/index/RetainTopicIndex.java (94%) rename bifromq-retain/bifromq-retain-store/src/main/java/{com/baidu => org/apache}/bifromq/retain/store/index/RetainedMsgInfo.java (95%) rename bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/{com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory => org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory} (77%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/DeleteBehaviorTest.java (92%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/GCTest.java (95%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/LoadMetadataTest.java (95%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/ReplaceBehaviorTest.java (88%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/RetainBehaviorTest.java (87%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/RetainMatchTest.java (97%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/RetainMatcherTest.java (87%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/RetainStoreTest.java (81%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/StatsTest.java (88%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/TenantRetainSetTest.java (83%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/TenantsStateTest.java (95%) rename bifromq-retain/bifromq-retain-store/src/test/java/{com/baidu => org/apache}/bifromq/retain/store/index/RetainTopicIndexTest.java (99%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/ISessionDictClient.java (69%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/ISessionRegistration.java (93%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/SessionDictClient.java (85%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/SessionDictClientBuilder.java (86%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/SessionRegister.java (89%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/SessionRegistration.java (95%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java (75%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java (75%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java (66%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/type/OnlineCheckRequest.java (93%) rename bifromq-session-dict/bifromq-session-dict-client/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/client/type/OnlineCheckResult.java (93%) rename bifromq-session-dict/bifromq-session-dict-client/src/test/java/{com/baidu => org/apache}/bifromq/sessiondict/client/KillTest.java (96%) rename bifromq-session-dict/bifromq-session-dict-client/src/test/java/{com/baidu => org/apache}/bifromq/sessiondict/client/SessionRegisterTest.java (91%) rename bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/RPCBluePrint.java (84%) rename bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/SessionRegisterKeyUtil.java (83%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/ISessionDictServer.java (94%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/ISessionRegister.java (85%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/ISessionRegistry.java (90%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/MqttClientKey.java (79%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionDictServer.java (93%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionDictServerBuilder.java (89%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionDictService.java (84%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionExistPipeline.java (85%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionRegister.java (89%) rename bifromq-session-dict/bifromq-session-dict-server/src/main/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionRegistry.java (92%) rename bifromq-session-dict/bifromq-session-dict-server/src/test/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionRegisterTest.java (90%) rename bifromq-session-dict/bifromq-session-dict-server/src/test/java/{com/baidu => org/apache}/bifromq/sessiondict/server/SessionRegistryTest.java (93%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/BifroMQSysProp.java (96%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/parser/BooleanParser.java (97%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/parser/DoubleParser.java (97%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/parser/IntegerParser.java (97%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/parser/LongParser.java (97%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/parser/PropParser.java (94%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/parser/SysPropParseException.java (94%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DeliverersPerMqttServer.java (83%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistFanOutParallelism.java (84%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistInlineFanOutThreshold.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistMatchParallelism.java (84%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistWorkerCallQueueNum.java (84%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/InboxCheckQueuesPerRange.java (86%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/InboxDelivererNum.java (86%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/InboxFetchQueuesPerRange.java (84%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/InboxTouchQueuesPerRange.java (84%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java (88%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java (88%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java (86%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java (86%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java (86%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java (88%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/SanityCheckMqttUtf8String.java (87%) rename bifromq-sysprops/src/main/java/{com/baidu => org/apache}/bifromq/sysprops/props/SessionRegisterNumber.java (87%) rename bifromq-sysprops/src/test/java/{com/baidu => org/apache}/bifromq/sysprops/BifroMQSysPropTest.java (95%) rename bifromq-sysprops/src/test/java/{com/baidu => org/apache}/bifromq/sysprops/parser/BooleanParserTest.java (96%) rename bifromq-sysprops/src/test/java/{com/baidu => org/apache}/bifromq/sysprops/parser/DoubleParserTest.java (96%) rename bifromq-sysprops/src/test/java/{com/baidu => org/apache}/bifromq/sysprops/parser/IntegerParserTest.java (95%) rename bifromq-sysprops/src/test/java/{com/baidu => org/apache}/bifromq/sysprops/parser/LongParserTest.java (95%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/BSUtil.java (98%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/SizeUtil.java (90%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/TopicConst.java (97%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/TopicUtil.java (93%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/UTF8Util.java (98%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/index/Branch.java (97%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/index/CNode.java (98%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/index/INode.java (96%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/index/MainNode.java (95%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/index/TNode.java (94%) rename bifromq-util/src/main/java/{com/baidu => org/apache}/bifromq/util/index/TopicLevelTrie.java (99%) rename bifromq-util/src/test/java/{com/baidu => org/apache}/bifromq/util/TopicUtilsTest.java (96%) rename bifromq-util/src/test/java/{com/baidu => org/apache}/bifromq/util/UTF8UtilTest.java (98%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/ServiceBootstrapper.java (90%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/StandaloneStarter.java (87%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/StandaloneConfig.java (74%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/StandaloneConfigConsolidator.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/BalancerOptions.java (98%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/ClusterConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/ExecutorConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/InMemEngineConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/RPCConfig.java (96%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/RocksDBEngineConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/SSLContextConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/ServerSSLContextConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/StorageEngineConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/api/APIServerConfig.java (90%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dict/SessionDictClientConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dict/SessionDictServerConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dict/SessionDictServiceConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dist/DistClientConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dist/DistServerConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dist/DistServiceConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dist/DistWorkerClientConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/dist/DistWorkerConfig.java (82%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/inbox/InboxClientConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/inbox/InboxServerConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/inbox/InboxServiceConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/inbox/InboxStoreConfig.java (80%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/MQTTServerConfig.java (80%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java (92%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java (86%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java (86%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/retain/RetainClientConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/retain/RetainServerConfig.java (94%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/retain/RetainServiceConfig.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/retain/RetainStoreClientConfig.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/config/model/retain/RetainStoreConfig.java (83%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/metrics/netty/PooledByteBufAllocator.java (96%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/APIServerModule.java (78%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/ConfigModule.java (90%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/CoreServiceModule.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/DistServiceModule.java (81%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/EngineConfUtil.java (90%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/ExecutorsModule.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/InboxServiceModule.java (80%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/MQTTServiceModule.java (82%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/PluginModule.java (90%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/RPCClientSSLContextModule.java (90%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/RPCServerBuilderModule.java (85%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/RetainServiceModule.java (81%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/SSLUtil.java (93%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/ServiceInjector.java (96%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/ServiceInjectorModule.java (95%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/SessionDictServiceModule.java (86%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/SharedResourceProvider.java (96%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/module/SharedResourcesHolder.java (97%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/utils/ClusterDomainUtil.java (98%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/utils/ConfigFileUtil.java (97%) rename build/build-bifromq-starters/src/main/java/{com/baidu => org/apache}/bifromq/starter/utils/ResourceUtil.java (98%) rename build/build-bifromq-starters/src/test/java/{com/baidu => org/apache}/bifromq/starter/utils/ClusterDomainUtilTest.java (97%) rename build/build-bifromq-starters/src/test/java/{com/baidu => org/apache}/bifromq/starter/utils/ResourceUtilTest.java (98%) delete mode 100644 build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPluginContext.java rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/DemoAuthProvider.java (86%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/DemoPlugin.java (93%) create mode 100644 build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPluginContext.java rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/DemoResourceThrottler.java (90%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/DemoSettingProvider.java (93%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/EventLogger.java (82%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/WebHookBasedAuthProvider.java (91%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/WebHookBasedResourceThrottler.java (94%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/WebHookBasedSettingProvider.java (94%) rename build/build-plugin-demo/src/main/java/{com/baidu => org/apache/bifromq}/demo/plugin/util/VariableUtil.java (62%) rename build/build-plugin-demo/src/test/java/{com/baidu => org/apache/bifromq}/demo/plugin/TestAuthServer.java (93%) rename build/build-plugin-demo/src/test/java/{com/baidu => org/apache/bifromq}/demo/plugin/TestSettingServer.java (96%) rename build/build-plugin-demo/src/test/java/{com/baidu => org/apache/bifromq}/demo/plugin/TestThrottlerServer.java (96%) rename build/build-plugin-demo/src/test/java/{com/baidu => org/apache/bifromq}/demo/plugin/WebHookBasedAuthProviderTest.java (86%) rename build/build-plugin-demo/src/test/java/{com/baidu => org/apache/bifromq}/demo/plugin/WebHookBasedResourceThrottlerTest.java (94%) rename build/build-plugin-demo/src/test/java/{com/baidu => org/apache/bifromq}/demo/plugin/WebHookBasedSettingProviderTest.java (96%) rename testsuites/src/main/java/{com/baidu => org/apache}/bifromq/test/RetryAnalyser.java (96%) rename testsuites/src/main/java/{com/baidu => org/apache}/bifromq/test/RetryListener.java (98%) rename testsuites/src/main/java/{com/baidu => org/apache}/bifromq/test/RetryTransformer.java (97%) diff --git a/README.md b/README.md index b612e3f4a..cf556bea7 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ Clone the repository to your local workspace: ``` cd -git clone https://github.com/baidu/bifromq bifromq +git clone https://github.com/apache/bifromq bifromq ``` Navigate to the project root folder and execute the following commands to build the entire project: @@ -179,7 +179,7 @@ To jump start your BifroMQ plugin development, execute the following Maven comma ``` mvn archetype:generate \ - -DarchetypeGroupId=com.baidu.bifromq \ + -DarchetypeGroupId=org.apache.bifromq \ -DarchetypeArtifactId=bifromq-plugin-archetype \ -DarchetypeVersion= \ -DgroupId= \ @@ -220,17 +220,12 @@ support. ## Discussion -Join our Discord or WeChat group if you are interested in our work. +Join our Discord if you are interested in our work. ### Discord BifroMQ Discord server -### WeChat group - -[Email](mailto:hello@bifromq.io) us your WeChat ID, along with more information on why BifroMQ has caught your -attention (we'd love to hear about it), and we will invite you to join our group as soon as possible. - ## ASF Incubator disclaimer Apache BifroMQ™ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF. diff --git a/README.zh_Hans.md b/README.zh_Hans.md index 1b8dc3fa0..609f9f94d 100644 --- a/README.zh_Hans.md +++ b/README.zh_Hans.md @@ -112,7 +112,7 @@ docker compose up -d ``` cd -git clone https://github.com/baidu/bifromq bifromq +git clone https://github.com/apache/bifromq bifromq ``` 进入项目文件夹，执行以下命令来构建整个项目： @@ -171,7 +171,7 @@ mvn test ```bash mvn archetype:generate \ - -DarchetypeGroupId=com.baidu.bifromq \ + -DarchetypeGroupId=org.apache.bifromq \ -DarchetypeArtifactId=bifromq-plugin-archetype \ -DarchetypeVersion= \ -DgroupId= \ diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHost.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHost.java similarity index 85% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHost.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHost.java index b20de907a..391ba0d6c 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHost.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHost.java @@ -11,32 +11,32 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import static com.baidu.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI; +import static org.apache.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI; import static com.google.common.base.Preconditions.checkArgument; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.fd.FailureDetector; -import com.baidu.bifromq.basecluster.fd.IFailureDetector; -import com.baidu.bifromq.basecluster.fd.IProbingTarget; -import com.baidu.bifromq.basecluster.memberlist.AutoDropper; -import com.baidu.bifromq.basecluster.memberlist.AutoHealer; -import com.baidu.bifromq.basecluster.memberlist.AutoSeeder; -import com.baidu.bifromq.basecluster.memberlist.HostMemberList; -import com.baidu.bifromq.basecluster.memberlist.IHostAddressResolver; -import com.baidu.bifromq.basecluster.memberlist.IHostMemberList; -import com.baidu.bifromq.basecluster.memberlist.MemberSelector; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.Messenger; -import com.baidu.bifromq.basecluster.messenger.MessengerOptions; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.fd.FailureDetector; +import org.apache.bifromq.basecluster.fd.IFailureDetector; +import org.apache.bifromq.basecluster.fd.IProbingTarget; +import org.apache.bifromq.basecluster.memberlist.AutoDropper; +import org.apache.bifromq.basecluster.memberlist.AutoHealer; +import org.apache.bifromq.basecluster.memberlist.AutoSeeder; +import org.apache.bifromq.basecluster.memberlist.HostMemberList; +import org.apache.bifromq.basecluster.memberlist.IHostAddressResolver; +import org.apache.bifromq.basecluster.memberlist.IHostMemberList; +import org.apache.bifromq.basecluster.memberlist.MemberSelector; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.Messenger; +import org.apache.bifromq.basecluster.messenger.MessengerOptions; +import org.apache.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.baseenv.EnvProvider; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.protobuf.ByteString; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHostOptions.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHostOptions.java similarity index 98% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHostOptions.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHostOptions.java index 0f77724d2..2bdb879fb 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/AgentHostOptions.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/AgentHostOptions.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecrdt.store.CRDTStoreOptions; +import org.apache.bifromq.basecrdt.store.CRDTStoreOptions; import io.netty.handler.ssl.SslContext; import java.time.Duration; import lombok.AccessLevel; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/IAgentHost.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/IAgentHost.java similarity index 86% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/IAgentHost.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/IAgentHost.java index 3f0f7ffba..3fd72a48d 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/IAgentHost.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/IAgentHost.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecluster.memberlist.HostAddressResolver; -import com.baidu.bifromq.basecluster.memberlist.IHostAddressResolver; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecluster.transport.TCPTransport; -import com.baidu.bifromq.basecluster.transport.Transport; +import org.apache.bifromq.basecluster.memberlist.HostAddressResolver; +import org.apache.bifromq.basecluster.memberlist.IHostAddressResolver; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecluster.transport.TCPTransport; +import org.apache.bifromq.basecluster.transport.Transport; import io.reactivex.rxjava3.core.Observable; import java.net.InetSocketAddress; import java.util.Map; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfo.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/DirectProbingInfo.java similarity index 91% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfo.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/DirectProbingInfo.java index 6933f60e4..829a3029a 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfo.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/DirectProbingInfo.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import java.util.Collections; import java.util.List; import java.util.Optional; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetector.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetector.java similarity index 97% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetector.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetector.java index ee52509b6..5440c77a6 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetector.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetector.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; -import com.baidu.bifromq.basecluster.fd.proto.Ack; -import com.baidu.bifromq.basecluster.fd.proto.Nack; -import com.baidu.bifromq.basecluster.fd.proto.Ping; -import com.baidu.bifromq.basecluster.fd.proto.PingReq; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.fd.proto.Ack; +import org.apache.bifromq.basecluster.fd.proto.Nack; +import org.apache.bifromq.basecluster.fd.proto.Ping; +import org.apache.bifromq.basecluster.fd.proto.PingReq; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; import io.reactivex.rxjava3.annotations.NonNull; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMath.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetectorMath.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMath.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetectorMath.java index 88e001c55..cdd4ad763 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMath.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/FailureDetectorMath.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; import java.time.Duration; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IFailureDetector.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IFailureDetector.java similarity index 97% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IFailureDetector.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IFailureDetector.java index a790da68f..c4f85d3f9 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IFailureDetector.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IFailureDetector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Timed; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTarget.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTarget.java similarity index 87% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTarget.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTarget.java index 33d64370c..b63cfa892 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTarget.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTarget.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; -import com.baidu.bifromq.basecluster.messenger.IRecipient; +import org.apache.bifromq.basecluster.messenger.IRecipient; import com.google.protobuf.ByteString; public interface IProbingTarget extends IRecipient { diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTargetSelector.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTargetSelector.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTargetSelector.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTargetSelector.java index f239c2b85..8e3109c90 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/fd/IProbingTargetSelector.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/fd/IProbingTargetSelector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; import java.util.Collection; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoDropper.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoDropper.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoDropper.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoDropper.java index c06228bd0..f7988de76 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoDropper.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoDropper.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; - -import com.baidu.bifromq.basecluster.fd.DirectProbingInfo; -import com.baidu.bifromq.basecluster.fd.IFailureDetector; -import com.baidu.bifromq.basecluster.fd.IProbingTarget; -import com.baidu.bifromq.basecluster.fd.IProbingTargetSelector; -import com.baidu.bifromq.basecluster.membership.proto.Doubt; -import com.baidu.bifromq.basecluster.membership.proto.Endorse; -import com.baidu.bifromq.basecluster.membership.proto.Fail; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecluster.membership.proto.Join; -import com.baidu.bifromq.basecluster.membership.proto.Quit; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +package org.apache.bifromq.basecluster.memberlist; + +import org.apache.bifromq.basecluster.fd.DirectProbingInfo; +import org.apache.bifromq.basecluster.fd.IFailureDetector; +import org.apache.bifromq.basecluster.fd.IProbingTarget; +import org.apache.bifromq.basecluster.fd.IProbingTargetSelector; +import org.apache.bifromq.basecluster.membership.proto.Doubt; +import org.apache.bifromq.basecluster.membership.proto.Endorse; +import org.apache.bifromq.basecluster.membership.proto.Fail; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.membership.proto.Join; +import org.apache.bifromq.basecluster.membership.proto.Quit; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoHealer.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoHealer.java similarity index 94% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoHealer.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoHealer.java index ff19b0eb1..7e8ac9d15 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoHealer.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoHealer.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; import static com.github.benmanes.caffeine.cache.Scheduler.systemScheduler; -import com.baidu.bifromq.basecluster.membership.proto.Endorse; -import com.baidu.bifromq.basecluster.membership.proto.Fail; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecluster.membership.proto.Join; -import com.baidu.bifromq.basecluster.membership.proto.Quit; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.membership.proto.Endorse; +import org.apache.bifromq.basecluster.membership.proto.Fail; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.membership.proto.Join; +import org.apache.bifromq.basecluster.membership.proto.Quit; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.RemovalListener; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoSeeder.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoSeeder.java similarity index 96% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoSeeder.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoSeeder.java index d2e17e38e..730797827 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/AutoSeeder.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/AutoSeeder.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.Join; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.Join; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.RemovalListener; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/CRDTUtil.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/CRDTUtil.java similarity index 83% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/CRDTUtil.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/CRDTUtil.java index ae86ec4c7..f556dbdf1 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/CRDTUtil.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/CRDTUtil.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ormap; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ormap; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolver.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolver.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolver.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolver.java index 80a32048b..9d3bedfa2 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolver.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolver.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; import static com.github.benmanes.caffeine.cache.Scheduler.systemScheduler; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Expiry; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostMemberList.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostMemberList.java similarity index 91% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostMemberList.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostMemberList.java index acd981240..0d5eddbb7 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/HostMemberList.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/HostMemberList.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; - -import static com.baidu.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI; -import static com.baidu.bifromq.basecluster.memberlist.CRDTUtil.getHostMember; -import static com.baidu.bifromq.basecluster.memberlist.CRDTUtil.iterate; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; -import static com.baidu.bifromq.basecrdt.store.ReplicaIdGenerator.generate; - -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.memberlist.agent.Agent; -import com.baidu.bifromq.basecluster.memberlist.agent.AgentAddressProvider; -import com.baidu.bifromq.basecluster.memberlist.agent.AgentMessenger; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.membership.proto.Doubt; -import com.baidu.bifromq.basecluster.membership.proto.Fail; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecluster.membership.proto.Join; -import com.baidu.bifromq.basecluster.membership.proto.Quit; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; -import com.baidu.bifromq.basehlc.HLC; +package org.apache.bifromq.basecluster.memberlist; + +import static org.apache.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI; +import static org.apache.bifromq.basecluster.memberlist.CRDTUtil.getHostMember; +import static org.apache.bifromq.basecluster.memberlist.CRDTUtil.iterate; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; +import static org.apache.bifromq.basecrdt.store.ReplicaIdGenerator.generate; + +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.memberlist.agent.Agent; +import org.apache.bifromq.basecluster.memberlist.agent.AgentAddressProvider; +import org.apache.bifromq.basecluster.memberlist.agent.AgentMessenger; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.membership.proto.Doubt; +import org.apache.bifromq.basecluster.membership.proto.Fail; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.membership.proto.Join; +import org.apache.bifromq.basecluster.membership.proto.Quit; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basehlc.HLC; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/IHostAddressResolver.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/IHostAddressResolver.java similarity index 86% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/IHostAddressResolver.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/IHostAddressResolver.java index d36aa7111..41d7ddd3f 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/IHostAddressResolver.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/IHostAddressResolver.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; import java.net.InetSocketAddress; public interface IHostAddressResolver { diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/IHostMemberList.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/IHostMemberList.java similarity index 88% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/IHostMemberList.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/IHostMemberList.java index dff5ce9cf..568801c56 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/IHostMemberList.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/IHostMemberList.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; import io.reactivex.rxjava3.core.Observable; import java.util.Map; import java.util.Set; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/MemberSelector.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/MemberSelector.java similarity index 91% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/MemberSelector.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/MemberSelector.java index 6db38b735..fadee282b 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/MemberSelector.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/MemberSelector.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import com.baidu.bifromq.basecluster.messenger.IRecipient; -import com.baidu.bifromq.basecluster.messenger.IRecipientSelector; +import org.apache.bifromq.basecluster.messenger.IRecipient; +import org.apache.bifromq.basecluster.messenger.IRecipientSelector; import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.disposables.Disposable; import java.net.InetSocketAddress; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/Agent.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/Agent.java similarity index 94% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/Agent.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/Agent.java index cfa9f9c6d..62d1257b1 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/Agent.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/Agent.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; import static java.util.Collections.emptyMap; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ICRDTStore; import com.google.common.collect.Sets; import com.google.protobuf.AbstractMessageLite; import io.micrometer.core.instrument.Gauge; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java similarity index 87% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java index ee2f91ab8..73f149ad6 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentAddressProvider.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; import io.reactivex.rxjava3.core.Observable; import java.util.HashSet; import java.util.Map; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMember.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMember.java similarity index 91% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMember.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMember.java index 974443827..8cfcc8dc7 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMember.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMember.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; - -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; - -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessageEnvelope; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basehlc.HLC; +package org.apache.bifromq.basecluster.memberlist.agent; + +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; + +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMessageEnvelope; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basehlc.HLC; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Scheduler; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMessenger.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMessenger.java similarity index 83% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMessenger.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMessenger.java index e6af79198..ad64b0874 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMessenger.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMessenger.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessageEnvelope; -import com.baidu.bifromq.basecluster.memberlist.IHostAddressResolver; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMessageEnvelope; +import org.apache.bifromq.basecluster.memberlist.IHostAddressResolver; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Timed; import java.net.InetSocketAddress; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/CRDTUtil.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/CRDTUtil.java similarity index 85% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/CRDTUtil.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/CRDTUtil.java index bd8313cf3..468cc9b8b 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/CRDTUtil.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/CRDTUtil.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ormap; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ormap; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgent.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgent.java similarity index 85% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgent.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgent.java index 90d955161..a9e4ae6a2 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgent.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgent.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; import io.reactivex.rxjava3.core.Observable; import java.util.Map; import java.util.concurrent.CompletableFuture; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java similarity index 88% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java index bab6b96d9..5a76f581b 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentAddressProvider.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; import io.reactivex.rxjava3.core.Observable; import java.util.Set; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentMember.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentMember.java similarity index 88% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentMember.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentMember.java index 1b5abad75..a28f7e97a 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentMember.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentMember.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentMessenger.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentMessenger.java similarity index 81% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentMessenger.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentMessenger.java index df29797ab..377311f55 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/memberlist/agent/IAgentMessenger.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/memberlist/agent/IAgentMessenger.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessageEnvelope; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMessageEnvelope; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/Gossiper.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/Gossiper.java similarity index 98% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/Gossiper.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/Gossiper.java index 3cd306f47..7cefdc526 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/Gossiper.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/Gossiper.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; -import com.baidu.bifromq.basecluster.messenger.proto.GossipMessage; +import org.apache.bifromq.basecluster.messenger.proto.GossipMessage; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.annotations.VisibleForTesting; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IMessenger.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IMessenger.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IMessenger.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IMessenger.java index 5457dacc6..0933f00c7 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IMessenger.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IMessenger.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Timed; import java.net.InetSocketAddress; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IRecipient.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IRecipient.java similarity index 93% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IRecipient.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IRecipient.java index 524fdf2bc..350bdef3e 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IRecipient.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IRecipient.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import java.net.InetSocketAddress; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IRecipientSelector.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IRecipientSelector.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IRecipientSelector.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IRecipientSelector.java index 3b61449d1..b0003ce20 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/IRecipientSelector.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/IRecipientSelector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import java.util.Collection; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessageEnvelope.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessageEnvelope.java similarity index 88% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessageEnvelope.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessageEnvelope.java index c780c3989..97c9eec52 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessageEnvelope.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessageEnvelope.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import java.net.InetSocketAddress; import lombok.Builder; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/Messenger.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/Messenger.java similarity index 96% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/Messenger.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/Messenger.java index 20353c66d..71adec1da 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/Messenger.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/Messenger.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; -import com.baidu.bifromq.basecluster.messenger.proto.DirectMessage; -import com.baidu.bifromq.basecluster.messenger.proto.GossipMessage; -import com.baidu.bifromq.basecluster.messenger.proto.MessengerMessage; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecluster.util.RandomUtils; +import org.apache.bifromq.basecluster.messenger.proto.DirectMessage; +import org.apache.bifromq.basecluster.messenger.proto.GossipMessage; +import org.apache.bifromq.basecluster.messenger.proto.MessengerMessage; +import org.apache.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecluster.util.RandomUtils; import com.google.common.collect.Maps; import com.google.protobuf.InvalidProtocolBufferException; import io.micrometer.core.instrument.Counter; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerMessageEnvelope.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerMessageEnvelope.java similarity index 87% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerMessageEnvelope.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerMessageEnvelope.java index 8010e0a36..665348771 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerMessageEnvelope.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerMessageEnvelope.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; -import com.baidu.bifromq.basecluster.messenger.proto.MessengerMessage; +import org.apache.bifromq.basecluster.messenger.proto.MessengerMessage; import java.net.InetSocketAddress; import lombok.Builder; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerOptions.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerOptions.java similarity index 96% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerOptions.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerOptions.java index 0c1259db5..24ac28157 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerOptions.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerOptions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import java.time.Duration; import lombok.AccessLevel; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerTransport.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerTransport.java similarity index 92% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerTransport.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerTransport.java index ccd926ecb..8591ad78b 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/messenger/MessengerTransport.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/messenger/MessengerTransport.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; -import com.baidu.bifromq.basecluster.messenger.proto.MessengerMessage; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecluster.transport.PacketEnvelope; +import org.apache.bifromq.basecluster.messenger.proto.MessengerMessage; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecluster.transport.PacketEnvelope; import com.google.protobuf.AbstractMessageLite; import com.google.protobuf.InvalidProtocolBufferException; import io.reactivex.rxjava3.core.Observable; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/AbstractTransport.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/AbstractTransport.java similarity index 95% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/AbstractTransport.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/AbstractTransport.java index 31fb820cc..977fb0405 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/AbstractTransport.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/AbstractTransport.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; -import com.baidu.bifromq.basecluster.transport.proto.Packet; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basecluster.transport.proto.Packet; +import org.apache.bifromq.basehlc.HLC; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.protobuf.ByteString; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/ITransport.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/ITransport.java similarity index 96% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/ITransport.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/ITransport.java index 9ccc67ec5..07f184406 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/ITransport.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/ITransport.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/PacketEnvelope.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/PacketEnvelope.java similarity index 94% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/PacketEnvelope.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/PacketEnvelope.java index 6174a5d16..164ab35fd 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/PacketEnvelope.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/PacketEnvelope.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/ProbeHandler.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/ProbeHandler.java similarity index 97% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/ProbeHandler.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/ProbeHandler.java index da35cad44..85bee4d5c 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/ProbeHandler.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/ProbeHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import static io.netty.handler.codec.ByteToMessageDecoder.MERGE_CUMULATOR; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/TCPTransport.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/TCPTransport.java similarity index 98% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/TCPTransport.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/TCPTransport.java index 66354758e..815a8c5c7 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/TCPTransport.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/TCPTransport.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; -import com.baidu.bifromq.basecluster.transport.proto.Packet; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basecluster.transport.proto.Packet; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.basehlc.HLC; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.RemovalCause; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/Transport.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/Transport.java similarity index 98% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/Transport.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/Transport.java index c32d03575..23e10acb2 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/Transport.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/Transport.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import io.netty.handler.ssl.SslContext; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/UDPTransport.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/UDPTransport.java similarity index 97% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/UDPTransport.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/UDPTransport.java index 5a99c5cfa..640f81ee2 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/transport/UDPTransport.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/transport/UDPTransport.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; -import com.baidu.bifromq.basecluster.transport.proto.Packet; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basecluster.transport.proto.Packet; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.basehlc.HLC; import com.google.protobuf.InvalidProtocolBufferException; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; diff --git a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/util/RandomUtils.java b/base-cluster/src/main/java/org/apache/bifromq/basecluster/util/RandomUtils.java similarity index 97% rename from base-cluster/src/main/java/com/baidu/bifromq/basecluster/util/RandomUtils.java rename to base-cluster/src/main/java/org/apache/bifromq/basecluster/util/RandomUtils.java index 591a930fb..7b143e40f 100644 --- a/base-cluster/src/main/java/com/baidu/bifromq/basecluster/util/RandomUtils.java +++ b/base-cluster/src/main/java/org/apache/bifromq/basecluster/util/RandomUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.util; +package org.apache.bifromq.basecluster.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/base-cluster/src/main/proto/basecluster/ClusterMessage.proto b/base-cluster/src/main/proto/basecluster/ClusterMessage.proto index 35f0a20a9..0e4ce6638 100644 --- a/base-cluster/src/main/proto/basecluster/ClusterMessage.proto +++ b/base-cluster/src/main/proto/basecluster/ClusterMessage.proto @@ -14,7 +14,7 @@ import "basecrdt/CRDTStoreMessage.proto"; package basecluster; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.proto"; +option java_package = "org.apache.bifromq.basecluster.proto"; option java_outer_classname = "ClusterMessageProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/agent/AgentMember.proto b/base-cluster/src/main/proto/basecluster/agent/AgentMember.proto index f8d63e485..e8e615b8f 100644 --- a/base-cluster/src/main/proto/basecluster/agent/AgentMember.proto +++ b/base-cluster/src/main/proto/basecluster/agent/AgentMember.proto @@ -4,7 +4,7 @@ import "basecluster/membership/HostMember.proto"; package basecluster.agent; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.agent.proto"; +option java_package = "org.apache.bifromq.basecluster.agent.proto"; option optimize_for = SPEED; message AgentEndpoint { diff --git a/base-cluster/src/main/proto/basecluster/agent/AgentMessage.proto b/base-cluster/src/main/proto/basecluster/agent/AgentMessage.proto index efb5abc0f..db9897cd7 100644 --- a/base-cluster/src/main/proto/basecluster/agent/AgentMessage.proto +++ b/base-cluster/src/main/proto/basecluster/agent/AgentMessage.proto @@ -4,7 +4,7 @@ import "basecluster/agent/AgentMember.proto"; package basecluster.agent; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.agent.proto"; +option java_package = "org.apache.bifromq.basecluster.agent.proto"; option java_outer_classname = "AgentMessageProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/fd/Ack.proto b/base-cluster/src/main/proto/basecluster/fd/Ack.proto index 1a24a4bd4..37c5617b5 100644 --- a/base-cluster/src/main/proto/basecluster/fd/Ack.proto +++ b/base-cluster/src/main/proto/basecluster/fd/Ack.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.fd; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.fd.proto"; +option java_package = "org.apache.bifromq.basecluster.fd.proto"; option java_outer_classname = "AckProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/fd/Nack.proto b/base-cluster/src/main/proto/basecluster/fd/Nack.proto index 174fa91dd..af3bc885f 100644 --- a/base-cluster/src/main/proto/basecluster/fd/Nack.proto +++ b/base-cluster/src/main/proto/basecluster/fd/Nack.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.fd; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.fd.proto"; +option java_package = "org.apache.bifromq.basecluster.fd.proto"; option java_outer_classname = "NackProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/fd/Ping.proto b/base-cluster/src/main/proto/basecluster/fd/Ping.proto index 99da8cb33..de73e4e58 100644 --- a/base-cluster/src/main/proto/basecluster/fd/Ping.proto +++ b/base-cluster/src/main/proto/basecluster/fd/Ping.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.fd; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.fd.proto"; +option java_package = "org.apache.bifromq.basecluster.fd.proto"; option java_outer_classname = "PingProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/fd/PingReq.proto b/base-cluster/src/main/proto/basecluster/fd/PingReq.proto index ed0bf1b42..fdcb9e4f0 100644 --- a/base-cluster/src/main/proto/basecluster/fd/PingReq.proto +++ b/base-cluster/src/main/proto/basecluster/fd/PingReq.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.fd; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.fd.proto"; +option java_package = "org.apache.bifromq.basecluster.fd.proto"; option java_outer_classname = "PingReqProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/membership/Doubt.proto b/base-cluster/src/main/proto/basecluster/membership/Doubt.proto index 9ec3296d9..2fd152fce 100644 --- a/base-cluster/src/main/proto/basecluster/membership/Doubt.proto +++ b/base-cluster/src/main/proto/basecluster/membership/Doubt.proto @@ -4,7 +4,7 @@ import "basecluster/membership/HostMember.proto"; package basecluster.membership; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.membership.proto"; +option java_package = "org.apache.bifromq.basecluster.membership.proto"; option optimize_for = SPEED; message Doubt { diff --git a/base-cluster/src/main/proto/basecluster/membership/Endorse.proto b/base-cluster/src/main/proto/basecluster/membership/Endorse.proto index 4d0c16922..531674c6f 100644 --- a/base-cluster/src/main/proto/basecluster/membership/Endorse.proto +++ b/base-cluster/src/main/proto/basecluster/membership/Endorse.proto @@ -4,7 +4,7 @@ import "basecluster/membership/HostMember.proto"; package basecluster.membership; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.membership.proto"; +option java_package = "org.apache.bifromq.basecluster.membership.proto"; option optimize_for = SPEED; message Endorse { diff --git a/base-cluster/src/main/proto/basecluster/membership/Fail.proto b/base-cluster/src/main/proto/basecluster/membership/Fail.proto index 1429f7ea9..157298bcb 100644 --- a/base-cluster/src/main/proto/basecluster/membership/Fail.proto +++ b/base-cluster/src/main/proto/basecluster/membership/Fail.proto @@ -4,7 +4,7 @@ import "basecluster/membership/HostMember.proto"; package basecluster.membership; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.membership.proto"; +option java_package = "org.apache.bifromq.basecluster.membership.proto"; option optimize_for = SPEED; message Fail { diff --git a/base-cluster/src/main/proto/basecluster/membership/HostMember.proto b/base-cluster/src/main/proto/basecluster/membership/HostMember.proto index b68d97256..e4243d5d3 100644 --- a/base-cluster/src/main/proto/basecluster/membership/HostMember.proto +++ b/base-cluster/src/main/proto/basecluster/membership/HostMember.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.membership; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.membership.proto"; +option java_package = "org.apache.bifromq.basecluster.membership.proto"; option optimize_for = SPEED; message HostEndpoint{ diff --git a/base-cluster/src/main/proto/basecluster/membership/Join.proto b/base-cluster/src/main/proto/basecluster/membership/Join.proto index 28f3c1b7c..c783926d8 100644 --- a/base-cluster/src/main/proto/basecluster/membership/Join.proto +++ b/base-cluster/src/main/proto/basecluster/membership/Join.proto @@ -4,7 +4,7 @@ import "basecluster/membership/HostMember.proto"; package basecluster.membership; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.membership.proto"; +option java_package = "org.apache.bifromq.basecluster.membership.proto"; option optimize_for = SPEED; message Join { diff --git a/base-cluster/src/main/proto/basecluster/membership/Quit.proto b/base-cluster/src/main/proto/basecluster/membership/Quit.proto index 6e05a46a7..8427cee57 100644 --- a/base-cluster/src/main/proto/basecluster/membership/Quit.proto +++ b/base-cluster/src/main/proto/basecluster/membership/Quit.proto @@ -4,7 +4,7 @@ import "basecluster/membership/HostMember.proto"; package basecluster.membership; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.membership.proto"; +option java_package = "org.apache.bifromq.basecluster.membership.proto"; option optimize_for = SPEED; message Quit { diff --git a/base-cluster/src/main/proto/basecluster/messenger/MessengerMessage.proto b/base-cluster/src/main/proto/basecluster/messenger/MessengerMessage.proto index 43c98a9b9..ee1c9ed66 100644 --- a/base-cluster/src/main/proto/basecluster/messenger/MessengerMessage.proto +++ b/base-cluster/src/main/proto/basecluster/messenger/MessengerMessage.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.messenger; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.messenger.proto"; +option java_package = "org.apache.bifromq.basecluster.messenger.proto"; option java_outer_classname = "MessengerMessageProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/main/proto/basecluster/transport/Packet.proto b/base-cluster/src/main/proto/basecluster/transport/Packet.proto index 35c867b5d..a9b522ab2 100644 --- a/base-cluster/src/main/proto/basecluster/transport/Packet.proto +++ b/base-cluster/src/main/proto/basecluster/transport/Packet.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecluster.transport; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecluster.transport.proto"; +option java_package = "org.apache.bifromq.basecluster.transport.proto"; option java_outer_classname = "PacketProtos"; option optimize_for = SPEED; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode1.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode1.java similarity index 93% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode1.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode1.java index 26ced605d..4dcba85b4 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode1.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode1.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; import com.google.common.util.concurrent.MoreExecutors; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Metrics; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode2.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode2.java similarity index 93% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode2.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode2.java index 697ff49b9..697c25fc5 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode2.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode2.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Metrics; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode3.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode3.java similarity index 91% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode3.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode3.java index 7785232f8..495c974d9 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostNode3.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostNode3.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Metrics; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostTest.java similarity index 96% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostTest.java index ff308c457..ec9551103 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; import org.testng.annotations.Test; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostsTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostsTest.java similarity index 96% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostsTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostsTest.java index 801f67025..73bf46e0c 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentHostsTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentHostsTest.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.annotation.StoreCfg; -import com.baidu.bifromq.basecluster.annotation.StoreCfgs; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.annotation.StoreCfg; +import org.apache.bifromq.basecluster.annotation.StoreCfgs; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentTestCluster.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentTestCluster.java similarity index 92% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentTestCluster.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentTestCluster.java index e10696c74..6df71cbd8 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentTestCluster.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentTestCluster.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; - -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecluster.memberlist.HostAddressResolver; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.transport.ITransport; +package org.apache.bifromq.basecluster; + +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.memberlist.HostAddressResolver; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.transport.ITransport; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentTestTemplate.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentTestTemplate.java similarity index 94% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentTestTemplate.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentTestTemplate.java index 8751dc038..ea46dc3df 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/AgentTestTemplate.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/AgentTestTemplate.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecluster.annotation.StoreCfg; -import com.baidu.bifromq.basecluster.annotation.StoreCfgs; -import com.baidu.bifromq.basecrdt.store.CRDTStoreOptions; +import org.apache.bifromq.basecluster.annotation.StoreCfg; +import org.apache.bifromq.basecluster.annotation.StoreCfgs; +import org.apache.bifromq.basecrdt.store.CRDTStoreOptions; import java.lang.reflect.Method; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/MockNetwork.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/MockNetwork.java similarity index 96% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/MockNetwork.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/MockNetwork.java index ec83582f7..a7dd73f7c 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/MockNetwork.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/MockNetwork.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster; +package org.apache.bifromq.basecluster; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecluster.transport.PacketEnvelope; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecluster.transport.PacketEnvelope; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/annotation/StoreCfg.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/annotation/StoreCfg.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/annotation/StoreCfg.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/annotation/StoreCfg.java index 7c7d9024c..e19edf2ea 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/annotation/StoreCfg.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/annotation/StoreCfg.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.annotation; +package org.apache.bifromq.basecluster.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/annotation/StoreCfgs.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/annotation/StoreCfgs.java similarity index 94% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/annotation/StoreCfgs.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/annotation/StoreCfgs.java index ee16df665..969c6c77e 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/annotation/StoreCfgs.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/annotation/StoreCfgs.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.annotation; +package org.apache.bifromq.basecluster.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfoTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/DirectProbingInfoTest.java similarity index 96% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfoTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/DirectProbingInfoTest.java index adf8bad86..b7440e0b7 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/DirectProbingInfoTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/DirectProbingInfoTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMathTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/FailureDetectorMathTest.java similarity index 90% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMathTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/FailureDetectorMathTest.java index 2bf3b463e..bb3088eb8 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/FailureDetectorMathTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/FailureDetectorMathTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; -import static com.baidu.bifromq.basecluster.fd.FailureDetectorMath.scale; +import static org.apache.bifromq.basecluster.fd.FailureDetectorMath.scale; import static org.testng.Assert.assertEquals; import java.time.Duration; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/FailureDetectorTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/FailureDetectorTest.java similarity index 98% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/FailureDetectorTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/FailureDetectorTest.java index bf7265ecc..01eb56ab6 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/FailureDetectorTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/FailureDetectorTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; -import static com.baidu.bifromq.basecluster.fd.Fixtures.toPing; -import static com.baidu.bifromq.basecluster.fd.Fixtures.toPingAck; -import static com.baidu.bifromq.basecluster.fd.Fixtures.toPingNack; -import static com.baidu.bifromq.basecluster.fd.Fixtures.toPingReq; +import static org.apache.bifromq.basecluster.fd.Fixtures.toPing; +import static org.apache.bifromq.basecluster.fd.Fixtures.toPingAck; +import static org.apache.bifromq.basecluster.fd.Fixtures.toPingNack; +import static org.apache.bifromq.basecluster.fd.Fixtures.toPingReq; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -29,9 +29,9 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.schedulers.TestScheduler; import io.reactivex.rxjava3.schedulers.Timed; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/Fixtures.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/Fixtures.java similarity index 93% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/Fixtures.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/Fixtures.java index cdeb62144..f37e39aba 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/fd/Fixtures.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/fd/Fixtures.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.fd; +package org.apache.bifromq.basecluster.fd; -import com.baidu.bifromq.basecluster.fd.proto.Ack; -import com.baidu.bifromq.basecluster.fd.proto.Nack; -import com.baidu.bifromq.basecluster.fd.proto.Ping; -import com.baidu.bifromq.basecluster.fd.proto.PingReq; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.fd.proto.Ack; +import org.apache.bifromq.basecluster.fd.proto.Nack; +import org.apache.bifromq.basecluster.fd.proto.Ping; +import org.apache.bifromq.basecluster.fd.proto.PingReq; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; import java.time.Duration; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/AutoHealerTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/AutoHealerTest.java similarity index 90% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/AutoHealerTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/AutoHealerTest.java index 2073b3ee0..e307ff970 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/AutoHealerTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/AutoHealerTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; - -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL_ENDPOINT; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.REMOTE_ADDR_1; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.REMOTE_HOST_1_ENDPOINT; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.ZOMBIE_ENDPOINT; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.endorseMsg; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.failMsg; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.joinMsg; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.quitMsg; +package org.apache.bifromq.basecluster.memberlist; + +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.REMOTE_ADDR_1; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.REMOTE_HOST_1_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.ZOMBIE_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.endorseMsg; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.failMsg; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.joinMsg; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.quitMsg; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.atLeastOnce; @@ -33,11 +33,11 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Timed; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/AutoSeederTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/AutoSeederTest.java similarity index 89% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/AutoSeederTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/AutoSeederTest.java index a3ff54592..0e4f53f79 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/AutoSeederTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/AutoSeederTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL_ENDPOINT; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.REMOTE_ADDR_1; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.REMOTE_HOST_1_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.REMOTE_ADDR_1; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.REMOTE_HOST_1_ENDPOINT; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.atMost; @@ -28,10 +28,10 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.schedulers.Schedulers; import io.reactivex.rxjava3.schedulers.Timed; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/Fixtures.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/Fixtures.java similarity index 86% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/Fixtures.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/Fixtures.java index cdd1c885b..81dac888c 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/Fixtures.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/Fixtures.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; -import com.baidu.bifromq.basecluster.membership.proto.Doubt; -import com.baidu.bifromq.basecluster.membership.proto.Endorse; -import com.baidu.bifromq.basecluster.membership.proto.Fail; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecluster.membership.proto.Join; -import com.baidu.bifromq.basecluster.membership.proto.Quit; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecluster.membership.proto.Doubt; +import org.apache.bifromq.basecluster.membership.proto.Endorse; +import org.apache.bifromq.basecluster.membership.proto.Fail; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.membership.proto.Join; +import org.apache.bifromq.basecluster.membership.proto.Quit; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.schedulers.Timed; import java.net.InetSocketAddress; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolverTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolverTest.java similarity index 94% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolverTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolverTest.java index cef071592..2d79382df 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/HostAddressResolverTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/HostAddressResolverTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertFalse; @@ -19,7 +19,7 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; import java.net.InetSocketAddress; import java.time.Duration; import org.testng.annotations.Test; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/HostMemberListTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/HostMemberListTest.java similarity index 93% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/HostMemberListTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/HostMemberListTest.java index 7f1d8736e..827cf4bd4 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/HostMemberListTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/HostMemberListTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; - -import static com.baidu.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL_ADDR; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL_ENDPOINT; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL_REPLICA; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.LOCAL_STORE_ID; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.REMOTE_ADDR_1; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.REMOTE_HOST_1_ENDPOINT; -import static com.baidu.bifromq.basecluster.memberlist.Fixtures.ZOMBIE_ENDPOINT; +package org.apache.bifromq.basecluster.memberlist; + +import static org.apache.bifromq.basecluster.memberlist.CRDTUtil.AGENT_HOST_MAP_URI; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL_ADDR; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL_REPLICA; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.LOCAL_STORE_ID; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.REMOTE_ADDR_1; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.REMOTE_HOST_1_ENDPOINT; +import static org.apache.bifromq.basecluster.memberlist.Fixtures.ZOMBIE_ENDPOINT; import static java.util.Collections.emptyIterator; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -33,22 +33,22 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.memberlist.agent.Agent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.membership.proto.Doubt; -import com.baidu.bifromq.basecluster.membership.proto.Fail; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; -import com.baidu.bifromq.basecluster.membership.proto.Join; -import com.baidu.bifromq.basecluster.membership.proto.Quit; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecluster.memberlist.agent.Agent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.membership.proto.Doubt; +import org.apache.bifromq.basecluster.membership.proto.Fail; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.membership.proto.Join; +import org.apache.bifromq.basecluster.membership.proto.Quit; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.store.ICRDTStore; import com.google.common.collect.Iterators; import com.google.common.util.concurrent.MoreExecutors; import com.google.protobuf.ByteString; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/MemberSelectorTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/MemberSelectorTest.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/MemberSelectorTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/MemberSelectorTest.java index 6ef026817..b0376c334 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/MemberSelectorTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/MemberSelectorTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist; +package org.apache.bifromq.basecluster.memberlist; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.when; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.messenger.IRecipient; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.messenger.IRecipient; import com.google.common.util.concurrent.MoreExecutors; import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java similarity index 92% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java index d309efa45..68c668633 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentHostProviderTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.HostMember; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.HostMember; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMemberTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMemberTest.java similarity index 94% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMemberTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMemberTest.java index 48609983f..728d8c21d 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMemberTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMemberTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; -import static com.baidu.bifromq.basecluster.memberlist.agent.MockUtil.toAgentMemberAddr; +import static org.apache.bifromq.basecluster.memberlist.agent.MockUtil.toAgentMemberAddr; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Mockito.atLeast; @@ -25,18 +25,18 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessageEnvelope; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMessageEnvelope; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ICRDTStore; import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import com.google.protobuf.ByteString; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java similarity index 91% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java index 20827d9a0..7f9b4864e 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentMessengerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -20,14 +20,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessageEnvelope; -import com.baidu.bifromq.basecluster.memberlist.IHostAddressResolver; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.messenger.IMessenger; -import com.baidu.bifromq.basecluster.messenger.MessageEnvelope; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.agent.proto.AgentMessageEnvelope; +import org.apache.bifromq.basecluster.memberlist.IHostAddressResolver; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.messenger.IMessenger; +import org.apache.bifromq.basecluster.messenger.MessageEnvelope; +import org.apache.bifromq.basecluster.proto.ClusterMessage; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.schedulers.Timed; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentTest.java similarity index 92% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentTest.java index 14660e764..269d2ef97 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/AgentTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/AgentTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; @@ -22,18 +22,18 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.agent.proto.AgentMember; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessageEnvelope; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentMember; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecluster.agent.proto.AgentMessageEnvelope; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ICRDTStore; import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import com.google.protobuf.ByteString; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/MockUtil.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/MockUtil.java similarity index 84% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/MockUtil.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/MockUtil.java index 8a67e7c03..736283c39 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/memberlist/agent/MockUtil.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/memberlist/agent/MockUtil.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.memberlist.agent; +package org.apache.bifromq.basecluster.memberlist.agent; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basecluster.agent.proto.AgentEndpoint; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberMetadata; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basecluster.agent.proto.AgentEndpoint; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberMetadata; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basehlc.HLC; import com.google.common.collect.Iterators; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/GossiperTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/GossiperTest.java similarity index 98% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/GossiperTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/GossiperTest.java index 7e998ed5d..0642ae7cb 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/GossiperTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/GossiperTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.messenger.proto.GossipMessage; +import org.apache.bifromq.basecluster.messenger.proto.GossipMessage; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerFuncTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerFuncTest.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerFuncTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerFuncTest.java index 0380496b2..e8eba5948 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerFuncTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerFuncTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecluster.membership.proto.Quit; -import com.baidu.bifromq.basecluster.proto.ClusterMessage; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecluster.transport.Transport; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecluster.membership.proto.Quit; +import org.apache.bifromq.basecluster.proto.ClusterMessage; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecluster.transport.Transport; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Scheduler; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerTest.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerTest.java index 0c11831ae..669d10234 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basecluster.transport.Transport; +import org.apache.bifromq.basecluster.transport.Transport; import io.reactivex.rxjava3.schedulers.Schedulers; import java.net.InetSocketAddress; import java.util.Collection; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerTransportTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerTransportTest.java similarity index 91% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerTransportTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerTransportTest.java index 4a2510425..95ecfd1ee 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/messenger/MessengerTransportTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/messenger/MessengerTransportTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.messenger; +package org.apache.bifromq.basecluster.messenger; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -19,11 +19,11 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.messenger.proto.DirectMessage; -import com.baidu.bifromq.basecluster.messenger.proto.GossipMessage; -import com.baidu.bifromq.basecluster.messenger.proto.MessengerMessage; -import com.baidu.bifromq.basecluster.transport.ITransport; -import com.baidu.bifromq.basecluster.transport.PacketEnvelope; +import org.apache.bifromq.basecluster.messenger.proto.DirectMessage; +import org.apache.bifromq.basecluster.messenger.proto.GossipMessage; +import org.apache.bifromq.basecluster.messenger.proto.MessengerMessage; +import org.apache.bifromq.basecluster.transport.ITransport; +import org.apache.bifromq.basecluster.transport.PacketEnvelope; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.schedulers.Timed; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPReceiver.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPReceiver.java similarity index 97% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPReceiver.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPReceiver.java index 444cbda52..9a2b7840e 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPReceiver.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPReceiver.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPSender.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPSender.java similarity index 97% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPSender.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPSender.java index 56ff20fa9..459d3a53b 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPSender.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPSender.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPTransportFuncTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPTransportFuncTest.java similarity index 99% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPTransportFuncTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPTransportFuncTest.java index f299fd47d..23c6f1f97 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPTransportFuncTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPTransportFuncTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertEquals; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPTransportTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPTransportTest.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPTransportTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPTransportTest.java index c7537bfd4..77bb75af2 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TCPTransportTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TCPTransportTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import static org.testng.Assert.assertTrue; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TransportTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TransportTest.java similarity index 96% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TransportTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TransportTest.java index ec79e2b4b..fa68ea07b 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/TransportTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/TransportTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPReceiver.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPReceiver.java similarity index 97% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPReceiver.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPReceiver.java index f8b758dfc..42ecb43ec 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPReceiver.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPReceiver.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPSender.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPSender.java similarity index 97% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPSender.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPSender.java index b6e1b57d5..e52cb8d50 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPSender.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPSender.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPTransportFuncTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPTransportFuncTest.java similarity index 92% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPTransportFuncTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPTransportFuncTest.java index b4703dc66..d6aab8a17 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPTransportFuncTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPTransportFuncTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; -import com.baidu.bifromq.basecluster.transport.proto.Packet; +import org.apache.bifromq.basecluster.transport.proto.Packet; import com.google.protobuf.ByteString; import java.net.InetSocketAddress; import java.nio.charset.Charset; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPTransportTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPTransportTest.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPTransportTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPTransportTest.java index 0db360f62..23e232c6e 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/transport/UDPTransportTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/transport/UDPTransportTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.transport; +package org.apache.bifromq.basecluster.transport; import static org.testng.Assert.assertTrue; diff --git a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/utils/RandomUtilTest.java b/base-cluster/src/test/java/org/apache/bifromq/basecluster/utils/RandomUtilTest.java similarity index 95% rename from base-cluster/src/test/java/com/baidu/bifromq/basecluster/utils/RandomUtilTest.java rename to base-cluster/src/test/java/org/apache/bifromq/basecluster/utils/RandomUtilTest.java index 170836926..236705255 100644 --- a/base-cluster/src/test/java/com/baidu/bifromq/basecluster/utils/RandomUtilTest.java +++ b/base-cluster/src/test/java/org/apache/bifromq/basecluster/utils/RandomUtilTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecluster.utils; +package org.apache.bifromq.basecluster.utils; import static java.util.Collections.emptyList; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.util.RandomUtils; +import org.apache.bifromq.basecluster.util.RandomUtils; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/AgentUtil.java b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/AgentUtil.java similarity index 93% rename from base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/AgentUtil.java rename to base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/AgentUtil.java index 28e266ffc..9f93f022b 100644 --- a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/AgentUtil.java +++ b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/AgentUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import java.util.Base64; import lombok.SneakyThrows; diff --git a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTCluster.java b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTCluster.java similarity index 90% rename from base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTCluster.java rename to base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTCluster.java index 3eba32904..1168196e8 100644 --- a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTCluster.java +++ b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTCluster.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; -import static com.baidu.bifromq.basecrdt.store.ReplicaIdGenerator.generate; +import static org.apache.bifromq.basecrdt.store.ReplicaIdGenerator.generate; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; -import com.baidu.bifromq.basecrdt.ReplicaLogger; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.basecrdt.ReplicaLogger; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; import com.google.protobuf.AbstractMessageLite; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTService.java b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTService.java similarity index 89% rename from base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTService.java rename to base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTService.java index 87265f715..f367d5a87 100644 --- a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTService.java +++ b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTService.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; import static java.util.concurrent.Executors.newSingleThreadExecutor; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ICRDTStore; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.logger.FormatableLogger; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ICRDTStore; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.logger.FormatableLogger; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTServiceOptions.java b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTServiceOptions.java similarity index 91% rename from base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTServiceOptions.java rename to base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTServiceOptions.java index b95793ae0..58c5f3b0b 100644 --- a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/CRDTServiceOptions.java +++ b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/CRDTServiceOptions.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; -import com.baidu.bifromq.basecrdt.store.CRDTStoreOptions; +import org.apache.bifromq.basecrdt.store.CRDTStoreOptions; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/ICRDTService.java b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/ICRDTService.java similarity index 90% rename from base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/ICRDTService.java rename to base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/ICRDTService.java index be5dba215..1c8865f5c 100644 --- a/base-crdt/base-crdt-service/src/main/java/com/baidu/bifromq/basecrdt/service/ICRDTService.java +++ b/base-crdt/base-crdt-service/src/main/java/org/apache/bifromq/basecrdt/service/ICRDTService.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.util.Set; diff --git a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/BasicCRDTObjectTest.java b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/BasicCRDTObjectTest.java similarity index 88% rename from base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/BasicCRDTObjectTest.java rename to base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/BasicCRDTObjectTest.java index 9406dc61d..9cc143d5c 100644 --- a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/BasicCRDTObjectTest.java +++ b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/BasicCRDTObjectTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.service.annotation.ServiceCfg; -import com.baidu.bifromq.basecrdt.service.annotation.ServiceCfgs; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.service.annotation.ServiceCfg; +import org.apache.bifromq.basecrdt.service.annotation.ServiceCfgs; import lombok.extern.slf4j.Slf4j; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CCounterTest.java b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CCounterTest.java similarity index 84% rename from base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CCounterTest.java rename to base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CCounterTest.java index 68b82f507..08b6a967b 100644 --- a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CCounterTest.java +++ b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CCounterTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.service.annotation.ServiceCfg; -import com.baidu.bifromq.basecrdt.service.annotation.ServiceCfgs; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.service.annotation.ServiceCfg; +import org.apache.bifromq.basecrdt.service.annotation.ServiceCfgs; import java.util.Set; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CRDTServiceTestCluster.java b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CRDTServiceTestCluster.java similarity index 95% rename from base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CRDTServiceTestCluster.java rename to base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CRDTServiceTestCluster.java index e4e9b51a8..d459389cd 100644 --- a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CRDTServiceTestCluster.java +++ b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CRDTServiceTestCluster.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CRDTServiceTestTemplate.java b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CRDTServiceTestTemplate.java similarity index 94% rename from base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CRDTServiceTestTemplate.java rename to base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CRDTServiceTestTemplate.java index e57cf0275..fcda9d238 100644 --- a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/CRDTServiceTestTemplate.java +++ b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/CRDTServiceTestTemplate.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service; +package org.apache.bifromq.basecrdt.service; import static org.testng.Assert.fail; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecrdt.service.annotation.ServiceCfg; -import com.baidu.bifromq.basecrdt.service.annotation.ServiceCfgs; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecrdt.service.annotation.ServiceCfg; +import org.apache.bifromq.basecrdt.service.annotation.ServiceCfgs; import java.lang.reflect.Method; import java.util.concurrent.Callable; import lombok.extern.slf4j.Slf4j; diff --git a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/annotation/ServiceCfg.java b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/annotation/ServiceCfg.java similarity index 94% rename from base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/annotation/ServiceCfg.java rename to base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/annotation/ServiceCfg.java index 8c5d262c2..2868b2567 100644 --- a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/annotation/ServiceCfg.java +++ b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/annotation/ServiceCfg.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service.annotation; +package org.apache.bifromq.basecrdt.service.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/annotation/ServiceCfgs.java b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/annotation/ServiceCfgs.java similarity index 94% rename from base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/annotation/ServiceCfgs.java rename to base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/annotation/ServiceCfgs.java index 3df5bfe69..e2defdb84 100644 --- a/base-crdt/base-crdt-service/src/test/java/com/baidu/bifromq/basecrdt/service/annotation/ServiceCfgs.java +++ b/base-crdt/base-crdt-service/src/test/java/org/apache/bifromq/basecrdt/service/annotation/ServiceCfgs.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.service.annotation; +package org.apache.bifromq.basecrdt.service.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/ReplicaLogger.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/ReplicaLogger.java similarity index 81% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/ReplicaLogger.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/ReplicaLogger.java index 63a354a17..81f254075 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/ReplicaLogger.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/ReplicaLogger.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt; +package org.apache.bifromq.basecrdt; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.util.Formatter; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.util.Formatter; +import org.apache.bifromq.logger.SiftLogger; public class ReplicaLogger extends SiftLogger { public ReplicaLogger(Replica replica, Class clazz) { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/AWORSetOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/AWORSetOperation.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/AWORSetOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/AWORSetOperation.java index f1545084a..91525f76f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/AWORSetOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/AWORSetOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import lombok.ToString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CCounterOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CCounterOperation.java similarity index 97% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CCounterOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CCounterOperation.java index dafdc0529..04c130c8f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CCounterOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CCounterOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CRDTURI.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CRDTURI.java similarity index 97% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CRDTURI.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CRDTURI.java index 274636056..3eea2d743 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CRDTURI.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CRDTURI.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.common.base.Preconditions; import java.util.regex.Pattern; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CausalCRDTType.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CausalCRDTType.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CausalCRDTType.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CausalCRDTType.java index cddb3ab82..682144806 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/CausalCRDTType.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/CausalCRDTType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/DWFlagOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/DWFlagOperation.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/DWFlagOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/DWFlagOperation.java index b3ae48dd8..4e88e16cc 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/DWFlagOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/DWFlagOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/EWFlagOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/EWFlagOperation.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/EWFlagOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/EWFlagOperation.java index cf65b059a..e1f01974f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/EWFlagOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/EWFlagOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IAWORSet.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IAWORSet.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IAWORSet.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IAWORSet.java index fba47c749..9dcdd2c7c 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IAWORSet.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IAWORSet.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IAWORSetInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IAWORSetInflater.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IAWORSetInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IAWORSetInflater.java index ee4e5c1ea..7b28218f2 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IAWORSetInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IAWORSetInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; /** * Inflater interface for AWORSet. diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICCounter.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICCounter.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICCounter.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICCounter.java index 771d32c3a..abcd5e4de 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICCounter.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICCounter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface ICCounter extends ICausalCRDT { @Override diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICCounterInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICCounterInflater.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICCounterInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICCounterInflater.java index 6af98478b..3acf8e47c 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICCounterInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICCounterInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface ICCounterInflater extends ICausalCRDTInflater { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICRDTOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICRDTOperation.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICRDTOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICRDTOperation.java index b1f2da37d..d75d3ed5f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICRDTOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICRDTOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface ICRDTOperation { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICausalCRDT.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICausalCRDT.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICausalCRDT.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICausalCRDT.java index ba7dfc6c9..0cd03722b 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICausalCRDT.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICausalCRDT.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.Replica; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICausalCRDTInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICausalCRDTInflater.java similarity index 90% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICausalCRDTInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICausalCRDTInflater.java index ed7fba446..5101edfbb 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ICausalCRDTInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ICausalCRDTInflater.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import java.util.Map; import java.util.NavigableMap; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IDWFlag.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IDWFlag.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IDWFlag.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IDWFlag.java index 60558ac79..30c68f185 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IDWFlag.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IDWFlag.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IDWFlag extends ICausalCRDT { @Override diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IDWFlagInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IDWFlagInflater.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IDWFlagInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IDWFlagInflater.java index 0f6d2a535..77827971f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IDWFlagInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IDWFlagInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IDWFlagInflater extends ICausalCRDTInflater { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IEWFlag.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IEWFlag.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IEWFlag.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IEWFlag.java index 146eadec8..467106a6f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IEWFlag.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IEWFlag.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IEWFlag extends ICausalCRDT { @Override diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IEWFlagInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IEWFlagInflater.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IEWFlagInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IEWFlagInflater.java index 23b6a37a4..f5d55dfa8 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IEWFlagInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IEWFlagInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IEWFlagInflater extends ICausalCRDTInflater { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IMVReg.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IMVReg.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IMVReg.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IMVReg.java index b909af945..5afc1acf4 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IMVReg.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IMVReg.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IMVRegInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IMVRegInflater.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IMVRegInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IMVRegInflater.java index 993ac9745..3942d1dc4 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IMVRegInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IMVRegInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IMVRegInflater extends ICausalCRDTInflater { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IORMap.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IORMap.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IORMap.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IORMap.java index f4800da9c..ce4913ac0 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IORMap.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IORMap.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IORMapInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IORMapInflater.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IORMapInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IORMapInflater.java index 130408d15..d42031a1a 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IORMapInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IORMapInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IORMapInflater extends ICausalCRDTInflater { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IRWORSet.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IRWORSet.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IRWORSet.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IRWORSet.java index 763714a3f..3fceda151 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IRWORSet.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IRWORSet.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IRWORSetInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IRWORSetInflater.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IRWORSetInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IRWORSetInflater.java index ac2c5f315..0196f1eaa 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/IRWORSetInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/IRWORSetInflater.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; public interface IRWORSetInflater extends ICausalCRDTInflater { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/MVRegOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/MVRegOperation.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/MVRegOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/MVRegOperation.java index f86797ea8..b681547e8 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/MVRegOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/MVRegOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import lombok.AccessLevel; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ORMapOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ORMapOperation.java similarity index 98% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ORMapOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ORMapOperation.java index 36664c91e..d61341d04 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/ORMapOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/ORMapOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import lombok.ToString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/RWORSetOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/RWORSetOperation.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/RWORSetOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/RWORSetOperation.java index 97753889a..c989b843b 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/api/RWORSetOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/api/RWORSetOperation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.api; +package org.apache.bifromq.basecrdt.core.api; import com.google.protobuf.ByteString; import lombok.AccessLevel; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTCloseException.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTCloseException.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTCloseException.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTCloseException.java index 7a4867bd3..d2b1d12c1 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTCloseException.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTCloseException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.exception; +package org.apache.bifromq.basecrdt.core.exception; public class CRDTCloseException extends CRDTEngineException { public CRDTCloseException() { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTEngineException.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTEngineException.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTEngineException.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTEngineException.java index 3a3b7f255..bff85af83 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTEngineException.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTEngineException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.exception; +package org.apache.bifromq.basecrdt.core.exception; public abstract class CRDTEngineException extends RuntimeException { CRDTEngineException(String message) { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTNotFoundException.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTNotFoundException.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTNotFoundException.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTNotFoundException.java index d30e2f699..d8d1a73a3 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/exception/CRDTNotFoundException.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/exception/CRDTNotFoundException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.exception; +package org.apache.bifromq.basecrdt.core.exception; public class CRDTNotFoundException extends CRDTEngineException { public CRDTNotFoundException() { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSet.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSet.java similarity index 85% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSet.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSet.java index 15c22b8e7..9e053e1a6 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSet.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSet.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.core.api.IAWORSet; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.core.api.IAWORSet; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java index 8f107e36c..be287936f 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSetCoalesceOperation.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSetInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSetInflater.java index c4e886734..124893f30 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/AWORSetInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IAWORSet; -import com.baidu.bifromq.basecrdt.core.api.IAWORSetInflater; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IAWORSet; +import org.apache.bifromq.basecrdt.core.api.IAWORSetInflater; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounter.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounter.java similarity index 87% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounter.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounter.java index c45935a4a..58c441cf7 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounter.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounter.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java index da7f08460..40170c9c4 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounterCoalesceOperation.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounterInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounterInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounterInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounterInflater.java index 1e16730f0..0705ffac1 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CCounterInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CCounterInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.core.api.ICCounterInflater; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.core.api.ICCounterInflater; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDT.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDT.java similarity index 90% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDT.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDT.java index 3ad6d367b..990a34ae1 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDT.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDT.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Sets; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.ObservableEmitter; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDTInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDTInflater.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDTInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDTInflater.java index 48c92cc2d..29b864e8b 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDTInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDTInflater.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; - -import com.baidu.bifromq.basecrdt.ReplicaLogger; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDTInflater; -import com.baidu.bifromq.basecrdt.core.exception.CRDTCloseException; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +package org.apache.bifromq.basecrdt.core.internal; + +import org.apache.bifromq.basecrdt.ReplicaLogger; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDTInflater; +import org.apache.bifromq.basecrdt.core.exception.CRDTCloseException; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Gauge; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java similarity index 92% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java index e5a9daf7e..4e5c3e7d6 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CausalCRDTInflaterFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDTInflater; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDTInflater; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CoalesceOperation.java similarity index 89% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CoalesceOperation.java index 25c37afd5..f96ddc1d3 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/CoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/CoalesceOperation.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; import com.google.protobuf.ByteString; abstract class CoalesceOperation implements ICoalesceOperation { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlag.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlag.java similarity index 82% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlag.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlag.java index 8fe511784..0dcf35423 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlag.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlag.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.DWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IDWFlag; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.core.api.DWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IDWFlag; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; class DWFlag extends CausalCRDT implements IDWFlag { private volatile boolean flag; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java similarity index 89% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java index 300d3d59d..6991a8804 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlagCoalesceOperation.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.DWFlagOperation; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.DWFlagOperation; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.protobuf.ByteString; class DWFlagCoalesceOperation extends CoalesceOperation { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlagInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlagInflater.java index 86a638bc4..f86b4b764 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DWFlagInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.DWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IDWFlag; -import com.baidu.bifromq.basecrdt.core.api.IDWFlagInflater; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.DWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IDWFlag; +import org.apache.bifromq.basecrdt.core.api.IDWFlagInflater; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotFunc.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotFunc.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotFunc.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotFunc.java index 381186e21..5f0aa07d3 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotFunc.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotFunc.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotMap.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotMap.java similarity index 97% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotMap.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotMap.java index 0abfecf3f..ec74738d3 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotMap.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotMap.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import static java.util.Collections.emptyIterator; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Iterators; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotSet.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotSet.java similarity index 91% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotSet.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotSet.java index 4bbb73334..b5add52b2 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotSet.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotSet.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Sets; import java.util.Iterator; import java.util.Set; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotStore.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotStore.java similarity index 87% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotStore.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotStore.java index 95cd66ffb..d9a36ea98 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/DotStore.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/DotStore.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.StateLattice; abstract class DotStore implements IDotStore { abstract boolean add(StateLattice addState); diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlag.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlag.java similarity index 82% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlag.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlag.java index 4509ff8f6..4dcb6ee62 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlag.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlag.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.EWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IEWFlag; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.core.api.EWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IEWFlag; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; class EWFlag extends CausalCRDT implements IEWFlag { private volatile boolean flag; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java similarity index 89% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java index e5ffb6eb4..d3c71cfe0 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlagCoalesceOperation.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.EWFlagOperation; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.EWFlagOperation; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.protobuf.ByteString; class EWFlagCoalesceOperation extends CoalesceOperation { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlagInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlagInflater.java index d4ece596d..6412e1add 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EWFlagInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.EWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IEWFlag; -import com.baidu.bifromq.basecrdt.core.api.IEWFlagInflater; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.EWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IEWFlag; +import org.apache.bifromq.basecrdt.core.api.IEWFlagInflater; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EventHistoryUtil.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EventHistoryUtil.java similarity index 99% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EventHistoryUtil.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EventHistoryUtil.java index 341f7acc3..d4e5cf9c2 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/EventHistoryUtil.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/EventHistoryUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import static java.util.Collections.emptyNavigableMap; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ICoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ICoalesceOperation.java similarity index 84% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ICoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ICoalesceOperation.java index ef166e4ea..06438c06d 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ICoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ICoalesceOperation.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.proto.Replacement; interface ICoalesceOperation { interface IEventGenerator { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotFunc.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotFunc.java similarity index 89% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotFunc.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotFunc.java index bd1aebed5..dc792a744 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotFunc.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotFunc.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Dot; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotMap.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotMap.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotMap.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotMap.java index 02b9d4b42..ea8cfe689 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotMap.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotMap.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotSet.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotSet.java similarity index 92% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotSet.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotSet.java index 32d04245e..bfd55a609 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotSet.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotSet.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; interface IDotSet extends IDotStore { } diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotStore.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotStore.java similarity index 89% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotStore.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotStore.java index 54af28277..e44f6ba19 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IDotStore.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IDotStore.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Dot; interface IDotStore extends Iterable { /** diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IReplicaStateLattice.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IReplicaStateLattice.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IReplicaStateLattice.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IReplicaStateLattice.java index 71ea54e60..b5fc0fd56 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/IReplicaStateLattice.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/IReplicaStateLattice.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java index 55b53fb93..4ce32339a 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/InMemReplicaStateLattice.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.EventHistoryUtil.diff; -import static com.baidu.bifromq.basecrdt.core.internal.EventHistoryUtil.forget; -import static com.baidu.bifromq.basecrdt.core.internal.EventHistoryUtil.isRemembering; -import static com.baidu.bifromq.basecrdt.core.util.LatticeIndexUtil.remember; +import static org.apache.bifromq.basecrdt.core.internal.EventHistoryUtil.diff; +import static org.apache.bifromq.basecrdt.core.internal.EventHistoryUtil.forget; +import static org.apache.bifromq.basecrdt.core.internal.EventHistoryUtil.isRemembering; +import static org.apache.bifromq.basecrdt.core.util.LatticeIndexUtil.remember; import static java.util.Collections.emptyNavigableMap; import static java.util.Collections.singleton; -import com.baidu.bifromq.basecrdt.ReplicaLogger; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.ReplicaLogger; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVReg.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVReg.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVReg.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVReg.java index fffc0604a..026112fc5 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVReg.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVReg.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java similarity index 78% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java index 0a59e8b24..c0cb74a9b 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVRegCoalesceOperation.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.dot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.replacements; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleValue; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.dot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.replacements; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleValue; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.protobuf.ByteString; class MVRegCoalesceOperation extends CoalesceOperation { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVRegInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVRegInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVRegInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVRegInflater.java index ff9aa2c40..4760dbd75 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/MVRegInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/MVRegInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IMVRegInflater; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IMVRegInflater; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMap.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMap.java similarity index 88% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMap.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMap.java index 0485bb7a9..a118d3c97 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMap.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMap.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; - -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.aworset; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.cctr; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.dwflag; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ewflag; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ormap; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.rworset; - -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IAWORSet; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.core.api.IDWFlag; -import com.baidu.bifromq.basecrdt.core.api.IEWFlag; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.IRWORSet; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +package org.apache.bifromq.basecrdt.core.internal; + +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.aworset; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.cctr; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.dwflag; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ewflag; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ormap; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.rworset; + +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IAWORSet; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.core.api.IDWFlag; +import org.apache.bifromq.basecrdt.core.api.IEWFlag; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.IRWORSet; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.collect.AbstractIterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java index 7556c05c6..ff1d40bbf 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapCoalesceOperation.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.DWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.EWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.core.api.RWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.DWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.EWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.core.api.RWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapInflater.java index 768cb56c9..47f963ded 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.IORMapInflater; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.IORMapInflater; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapUtil.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapUtil.java similarity index 90% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapUtil.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapUtil.java index a718182e1..1e5d3a053 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ORMapUtil.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ORMapUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; import com.google.protobuf.ByteString; class ORMapUtil { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ProtoUtils.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ProtoUtils.java similarity index 87% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ProtoUtils.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ProtoUtils.java index 8443bbabe..59a7b0100 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/ProtoUtils.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/ProtoUtils.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; import static java.util.Collections.singleton; -import com.baidu.bifromq.basecrdt.proto.Dot; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.SingleDot; -import com.baidu.bifromq.basecrdt.proto.SingleMap; -import com.baidu.bifromq.basecrdt.proto.SingleValue; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.Dot; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.SingleDot; +import org.apache.bifromq.basecrdt.proto.SingleMap; +import org.apache.bifromq.basecrdt.proto.SingleValue; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Iterables; import com.google.protobuf.ByteString; import java.nio.ByteBuffer; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSet.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSet.java similarity index 91% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSet.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSet.java index 3ca7f612e..544f6fb96 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSet.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSet.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.IRWORSet; -import com.baidu.bifromq.basecrdt.core.api.RWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.IRWORSet; +import org.apache.bifromq.basecrdt.core.api.RWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.common.collect.AbstractIterator; import com.google.protobuf.ByteString; import java.util.Iterator; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java similarity index 88% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java index 4e801f85f..661272065 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSetCoalesceOperation.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.dot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.replacement; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleMap; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.dot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.replacement; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleMap; -import com.baidu.bifromq.basecrdt.core.api.RWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.core.api.RWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Replacement; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetInflater.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSetInflater.java similarity index 83% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetInflater.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSetInflater.java index 6294b7884..3b03e9dd2 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetInflater.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/RWORSetInflater.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IRWORSet; -import com.baidu.bifromq.basecrdt.core.api.IRWORSetInflater; -import com.baidu.bifromq.basecrdt.core.api.RWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IRWORSet; +import org.apache.bifromq.basecrdt.core.api.IRWORSetInflater; +import org.apache.bifromq.basecrdt.core.api.RWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import java.time.Duration; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/VarLong.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/VarLong.java similarity index 98% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/VarLong.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/VarLong.java index a92f78117..76fbe3af8 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/internal/VarLong.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/internal/VarLong.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/util/LatticeIndexUtil.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/util/LatticeIndexUtil.java similarity index 98% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/util/LatticeIndexUtil.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/util/LatticeIndexUtil.java index 0ee985b7c..f12eedb30 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/core/util/LatticeIndexUtil.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/core/util/LatticeIndexUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.util; +package org.apache.bifromq.basecrdt.core.util; import com.google.protobuf.ByteString; import java.util.Map; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/AntiEntropy.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/AntiEntropy.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/AntiEntropy.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/AntiEntropy.java index dafaeb290..c791e5b0c 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/AntiEntropy.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/AntiEntropy.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import static com.baidu.bifromq.basecrdt.util.Formatter.toStringifiable; -import static com.baidu.bifromq.basecrdt.util.ProtoUtil.to; +import static org.apache.bifromq.basecrdt.util.Formatter.toStringifiable; +import static org.apache.bifromq.basecrdt.util.ProtoUtil.to; -import com.baidu.bifromq.basecrdt.ReplicaLogger; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDTInflater; -import com.baidu.bifromq.basecrdt.store.proto.AckMessage; -import com.baidu.bifromq.basecrdt.store.proto.DeltaMessage; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basecrdt.ReplicaLogger; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDTInflater; +import org.apache.bifromq.basecrdt.store.proto.AckMessage; +import org.apache.bifromq.basecrdt.store.proto.DeltaMessage; +import org.apache.bifromq.basehlc.HLC; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Counter; import io.reactivex.rxjava3.disposables.CompositeDisposable; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/AntiEntropyManager.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/AntiEntropyManager.java similarity index 93% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/AntiEntropyManager.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/AntiEntropyManager.java index 711fbb4ad..090acbeda 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/AntiEntropyManager.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/AntiEntropyManager.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import static com.baidu.bifromq.basecrdt.util.Formatter.toStringifiable; -import static com.baidu.bifromq.basecrdt.util.ProtoUtil.to; +import static org.apache.bifromq.basecrdt.util.Formatter.toStringifiable; +import static org.apache.bifromq.basecrdt.util.ProtoUtil.to; -import com.baidu.bifromq.basecrdt.ReplicaLogger; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDTInflater; -import com.baidu.bifromq.basecrdt.store.proto.AckMessage; -import com.baidu.bifromq.basecrdt.store.proto.DeltaMessage; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basecrdt.ReplicaLogger; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDTInflater; +import org.apache.bifromq.basecrdt.store.proto.AckMessage; +import org.apache.bifromq.basecrdt.store.proto.DeltaMessage; +import org.apache.bifromq.basehlc.HLC; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.BaseEncoding; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CRDTStore.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CRDTStore.java similarity index 88% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CRDTStore.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CRDTStore.java index 4b914bbb8..a8f942af1 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CRDTStore.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CRDTStore.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; - -import static com.baidu.bifromq.basecrdt.store.MessagePayloadUtil.compressToPayload; -import static com.baidu.bifromq.basecrdt.store.MessagePayloadUtil.decompress; -import static com.baidu.bifromq.basecrdt.util.Formatter.toStringifiable; - -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.core.exception.CRDTNotFoundException; -import com.baidu.bifromq.basecrdt.core.internal.CausalCRDTInflaterFactory; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.compressor.Compressor; -import com.baidu.bifromq.basecrdt.store.proto.AckMessage; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; -import com.baidu.bifromq.basecrdt.store.proto.DeltaMessage; -import com.baidu.bifromq.basecrdt.store.proto.MessagePayload; -import com.baidu.bifromq.basecrdt.util.Formatter; -import com.baidu.bifromq.logger.FormatableLogger; -import com.baidu.bifromq.logger.LogFormatter; +package org.apache.bifromq.basecrdt.store; + +import static org.apache.bifromq.basecrdt.store.MessagePayloadUtil.compressToPayload; +import static org.apache.bifromq.basecrdt.store.MessagePayloadUtil.decompress; +import static org.apache.bifromq.basecrdt.util.Formatter.toStringifiable; + +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.core.exception.CRDTNotFoundException; +import org.apache.bifromq.basecrdt.core.internal.CausalCRDTInflaterFactory; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.compressor.Compressor; +import org.apache.bifromq.basecrdt.store.proto.AckMessage; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.basecrdt.store.proto.DeltaMessage; +import org.apache.bifromq.basecrdt.store.proto.MessagePayload; +import org.apache.bifromq.basecrdt.util.Formatter; +import org.apache.bifromq.logger.FormatableLogger; +import org.apache.bifromq.logger.LogFormatter; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CRDTStoreOptions.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CRDTStoreOptions.java similarity index 95% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CRDTStoreOptions.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CRDTStoreOptions.java index e867f72cc..441fab42b 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CRDTStoreOptions.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CRDTStoreOptions.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import java.time.Duration; import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CompressAlgorithm.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CompressAlgorithm.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CompressAlgorithm.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CompressAlgorithm.java index 931f6b21b..ecaa491a4 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/CompressAlgorithm.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/CompressAlgorithm.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; public enum CompressAlgorithm { NONE, diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/ICRDTStore.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/ICRDTStore.java similarity index 91% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/ICRDTStore.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/ICRDTStore.java index a8b4881a4..fb31bb849 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/ICRDTStore.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/ICRDTStore.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.util.Set; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/MessagePayloadUtil.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/MessagePayloadUtil.java similarity index 81% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/MessagePayloadUtil.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/MessagePayloadUtil.java index 489390044..211e036a7 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/MessagePayloadUtil.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/MessagePayloadUtil.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import com.baidu.bifromq.basecrdt.store.compressor.Compressor; -import com.baidu.bifromq.basecrdt.store.proto.AckMessage; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; -import com.baidu.bifromq.basecrdt.store.proto.DeltaMessage; -import com.baidu.bifromq.basecrdt.store.proto.MessagePayload; +import org.apache.bifromq.basecrdt.store.compressor.Compressor; +import org.apache.bifromq.basecrdt.store.proto.AckMessage; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.basecrdt.store.proto.DeltaMessage; +import org.apache.bifromq.basecrdt.store.proto.MessagePayload; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/NeighborMessage.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/NeighborMessage.java similarity index 87% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/NeighborMessage.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/NeighborMessage.java index 321416a60..8b198cb92 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/NeighborMessage.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/NeighborMessage.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import com.baidu.bifromq.basecrdt.store.proto.DeltaMessage; +import org.apache.bifromq.basecrdt.store.proto.DeltaMessage; import com.google.protobuf.ByteString; public record NeighborMessage(DeltaMessage deltaMsg, ByteString neighborAddress) { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/PartialMesh.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/PartialMesh.java similarity index 98% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/PartialMesh.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/PartialMesh.java index 8931a2cc5..d4fb71cb2 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/PartialMesh.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/PartialMesh.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; import com.google.protobuf.ByteString; import java.util.ArrayList; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/ReplicaIdGenerator.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/ReplicaIdGenerator.java similarity index 89% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/ReplicaIdGenerator.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/ReplicaIdGenerator.java index d9f976fcd..19fbbb475 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/ReplicaIdGenerator.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/ReplicaIdGenerator.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.checkURI; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.checkURI; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/Compressor.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/Compressor.java similarity index 90% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/Compressor.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/Compressor.java index 1274e14e3..86a5ac3ba 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/Compressor.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/Compressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store.compressor; +package org.apache.bifromq.basecrdt.store.compressor; -import com.baidu.bifromq.basecrdt.store.CompressAlgorithm; +import org.apache.bifromq.basecrdt.store.CompressAlgorithm; import com.google.protobuf.ByteString; public interface Compressor { diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/GzipCompressor.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/GzipCompressor.java similarity index 96% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/GzipCompressor.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/GzipCompressor.java index ef299d3a1..c7d48ad14 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/GzipCompressor.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/GzipCompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store.compressor; +package org.apache.bifromq.basecrdt.store.compressor; import com.google.protobuf.ByteString; import java.io.IOException; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/NoopCompressor.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/NoopCompressor.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/NoopCompressor.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/NoopCompressor.java index e7d3bae91..3466c2e1c 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/store/compressor/NoopCompressor.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/store/compressor/NoopCompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store.compressor; +package org.apache.bifromq.basecrdt.store.compressor; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/util/Formatter.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/util/Formatter.java similarity index 84% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/util/Formatter.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/util/Formatter.java index 2392200b4..93f20dfa8 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/util/Formatter.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/util/Formatter.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.util; +package org.apache.bifromq.basecrdt.util; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.proto.AckMessage; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; -import com.baidu.bifromq.basecrdt.store.proto.DeltaMessage; -import com.baidu.bifromq.logger.FormatableLogger; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.proto.AckMessage; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.basecrdt.store.proto.DeltaMessage; +import org.apache.bifromq.logger.FormatableLogger; import com.google.common.io.BaseEncoding; import com.google.protobuf.ByteString; import com.google.protobuf.util.JsonFormat; diff --git a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/util/ProtoUtil.java b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/util/ProtoUtil.java similarity index 94% rename from base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/util/ProtoUtil.java rename to base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/util/ProtoUtil.java index d3b575cac..fc7722a26 100644 --- a/base-crdt/base-crdt-store/src/main/java/com/baidu/bifromq/basecrdt/util/ProtoUtil.java +++ b/base-crdt/base-crdt-store/src/main/java/org/apache/bifromq/basecrdt/util/ProtoUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.util; +package org.apache.bifromq.basecrdt.util; -import com.baidu.bifromq.basecrdt.store.proto.EventIndex; +import org.apache.bifromq.basecrdt.store.proto.EventIndex; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import java.util.ArrayList; diff --git a/base-crdt/base-crdt-store/src/main/proto/basecrdt/CRDTStoreMessage.proto b/base-crdt/base-crdt-store/src/main/proto/basecrdt/CRDTStoreMessage.proto index 0f888d427..7c4d72814 100644 --- a/base-crdt/base-crdt-store/src/main/proto/basecrdt/CRDTStoreMessage.proto +++ b/base-crdt/base-crdt-store/src/main/proto/basecrdt/CRDTStoreMessage.proto @@ -4,7 +4,7 @@ import "basecrdt/Dot.proto"; package basecrdt; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecrdt.store.proto"; +option java_package = "org.apache.bifromq.basecrdt.store.proto"; option optimize_for = SPEED; message EventIndex{ diff --git a/base-crdt/base-crdt-store/src/main/proto/basecrdt/Dot.proto b/base-crdt/base-crdt-store/src/main/proto/basecrdt/Dot.proto index cde413066..f84d2c7bd 100644 --- a/base-crdt/base-crdt-store/src/main/proto/basecrdt/Dot.proto +++ b/base-crdt/base-crdt-store/src/main/proto/basecrdt/Dot.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecrdt; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecrdt.proto"; +option java_package = "org.apache.bifromq.basecrdt.proto"; option optimize_for = SPEED; message SingleDot{ diff --git a/base-crdt/base-crdt-store/src/main/proto/basecrdt/Replica.proto b/base-crdt/base-crdt-store/src/main/proto/basecrdt/Replica.proto index deb88ef83..46bf51033 100644 --- a/base-crdt/base-crdt-store/src/main/proto/basecrdt/Replica.proto +++ b/base-crdt/base-crdt-store/src/main/proto/basecrdt/Replica.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basecrdt; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basecrdt.proto"; +option java_package = "org.apache.bifromq.basecrdt.proto"; option optimize_for = SPEED; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/LoggerTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/LoggerTest.java similarity index 82% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/LoggerTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/LoggerTest.java index a5889163b..2c66573bc 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/LoggerTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/LoggerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt; +package org.apache.bifromq.basecrdt; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.logger.FormatableLogger; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.logger.FormatableLogger; import com.google.protobuf.ByteString; import org.slf4j.Logger; import org.testng.annotations.Test; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java similarity index 82% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java index 5d2c83a4f..c8c15ecbb 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CCounterBenchmark.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.benchmark; +package org.apache.bifromq.basecrdt.core.benchmark; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.cctr; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.cctr; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ReplicaIdGenerator; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ReplicaIdGenerator; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.openjdk.jmh.annotations.Benchmark; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java similarity index 84% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java index 284bd11d8..7f0dd86e7 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CCounterMapBenchmark.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.benchmark; +package org.apache.bifromq.basecrdt.core.benchmark; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ormap; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ormap; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.ReplicaIdGenerator; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.ReplicaIdGenerator; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.concurrent.ThreadLocalRandom; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java similarity index 94% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java index a3374a78c..a26a93c49 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/benchmark/CRDTBenchmarkTemplate.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.benchmark; +package org.apache.bifromq.basecrdt.core.benchmark; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basecrdt.core.internal.CausalCRDTInflaterFactory; +import org.apache.bifromq.basecrdt.core.internal.CausalCRDTInflaterFactory; import com.google.protobuf.ByteString; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/AWORSetTest.java similarity index 92% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/AWORSetTest.java index 180b6d8cb..1b07c26db 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/AWORSetTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/AWORSetTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.aworset; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.aworset; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.core.api.IAWORSet; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.core.api.IAWORSet; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/CCounterTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/CCounterTest.java similarity index 93% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/CCounterTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/CCounterTest.java index fded9c368..a88228750 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/CCounterTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/CCounterTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.cctr; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.cctr; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import java.time.Duration; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/CRDTTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/CRDTTest.java similarity index 93% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/CRDTTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/CRDTTest.java index 49683ac1c..25e6453d8 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/CRDTTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/CRDTTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.common.util.concurrent.MoreExecutors; import java.time.Duration; import java.util.Optional; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DWFlagTest.java similarity index 90% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DWFlagTest.java index b5d672fa9..8940672be 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DWFlagTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DWFlagTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.dwflag; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.dwflag; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.core.api.DWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IDWFlag; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.DWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IDWFlag; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotFuncTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotFuncTest.java similarity index 91% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotFuncTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotFuncTest.java index fe9d0b503..f0a60ac8e 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotFuncTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotFuncTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.dot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleValue; -import static com.baidu.bifromq.basecrdt.core.internal.TestUtil.assertUnorderedSame; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.dot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleValue; +import static org.apache.bifromq.basecrdt.core.internal.TestUtil.assertUnorderedSame; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotMapTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotMapTest.java similarity index 95% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotMapTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotMapTest.java index d12c55d30..13faca6fd 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotMapTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotMapTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.dot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleDot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleMap; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleValue; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.dot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleDot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleMap; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleValue; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotSetTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotSetTest.java similarity index 90% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotSetTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotSetTest.java index 114a063df..174c26064 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/DotSetTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/DotSetTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.dot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleDot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.dot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleDot; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/EWFlagTest.java similarity index 89% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/EWFlagTest.java index 76928781d..0e282c9eb 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/EWFlagTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/EWFlagTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ewflag; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ewflag; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.core.api.EWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IEWFlag; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.EWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IEWFlag; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import java.time.Duration; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java similarity index 96% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java index 43e36b552..75f173434 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/EventHistoryUtilTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.EventHistoryUtil.diff; -import static com.baidu.bifromq.basecrdt.core.internal.EventHistoryUtil.forget; -import static com.baidu.bifromq.basecrdt.core.util.LatticeIndexUtil.remember; +import static org.apache.bifromq.basecrdt.core.internal.EventHistoryUtil.diff; +import static org.apache.bifromq.basecrdt.core.internal.EventHistoryUtil.forget; +import static org.apache.bifromq.basecrdt.core.util.LatticeIndexUtil.remember; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java similarity index 97% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java index 3e3a4c3c9..5ed4a9181 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/InMemReplicaStateLatticeTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.internal.EventHistoryUtil.isRemembering; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.dot; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.replacement; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.replacements; -import static com.baidu.bifromq.basecrdt.core.internal.ProtoUtils.singleDot; +import static org.apache.bifromq.basecrdt.core.internal.EventHistoryUtil.isRemembering; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.dot; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.replacement; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.replacements; +import static org.apache.bifromq.basecrdt.core.internal.ProtoUtils.singleDot; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Sets.newHashSet; import static com.google.protobuf.ByteString.copyFromUtf8; @@ -27,9 +27,9 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.proto.Replacement; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.proto.StateLattice; +import org.apache.bifromq.basecrdt.proto.Replacement; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.proto.StateLattice; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/MVRegTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/MVRegTest.java similarity index 92% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/MVRegTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/MVRegTest.java index aaf2dd858..d103253a7 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/MVRegTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/MVRegTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; import static java.util.Collections.emptyIterator; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/ORMapTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/ORMapTest.java similarity index 92% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/ORMapTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/ORMapTest.java index 142df71c4..b43c66b7f 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/ORMapTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/ORMapTest.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.ormap; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.mvreg; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.ormap; import static java.util.Collections.emptySet; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.DWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.EWFlagOperation; -import com.baidu.bifromq.basecrdt.core.api.IAWORSet; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.core.api.IDWFlag; -import com.baidu.bifromq.basecrdt.core.api.IEWFlag; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.IRWORSet; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.core.api.RWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.DWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.EWFlagOperation; +import org.apache.bifromq.basecrdt.core.api.IAWORSet; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.core.api.IDWFlag; +import org.apache.bifromq.basecrdt.core.api.IEWFlag; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.IRWORSet; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.core.api.RWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/RWORSetTest.java similarity index 91% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/RWORSetTest.java index 55e87eeac..259bd8989 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/RWORSetTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/RWORSetTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; -import static com.baidu.bifromq.basecrdt.core.api.CRDTURI.toURI; -import static com.baidu.bifromq.basecrdt.core.api.CausalCRDTType.rworset; +import static org.apache.bifromq.basecrdt.core.api.CRDTURI.toURI; +import static org.apache.bifromq.basecrdt.core.api.CausalCRDTType.rworset; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.core.api.IRWORSet; -import com.baidu.bifromq.basecrdt.core.api.RWORSetOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.core.api.IRWORSet; +import org.apache.bifromq.basecrdt.core.api.RWORSetOperation; +import org.apache.bifromq.basecrdt.proto.Replica; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/TestUtil.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/TestUtil.java similarity index 97% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/TestUtil.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/TestUtil.java index 0aee06a16..6e4e0e423 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/TestUtil.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/TestUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import static org.testng.Assert.assertEquals; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/VarLongTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/VarLongTest.java similarity index 97% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/VarLongTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/VarLongTest.java index 9ed898670..7d7499d8c 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/internal/VarLongTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/internal/VarLongTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.internal; +package org.apache.bifromq.basecrdt.core.internal; import static org.testng.AssertJUnit.assertEquals; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java similarity index 98% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java index 0f9e6bdf7..e8464c863 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/core/util/LatticeIndexUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.core.util; +package org.apache.bifromq.basecrdt.core.util; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertEquals; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTest.java similarity index 96% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTest.java index eedf30a22..fa4a6a2db 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTest.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.basecrdt.core.api.AWORSetOperation; -import com.baidu.bifromq.basecrdt.core.api.CCounterOperation; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IAWORSet; -import com.baidu.bifromq.basecrdt.core.api.ICCounter; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.annotation.StoreCfg; -import com.baidu.bifromq.basecrdt.store.annotation.StoreCfgs; +import org.apache.bifromq.basecrdt.core.api.AWORSetOperation; +import org.apache.bifromq.basecrdt.core.api.CCounterOperation; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IAWORSet; +import org.apache.bifromq.basecrdt.core.api.ICCounter; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.annotation.StoreCfg; +import org.apache.bifromq.basecrdt.store.annotation.StoreCfgs; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTestCluster.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTestCluster.java similarity index 95% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTestCluster.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTestCluster.java index 50be75549..99df0de0c 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTestCluster.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTestCluster.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import static com.baidu.bifromq.basecrdt.store.ReplicaIdGenerator.generate; +import static org.apache.bifromq.basecrdt.store.ReplicaIdGenerator.generate; -import com.baidu.bifromq.basecrdt.core.api.ICRDTOperation; -import com.baidu.bifromq.basecrdt.core.api.ICausalCRDT; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.store.proto.CRDTStoreMessage; +import org.apache.bifromq.basecrdt.core.api.ICRDTOperation; +import org.apache.bifromq.basecrdt.core.api.ICausalCRDT; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.store.proto.CRDTStoreMessage; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTestTemplate.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTestTemplate.java similarity index 93% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTestTemplate.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTestTemplate.java index 914ab2cce..b5ed94fbd 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/CRDTStoreTestTemplate.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/CRDTStoreTestTemplate.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; -import com.baidu.bifromq.basecrdt.store.annotation.StoreCfg; -import com.baidu.bifromq.basecrdt.store.annotation.StoreCfgs; +import org.apache.bifromq.basecrdt.store.annotation.StoreCfg; +import org.apache.bifromq.basecrdt.store.annotation.StoreCfgs; import java.lang.reflect.Method; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/PartialMeshTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/PartialMeshTest.java similarity index 99% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/PartialMeshTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/PartialMeshTest.java index 83bc2dfa0..f7c3f55e3 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/PartialMeshTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/PartialMeshTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store; +package org.apache.bifromq.basecrdt.store; import static com.google.protobuf.ByteString.copyFromUtf8; import static com.google.protobuf.ByteString.unsignedLexicographicalComparator; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/annotation/StoreCfg.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/annotation/StoreCfg.java similarity index 95% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/annotation/StoreCfg.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/annotation/StoreCfg.java index 45dafa52e..40bfc847b 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/annotation/StoreCfg.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/annotation/StoreCfg.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store.annotation; +package org.apache.bifromq.basecrdt.store.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/annotation/StoreCfgs.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/annotation/StoreCfgs.java similarity index 94% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/annotation/StoreCfgs.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/annotation/StoreCfgs.java index d8e9211e4..f8d1eb44d 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/annotation/StoreCfgs.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/annotation/StoreCfgs.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store.annotation; +package org.apache.bifromq.basecrdt.store.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/compressor/CompressorTest.java b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/compressor/CompressorTest.java similarity index 96% rename from base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/compressor/CompressorTest.java rename to base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/compressor/CompressorTest.java index c0721099c..22de9e1a7 100644 --- a/base-crdt/base-crdt-store/src/test/java/com/baidu/bifromq/basecrdt/store/compressor/CompressorTest.java +++ b/base-crdt/base-crdt-store/src/test/java/org/apache/bifromq/basecrdt/store/compressor/CompressorTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basecrdt.store.compressor; +package org.apache.bifromq.basecrdt.store.compressor; import com.google.protobuf.ByteString; import org.testng.Assert; diff --git a/base-env/base-env-provider-spi/src/main/java/com/baidu/bifromq/baseenv/IEnvProvider.java b/base-env/base-env-provider-spi/src/main/java/org/apache/bifromq/baseenv/IEnvProvider.java similarity index 98% rename from base-env/base-env-provider-spi/src/main/java/com/baidu/bifromq/baseenv/IEnvProvider.java rename to base-env/base-env-provider-spi/src/main/java/org/apache/bifromq/baseenv/IEnvProvider.java index 7f8e4ebc3..c08c6876d 100644 --- a/base-env/base-env-provider-spi/src/main/java/com/baidu/bifromq/baseenv/IEnvProvider.java +++ b/base-env/base-env-provider-spi/src/main/java/org/apache/bifromq/baseenv/IEnvProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; import java.util.concurrent.ThreadFactory; diff --git a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/EnvProvider.java b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/EnvProvider.java similarity index 97% rename from base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/EnvProvider.java rename to base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/EnvProvider.java index 89b340152..dd22d50c3 100644 --- a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/EnvProvider.java +++ b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/EnvProvider.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; -import com.baidu.bifromq.basehookloader.BaseHookLoader; +import org.apache.bifromq.basehookloader.BaseHookLoader; import java.util.Map; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/MemUsage.java b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/MemUsage.java similarity index 99% rename from base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/MemUsage.java rename to base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/MemUsage.java index 084f3e80d..4f9a5c5a1 100644 --- a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/MemUsage.java +++ b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/MemUsage.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; import static java.util.concurrent.Executors.newSingleThreadExecutor; diff --git a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/NettyEnv.java b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/NettyEnv.java similarity index 99% rename from base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/NettyEnv.java rename to base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/NettyEnv.java index adcc4bb59..5f2004546 100644 --- a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/NettyEnv.java +++ b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/NettyEnv.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; import io.netty.channel.EventLoopGroup; import io.netty.channel.epoll.Epoll; diff --git a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/ZeroCopyParser.java b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/ZeroCopyParser.java similarity index 97% rename from base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/ZeroCopyParser.java rename to base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/ZeroCopyParser.java index 99125c721..5bde280b7 100644 --- a/base-env/base-env-provider/src/main/java/com/baidu/bifromq/baseenv/ZeroCopyParser.java +++ b/base-env/base-env-provider/src/main/java/org/apache/bifromq/baseenv/ZeroCopyParser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; import com.google.protobuf.ByteString; import com.google.protobuf.CodedInputStream; diff --git a/base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/EnvProviderTest.java b/base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/EnvProviderTest.java similarity index 98% rename from base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/EnvProviderTest.java rename to base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/EnvProviderTest.java index f6bc48b06..960d7ac2e 100644 --- a/base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/EnvProviderTest.java +++ b/base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/EnvProviderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/TestEnvProvider.java b/base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/TestEnvProvider.java similarity index 96% rename from base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/TestEnvProvider.java rename to base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/TestEnvProvider.java index 8f871937b..9068f1a19 100644 --- a/base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/TestEnvProvider.java +++ b/base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/TestEnvProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv; +package org.apache.bifromq.baseenv; import java.util.concurrent.ThreadFactory; diff --git a/base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/benchmark/MemUsageBenchmark.java b/base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/benchmark/MemUsageBenchmark.java similarity index 95% rename from base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/benchmark/MemUsageBenchmark.java rename to base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/benchmark/MemUsageBenchmark.java index 8ecaeb436..123849b25 100644 --- a/base-env/base-env-provider/src/test/java/com/baidu/bifromq/baseenv/benchmark/MemUsageBenchmark.java +++ b/base-env/base-env-provider/src/test/java/org/apache/bifromq/baseenv/benchmark/MemUsageBenchmark.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baseenv.benchmark; +package org.apache.bifromq.baseenv.benchmark; -import com.baidu.bifromq.baseenv.MemUsage; +import org.apache.bifromq.baseenv.MemUsage; import java.util.concurrent.TimeUnit; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/base-env/base-env-provider/src/test/resources/META-INF/services/com.baidu.bifromq.baseenv.IEnvProvider b/base-env/base-env-provider/src/test/resources/META-INF/services/com.baidu.bifromq.baseenv.IEnvProvider deleted file mode 100644 index 1882cc262..000000000 --- a/base-env/base-env-provider/src/test/resources/META-INF/services/com.baidu.bifromq.baseenv.IEnvProvider +++ /dev/null @@ -1 +0,0 @@ -com.baidu.bifromq.baseenv.TestEnvProvider \ No newline at end of file diff --git a/base-env/base-env-provider/src/test/resources/META-INF/services/org.apache.bifromq.baseenv.IEnvProvider b/base-env/base-env-provider/src/test/resources/META-INF/services/org.apache.bifromq.baseenv.IEnvProvider new file mode 100644 index 000000000..f75ce3320 --- /dev/null +++ b/base-env/base-env-provider/src/test/resources/META-INF/services/org.apache.bifromq.baseenv.IEnvProvider @@ -0,0 +1,14 @@ +# +# Copyright (c) 2025. The BifroMQ Authors. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and limitations under the License. +# + +org.apache.bifromq.baseenv.TestEnvProvider \ No newline at end of file diff --git a/base-hlc/src/main/java/com/baidu/bifromq/basehlc/HLC.java b/base-hlc/src/main/java/org/apache/bifromq/basehlc/HLC.java similarity index 98% rename from base-hlc/src/main/java/com/baidu/bifromq/basehlc/HLC.java rename to base-hlc/src/main/java/org/apache/bifromq/basehlc/HLC.java index 87b49ab7b..bb93a73b6 100644 --- a/base-hlc/src/main/java/com/baidu/bifromq/basehlc/HLC.java +++ b/base-hlc/src/main/java/org/apache/bifromq/basehlc/HLC.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehlc; +package org.apache.bifromq.basehlc; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; diff --git a/base-hlc/src/test/java/com/baidu/bifromq/basehlc/HLCTest.java b/base-hlc/src/test/java/org/apache/bifromq/basehlc/HLCTest.java similarity index 97% rename from base-hlc/src/test/java/com/baidu/bifromq/basehlc/HLCTest.java rename to base-hlc/src/test/java/org/apache/bifromq/basehlc/HLCTest.java index 55a06a967..44ad0dc19 100644 --- a/base-hlc/src/test/java/com/baidu/bifromq/basehlc/HLCTest.java +++ b/base-hlc/src/test/java/org/apache/bifromq/basehlc/HLCTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehlc; +package org.apache.bifromq.basehlc; import static org.testng.Assert.assertTrue; diff --git a/base-hlc/src/test/java/com/baidu/bifromq/basehlc/benchmark/HLCBenchmark.java b/base-hlc/src/test/java/org/apache/bifromq/basehlc/benchmark/HLCBenchmark.java similarity index 95% rename from base-hlc/src/test/java/com/baidu/bifromq/basehlc/benchmark/HLCBenchmark.java rename to base-hlc/src/test/java/org/apache/bifromq/basehlc/benchmark/HLCBenchmark.java index 443f00583..59fdd17ff 100644 --- a/base-hlc/src/test/java/com/baidu/bifromq/basehlc/benchmark/HLCBenchmark.java +++ b/base-hlc/src/test/java/org/apache/bifromq/basehlc/benchmark/HLCBenchmark.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehlc.benchmark; +package org.apache.bifromq.basehlc.benchmark; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basehlc.HLC; import java.util.concurrent.ThreadLocalRandom; import lombok.SneakyThrows; import org.openjdk.jmh.annotations.Benchmark; diff --git a/base-hookloader/src/main/java/com/baidu/bifromq/basehookloader/BaseHookLoader.java b/base-hookloader/src/main/java/org/apache/bifromq/basehookloader/BaseHookLoader.java similarity index 98% rename from base-hookloader/src/main/java/com/baidu/bifromq/basehookloader/BaseHookLoader.java rename to base-hookloader/src/main/java/org/apache/bifromq/basehookloader/BaseHookLoader.java index fe1527949..7af5b07b0 100644 --- a/base-hookloader/src/main/java/com/baidu/bifromq/basehookloader/BaseHookLoader.java +++ b/base-hookloader/src/main/java/org/apache/bifromq/basehookloader/BaseHookLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehookloader; +package org.apache.bifromq.basehookloader; import java.util.HashMap; import java.util.Iterator; diff --git a/base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/BaseHookLoaderTest.java b/base-hookloader/src/test/java/org/apache/bifromq/basehookloader/BaseHookLoaderTest.java similarity index 95% rename from base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/BaseHookLoaderTest.java rename to base-hookloader/src/test/java/org/apache/bifromq/basehookloader/BaseHookLoaderTest.java index e857cdb77..6e9ef8043 100644 --- a/base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/BaseHookLoaderTest.java +++ b/base-hookloader/src/test/java/org/apache/bifromq/basehookloader/BaseHookLoaderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehookloader; +package org.apache.bifromq.basehookloader; import static org.testng.Assert.assertEquals; diff --git a/base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/ITestHookAPI.java b/base-hookloader/src/test/java/org/apache/bifromq/basehookloader/ITestHookAPI.java similarity index 93% rename from base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/ITestHookAPI.java rename to base-hookloader/src/test/java/org/apache/bifromq/basehookloader/ITestHookAPI.java index c43370210..a8e38f633 100644 --- a/base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/ITestHookAPI.java +++ b/base-hookloader/src/test/java/org/apache/bifromq/basehookloader/ITestHookAPI.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehookloader; +package org.apache.bifromq.basehookloader; public interface ITestHookAPI { } diff --git a/base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/TestHookImpl.java b/base-hookloader/src/test/java/org/apache/bifromq/basehookloader/TestHookImpl.java similarity index 94% rename from base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/TestHookImpl.java rename to base-hookloader/src/test/java/org/apache/bifromq/basehookloader/TestHookImpl.java index c38eda517..6fd86da26 100644 --- a/base-hookloader/src/test/java/com/baidu/bifromq/basehookloader/TestHookImpl.java +++ b/base-hookloader/src/test/java/org/apache/bifromq/basehookloader/TestHookImpl.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basehookloader; +package org.apache.bifromq.basehookloader; public class TestHookImpl implements ITestHookAPI { } diff --git a/base-hookloader/src/test/resources/META-INF/services/com.baidu.bifromq.basehookloader.ITestHookAPI b/base-hookloader/src/test/resources/META-INF/services/org.apache.bifromq.basehookloader.ITestHookAPI similarity index 92% rename from base-hookloader/src/test/resources/META-INF/services/com.baidu.bifromq.basehookloader.ITestHookAPI rename to base-hookloader/src/test/resources/META-INF/services/org.apache.bifromq.basehookloader.ITestHookAPI index 7cc240fb7..dfb6255ce 100644 --- a/base-hookloader/src/test/resources/META-INF/services/com.baidu.bifromq.basehookloader.ITestHookAPI +++ b/base-hookloader/src/test/resources/META-INF/services/org.apache.bifromq.basehookloader.ITestHookAPI @@ -11,4 +11,4 @@ # See the License for the specific language governing permissions and limitations under the License. # -com.baidu.bifromq.basehookloader.TestHookImpl \ No newline at end of file +org.apache.bifromq.basehookloader.TestHookImpl \ No newline at end of file diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/AbstractKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/AbstractKVEngine.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/AbstractKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/AbstractKVEngine.java index 4b8d463d8..4f059edb3 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/AbstractKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/AbstractKVEngine.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import static com.google.common.collect.Lists.newArrayList; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Iterables; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/AbstractKVSpaceReader.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/AbstractKVSpaceReader.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/AbstractKVSpaceReader.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/AbstractKVSpaceReader.java index da3ebf43f..975086db6 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/AbstractKVSpaceReader.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/AbstractKVSpaceReader.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Optional; import org.slf4j.Logger; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java index 6e4d0afa4..64508f8dc 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ICPableKVEngineConfigurator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; public interface ICPableKVEngineConfigurator extends IKVEngineConfigurator { } diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ICPableKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ICPableKVSpace.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ICPableKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ICPableKVSpace.java index 6147c6f65..25ed72854 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ICPableKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ICPableKVSpace.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.util.Optional; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVEngine.java similarity index 97% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVEngine.java index 2525e3a88..5eb7ff42b 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVEngine.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.util.Map; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVEngineConfigurator.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVEngineConfigurator.java index 02cdbf9ae..9d65846a4 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVEngineConfigurator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; public interface IKVEngineConfigurator { } diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpace.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpace.java index cfb36e58d..e6cc37717 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpace.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceCheckpoint.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceCheckpoint.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceCheckpoint.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceCheckpoint.java index 69c3bc209..0711708e2 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceCheckpoint.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceCheckpoint.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; public interface IKVSpaceCheckpoint extends IKVSpaceReader { String cpId(); diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java index be77a3c4a..4707133be 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceDataUpdatable.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; /** diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceIterator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceIterator.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceIterator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceIterator.java index 64c70f6de..82a3c317e 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceIterator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceIterator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadata.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadata.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadata.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadata.java index d98108f95..96cbc0595 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadata.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadata.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java index 3bd47aa25..6a065a77c 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadataUpdatable.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java index 1d7d668f1..88c07b0a9 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceMetadataWriter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; /** * The writer for saving space metadata. diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceReader.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceReader.java similarity index 90% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceReader.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceReader.java index 5d9f8a6e1..02201053f 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceReader.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceReader.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceWriteable.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceWriteable.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceWriteable.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceWriteable.java index 0b8a7fd70..06b1438c3 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceWriteable.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceWriteable.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; /** * Interface with writeable operations. diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceWriter.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceWriter.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceWriter.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceWriter.java index 366cefee7..76217d6e0 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IKVSpaceWriter.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IKVSpaceWriter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; /** * A writer for update range state, only when done method is called the changes are persisted and visible. diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ISyncContext.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ISyncContext.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ISyncContext.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ISyncContext.java index 892a99267..ea77dbd88 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/ISyncContext.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/ISyncContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.util.function.Supplier; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java index b0463182b..9222537dc 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IWALableKVEngineConfigurator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; public interface IWALableKVEngineConfigurator extends IKVEngineConfigurator { } diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IWALableKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IWALableKVSpace.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IWALableKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IWALableKVSpace.java index cf589987c..06608d76a 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/IWALableKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/IWALableKVSpace.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVEngineException.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVEngineException.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVEngineException.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVEngineException.java index acfe031c5..a43eafd95 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVEngineException.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVEngineException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; public class KVEngineException extends RuntimeException { diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVEngineFactory.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVEngineFactory.java similarity index 78% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVEngineFactory.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVEngineFactory.java index de8328984..0f632381c 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVEngineFactory.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVEngineFactory.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; -import com.baidu.bifromq.basekv.localengine.memory.InMemCPableKVEngine; -import com.baidu.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.memory.InMemWALableKVEngine; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngine; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngine; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.memory.InMemCPableKVEngine; +import org.apache.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.memory.InMemWALableKVEngine; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngine; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngine; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; public class KVEngineFactory { public static IKVEngine createCPable(String overrideIdentity, diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVSpaceDescriptor.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVSpaceDescriptor.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVSpaceDescriptor.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVSpaceDescriptor.java index 6d0c29a74..13f3ddcf4 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/KVSpaceDescriptor.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/KVSpaceDescriptor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.util.Map; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/SyncContext.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/SyncContext.java similarity index 98% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/SyncContext.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/SyncContext.java index 93c2367ce..3eb07605b 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/SyncContext.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/SyncContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.locks.Lock; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java similarity index 91% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java index a4a3fdfe8..f1ea732cf 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemCPableKVEngine.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import org.slf4j.Logger; public class InMemCPableKVEngine extends InMemKVEngine { diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java similarity index 86% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java index f9ba84fea..21ae3fc81 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemCPableKVSpace.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getGauge; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getGauge; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceCheckpoint; -import com.baidu.bifromq.basekv.localengine.metrics.GeneralKVSpaceMetric; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceCheckpoint; +import org.apache.bifromq.basekv.localengine.metrics.GeneralKVSpaceMetric; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import io.micrometer.core.instrument.Gauge; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngine.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngine.java index c3fbed161..5ca40f0ae 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngine.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.AbstractKVEngine; +import org.apache.bifromq.basekv.localengine.AbstractKVEngine; import java.util.UUID; abstract class InMemKVEngine, T extends InMemKVSpace> diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java similarity index 86% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java index 2b7776e2b..dbb5f4ce9 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngineConfigurator.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.ICPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.IWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.ICPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.IWALableKVEngineConfigurator; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpace.java similarity index 89% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpace.java index dcf00302c..3703e9e0b 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpace.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; import static com.google.protobuf.ByteString.unsignedLexicographicalComparator; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVSpaceDescriptor; -import com.baidu.bifromq.basekv.localengine.SyncContext; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVSpaceDescriptor; +import org.apache.bifromq.basekv.localengine.SyncContext; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java similarity index 90% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java index b392212b5..7320e7198 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceCheckpoint.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.IKVSpaceCheckpoint; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.IKVSpaceCheckpoint; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import com.google.protobuf.ByteString; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java index 80102b473..e425c6570 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceIterator.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Map; import java.util.concurrent.ConcurrentNavigableMap; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java similarity index 89% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java index 56cdcc84b..9dd009d64 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceReader.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.AbstractKVSpaceReader; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.AbstractKVSpaceReader; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Map; import java.util.Optional; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java index 99f543bd0..e765d50ce 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceWriter.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; - -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadataWriter; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.proto.Boundary; +package org.apache.bifromq.basekv.localengine.memory; + +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadataWriter; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java similarity index 97% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java index ac0858b63..fed50c9a9 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemKVSpaceWriterHelper.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.HashMap; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java index 7cf94d89c..547078bd7 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemWALableKVEngine.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import org.slf4j.Logger; public class InMemWALableKVEngine extends InMemKVEngine { diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java similarity index 88% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java index 82af6560a..154336ad1 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/memory/InMemWALableKVSpace.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.IWALableKVSpace; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.IWALableKVSpace; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import java.util.concurrent.CompletableFuture; import org.slf4j.Logger; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java index ac39868c3..1a135ea30 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/GeneralKVSpaceMetric.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.metrics; +package org.apache.bifromq.basekv.localengine.metrics; import io.micrometer.core.instrument.Meter; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java index bce509724..cf81f8642 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/IKVSpaceMetric.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.metrics; +package org.apache.bifromq.basekv.localengine.metrics; import io.micrometer.core.instrument.Meter; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceMeters.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceMeters.java similarity index 99% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceMeters.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceMeters.java index 450e259d6..8040292b2 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceMeters.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceMeters.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.metrics; +package org.apache.bifromq.basekv.localengine.metrics; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java index 9738ca48f..95444bf1b 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceOpMeters.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.metrics; +package org.apache.bifromq.basekv.localengine.metrics; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getSummary; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getTimer; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getSummary; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getTimer; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Tags; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/AutoCleaner.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/AutoCleaner.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/AutoCleaner.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/AutoCleaner.java index abbe24c9d..4852b2c2d 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/AutoCleaner.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/AutoCleaner.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import java.lang.ref.Cleaner; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java similarity index 85% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java index 2134c9d32..89440a3d1 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/IRocksDBKVSpaceCheckpoint.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.IKVSpaceCheckpoint; +import org.apache.bifromq.basekv.localengine.IKVSpaceCheckpoint; interface IRocksDBKVSpaceCheckpoint extends IKVSpaceCheckpoint { void close(); diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java index b7442da63..0ea744916 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/IWriteStatsRecorder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; interface IWriteStatsRecorder { IRecorder newRecorder(); diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/Keys.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/Keys.java similarity index 97% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/Keys.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/Keys.java index cc3694110..c34711c2a 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/Keys.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/Keys.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java index a1a6bc314..a0ea1e1ff 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/NoopWriteStatsRecorder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java similarity index 94% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java index bcf56cc1f..18b2d1ce8 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngine.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tags; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java similarity index 91% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java index 9d311e0b0..8e8dee57c 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineConfigurator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.ICPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.ICPableKVEngineConfigurator; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java index f80e21958..3d50b0798 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVSpace.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getGauge; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.LATEST_CP_KEY; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getGauge; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.LATEST_CP_KEY; import static java.nio.charset.StandardCharsets.UTF_8; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceCheckpoint; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.GeneralKVSpaceMetric; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceCheckpoint; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.GeneralKVSpaceMetric; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import io.micrometer.core.instrument.Gauge; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java index 6d8565773..3fecaa9f0 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngine.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.AbstractKVEngine; -import com.baidu.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.AbstractKVEngine; +import org.apache.bifromq.basekv.localengine.KVEngineException; import com.google.common.base.Strings; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java similarity index 97% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java index eb93f537a..0e81af502 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineConfigurator.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.rocksdb.AutoCleaner.autoRelease; +import static org.apache.bifromq.basekv.localengine.rocksdb.AutoCleaner.autoRelease; import static java.lang.Math.max; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.localengine.IKVEngineConfigurator; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.localengine.IKVEngineConfigurator; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java similarity index 96% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java index bac39003b..a1694924b 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVEngineIterator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.KVEngineException; import java.lang.ref.Cleaner; import org.rocksdb.ColumnFamilyHandle; import org.rocksdb.ReadOptions; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java index ff98fc464..5616daa21 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpace.java @@ -11,29 +11,29 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.IKVEngine.DEFAULT_NS; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getCounter; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getGauge; -import static com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters.getTimer; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.META_SECTION_END; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.META_SECTION_START; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.fromMetaKey; +import static org.apache.bifromq.basekv.localengine.IKVEngine.DEFAULT_NS; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getCounter; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getGauge; +import static org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters.getTimer; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.META_SECTION_END; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.META_SECTION_START; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.fromMetaKey; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; import static io.reactivex.rxjava3.subjects.BehaviorSubject.createDefault; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonList; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.KVSpaceDescriptor; -import com.baidu.bifromq.basekv.localengine.SyncContext; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.KVSpaceDescriptor; +import org.apache.bifromq.basekv.localengine.SyncContext; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Counter; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java similarity index 91% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java index d23ababc6..399b192e6 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCheckpoint.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.IKVEngine.DEFAULT_NS; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; -import static com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBKVSpace.deleteDir; +import static org.apache.bifromq.basekv.localengine.IKVEngine.DEFAULT_NS; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; +import static org.apache.bifromq.basekv.localengine.rocksdb.RocksDBKVSpace.deleteDir; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import com.google.protobuf.ByteString; import java.io.File; import java.io.IOException; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java similarity index 95% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java index 56426de8d..a6eea1607 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTrigger.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters; -import com.baidu.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters; +import org.apache.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Tags; import java.util.concurrent.atomic.AtomicInteger; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java similarity index 82% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java index 880079675..c3a317f07 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceIterator.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; - -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_END; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_START; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.fromDataKey; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKeyBytes; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKeyBytes; +package org.apache.bifromq.basekv.localengine.rocksdb; + +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_END; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_START; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.fromDataKey; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKeyBytes; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKeyBytes; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.lang.ref.Cleaner; import org.rocksdb.ColumnFamilyHandle; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java similarity index 79% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java index 82f9786d9..b82196997 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceReader.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_END; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_START; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compare; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isValid; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_END; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_START; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compare; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isValid; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; import static java.util.Collections.singletonList; import static org.rocksdb.SizeApproximationFlag.INCLUDE_FILES; import static org.rocksdb.SizeApproximationFlag.INCLUDE_MEMTABLES; -import com.baidu.bifromq.basekv.localengine.AbstractKVSpaceReader; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.AbstractKVSpaceReader; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Optional; import org.rocksdb.ColumnFamilyHandle; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java similarity index 86% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java index 6fd07f2de..df5a63279 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceSnapshot.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isValid; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isValid; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.localengine.AbstractKVSpaceReader; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.AbstractKVSpaceReader; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.lang.ref.Cleaner; import java.util.Optional; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java index 07e67b642..50c5bd592 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriter.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadataWriter; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadataWriter; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Map; import java.util.Optional; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java similarity index 87% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java index e43095ac7..48420e905 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceWriterHelper.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; - -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_END; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_START; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; -import static com.baidu.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKeyBytes; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKeyBytes; - -import com.baidu.bifromq.basekv.localengine.ISyncContext; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.proto.Boundary; +package org.apache.bifromq.basekv.localengine.rocksdb; + +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_END; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.DATA_SECTION_START; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toDataKey; +import static org.apache.bifromq.basekv.localengine.rocksdb.Keys.toMetaKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKeyBytes; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKeyBytes; + +import org.apache.bifromq.basekv.localengine.ISyncContext; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.HashMap; import java.util.HashSet; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java index 9c6cf2eb5..1b9b98792 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngine.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import org.slf4j.Logger; public class RocksDBWALableKVEngine diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java similarity index 91% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java index 3338536bf..4d73efae1 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineConfigurator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.IWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.IWALableKVEngineConfigurator; import lombok.Builder; import lombok.Getter; import lombok.Setter; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java similarity index 92% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java index 06470fa77..6edddec99 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVSpace.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.localengine.IWALableKVSpace; -import com.baidu.bifromq.basekv.localengine.KVEngineException; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; -import com.baidu.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.localengine.IWALableKVSpace; +import org.apache.bifromq.basekv.localengine.KVEngineException; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.rocksdb.metrics.RocksDBKVSpaceMetric; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.Timer; diff --git a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java similarity index 93% rename from base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java rename to base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java index ed7c88251..b243a80d4 100644 --- a/base-kv/base-kv-local-engine/src/main/java/com/baidu/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java +++ b/base-kv/base-kv-local-engine/src/main/java/org/apache/bifromq/basekv/localengine/rocksdb/metrics/RocksDBKVSpaceMetric.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb.metrics; +package org.apache.bifromq.basekv.localengine.rocksdb.metrics; -import com.baidu.bifromq.basekv.localengine.metrics.IKVSpaceMetric; +import org.apache.bifromq.basekv.localengine.metrics.IKVSpaceMetric; import io.micrometer.core.instrument.Meter; /** diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/AbstractKVEngineTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/AbstractKVEngineTest.java similarity index 99% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/AbstractKVEngineTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/AbstractKVEngineTest.java index e4b65da1c..180b1b27e 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/AbstractKVEngineTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/AbstractKVEngineTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.disposables.Disposable; import java.lang.reflect.Method; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/MockableTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/MockableTest.java similarity index 97% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/MockableTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/MockableTest.java index 9b175ab4c..65cd2a92e 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/MockableTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/MockableTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import java.lang.reflect.Method; import lombok.SneakyThrows; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/SyncContextTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/SyncContextTest.java similarity index 97% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/SyncContextTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/SyncContextTest.java index 751a40dd3..be6a79b00 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/SyncContextTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/SyncContextTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/TestUtil.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/TestUtil.java similarity index 98% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/TestUtil.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/TestUtil.java index 06fb0a0e5..594807c3c 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/TestUtil.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/TestUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine; +package org.apache.bifromq.basekv.localengine; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/BenchmarkState.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/BenchmarkState.java similarity index 88% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/BenchmarkState.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/BenchmarkState.java index 6d06d5f55..f2aaa4297 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/BenchmarkState.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/BenchmarkState.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.KVEngineFactory; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.KVEngineFactory; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java similarity index 89% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java index 269b77fbb..96ee6377d 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/BenchmarkTemplate.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.KVEngineFactory; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.KVEngineFactory; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; import java.io.File; import java.io.IOException; import java.nio.file.Files; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java similarity index 89% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java index 2fab37b8c..0b82a1edf 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndGet_Benchmark.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import static com.baidu.bifromq.basekv.localengine.TestUtil.toByteString; +import static org.apache.bifromq.basekv.localengine.TestUtil.toByteString; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java similarity index 90% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java index 46dc8413c..380cdd397 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeyDeleteAndSeek_Benchmark.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import static com.baidu.bifromq.basekv.localengine.TestUtil.toByteString; +import static org.apache.bifromq.basekv.localengine.TestUtil.toByteString; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java similarity index 94% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java index 0257ccbed..b6447141f 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeek.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import static com.baidu.bifromq.basekv.localengine.TestUtil.toByteString; +import static org.apache.bifromq.basekv.localengine.TestUtil.toByteString; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java similarity index 83% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java index 8d2edc561..ac5b66200 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/ContinuousKeySingleDeleteAndSeekState.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import static com.baidu.bifromq.basekv.localengine.TestUtil.toByteString; +import static org.apache.bifromq.basekv.localengine.TestUtil.toByteString; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; import com.google.protobuf.ByteString; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/HybridWorkload.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/HybridWorkload.java similarity index 97% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/HybridWorkload.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/HybridWorkload.java index dee75c76a..2e5aad45e 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/HybridWorkload.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/HybridWorkload.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; import lombok.SneakyThrows; import org.openjdk.jmh.annotations.Benchmark; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java similarity index 91% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java index 58f48d0b3..bc254fc61 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/HybridWorkloadState.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; import com.google.protobuf.ByteString; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java similarity index 94% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java index 455311b83..05dc68a70 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGet.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import static com.baidu.bifromq.basekv.localengine.TestUtil.toByteStringNativeOrder; +import static org.apache.bifromq.basekv.localengine.TestUtil.toByteStringNativeOrder; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java similarity index 86% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java index a83003d08..f5aa2d615 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/benchmark/SingleKeyUpdateAndGetState.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.benchmark; +package org.apache.bifromq.basekv.localengine.benchmark; -import static com.baidu.bifromq.basekv.localengine.TestUtil.toByteStringNativeOrder; +import static org.apache.bifromq.basekv.localengine.TestUtil.toByteStringNativeOrder; -import com.baidu.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVSpace; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; import org.openjdk.jmh.annotations.Scope; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngineTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngineTest.java similarity index 78% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngineTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngineTest.java index c3de702f9..7141a73e2 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/memory/InMemKVEngineTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/memory/InMemKVEngineTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.memory; +package org.apache.bifromq.basekv.localengine.memory; -import com.baidu.bifromq.basekv.localengine.AbstractKVEngineTest; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.AbstractKVEngineTest; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; public class InMemKVEngineTest extends AbstractKVEngineTest { @Override diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java similarity index 95% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java index 2776ea284..1d357fa93 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/metrics/KVSpaceMetersTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.metrics; +package org.apache.bifromq.basekv.localengine.metrics; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.basekv.localengine.MockableTest; +import org.apache.bifromq.basekv.localengine.MockableTest; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java similarity index 90% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java index 6799eadc0..b09eafb3d 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/AbstractRawRocksDBTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.MockableTest; -import com.baidu.bifromq.basekv.localengine.TestUtil; +import org.apache.bifromq.basekv.localengine.MockableTest; +import org.apache.bifromq.basekv.localengine.TestUtil; import java.lang.reflect.Method; import java.nio.file.Files; import java.nio.file.Path; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java similarity index 93% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java index d70eea845..c5f510891 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/AbstractRocksDBKVEngineTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import static com.baidu.bifromq.basekv.localengine.rocksdb.AutoCleaner.autoRelease; +import static org.apache.bifromq.basekv.localengine.rocksdb.AutoCleaner.autoRelease; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.localengine.AbstractKVEngineTest; -import com.baidu.bifromq.basekv.localengine.IKVSpace; -import com.baidu.bifromq.basekv.localengine.TestUtil; +import org.apache.bifromq.basekv.localengine.AbstractKVEngineTest; +import org.apache.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.TestUtil; import com.google.protobuf.ByteString; import java.nio.file.Files; import java.nio.file.Path; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java similarity index 95% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java index b90500c79..930aec813 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/KVSpaceCheckpointTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -19,8 +19,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basekv.localengine.TestUtil; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.TestUtil; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import io.micrometer.core.instrument.Tags; import java.io.File; import java.lang.reflect.Method; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java similarity index 92% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java index cd9e46e47..8ff2f43a2 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/KVSpaceSnapshotTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceOpMeters; import io.micrometer.core.instrument.Tags; import org.mockito.Mockito; import org.rocksdb.Snapshot; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java similarity index 91% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java index 85b547380..195606e6c 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/OverrideIdentityTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.localengine.ICPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.KVEngineFactory; -import com.baidu.bifromq.basekv.localengine.MockableTest; +import org.apache.bifromq.basekv.localengine.ICPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.KVEngineFactory; +import org.apache.bifromq.basekv.localengine.MockableTest; import java.io.File; import java.lang.reflect.Method; import java.nio.file.Files; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java similarity index 90% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java index 6c541a43f..aace119cc 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBCPableKVEngineTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.IKVSpace; import io.reactivex.rxjava3.disposables.Disposable; import java.io.File; import java.nio.file.Paths; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java similarity index 96% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java index 2a258d58e..637a0cc9b 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBKVSpaceCompactionTriggerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.baidu.bifromq.basekv.localengine.MockableTest; +import org.apache.bifromq.basekv.localengine.MockableTest; import java.util.stream.IntStream; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java similarity index 88% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java index f33311705..1d6c06a59 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/RocksDBWALableKVEngineTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb; +package org.apache.bifromq.basekv.localengine.rocksdb; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.IKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.IKVSpace; import java.nio.file.Paths; import lombok.SneakyThrows; diff --git a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java similarity index 94% rename from base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java rename to base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java index 9e8f158a6..e8ef91587 100644 --- a/base-kv/base-kv-local-engine/src/test/java/com/baidu/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java +++ b/base-kv/base-kv-local-engine/src/test/java/org/apache/bifromq/basekv/localengine/rocksdb/metrics/KVSpaceMetersTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.localengine.rocksdb.metrics; +package org.apache.bifromq.basekv.localengine.rocksdb.metrics; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.basekv.localengine.MockableTest; -import com.baidu.bifromq.basekv.localengine.metrics.KVSpaceMeters; +import org.apache.bifromq.basekv.localengine.MockableTest; +import org.apache.bifromq.basekv.localengine.metrics.KVSpaceMeters; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; diff --git a/base-kv/base-kv-local-engine/src/test/resources/logback.xml b/base-kv/base-kv-local-engine/src/test/resources/logback.xml index 83cbdac1a..ec7578be2 100644 --- a/base-kv/base-kv-local-engine/src/test/resources/logback.xml +++ b/base-kv/base-kv-local-engine/src/test/resources/logback.xml @@ -18,7 +18,7 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + diff --git a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java similarity index 93% rename from base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java rename to base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java index d9a842f64..ede1710af 100644 --- a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java +++ b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/BaseKVClusterMetadataManager.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; -import static com.baidu.bifromq.basekv.metaservice.NameUtil.toLandscapeURI; -import static com.baidu.bifromq.basekv.metaservice.NameUtil.toLoadRulesProposalURI; -import static com.baidu.bifromq.basekv.metaservice.NameUtil.toLoadRulesURI; -import static com.baidu.bifromq.basekv.proto.ProposalResult.ACCEPTED; -import static com.baidu.bifromq.basekv.proto.ProposalResult.REJECTED; +import static org.apache.bifromq.basekv.metaservice.NameUtil.toLandscapeURI; +import static org.apache.bifromq.basekv.metaservice.NameUtil.toLoadRulesProposalURI; +import static org.apache.bifromq.basekv.metaservice.NameUtil.toLoadRulesURI; +import static org.apache.bifromq.basekv.proto.ProposalResult.ACCEPTED; +import static org.apache.bifromq.basekv.proto.ProposalResult.REJECTED; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.DescriptorKey; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.LoadRules; -import com.baidu.bifromq.basekv.proto.LoadRulesProposition; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.DescriptorKey; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.LoadRules; +import org.apache.bifromq.basekv.proto.LoadRulesProposition; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/BaseKVMetaService.java b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/BaseKVMetaService.java similarity index 95% rename from base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/BaseKVMetaService.java rename to base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/BaseKVMetaService.java index 7404cd5bc..f1ff7992e 100644 --- a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/BaseKVMetaService.java +++ b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/BaseKVMetaService.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; -import com.baidu.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basecrdt.service.ICRDTService; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Schedulers; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java similarity index 95% rename from base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java rename to base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java index a517117d4..dc9a34844 100644 --- a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java +++ b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/IBaseKVClusterMetadataManager.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; import com.google.protobuf.Struct; import io.reactivex.rxjava3.core.Observable; import java.util.Map; diff --git a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/IBaseKVMetaService.java b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/IBaseKVMetaService.java similarity index 93% rename from base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/IBaseKVMetaService.java rename to base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/IBaseKVMetaService.java index 735993a78..35e91bf8a 100644 --- a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/IBaseKVMetaService.java +++ b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/IBaseKVMetaService.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; -import com.baidu.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basecrdt.service.ICRDTService; import io.reactivex.rxjava3.core.Observable; import java.util.Set; diff --git a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/LoadRulesProposalHandler.java b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/LoadRulesProposalHandler.java similarity index 95% rename from base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/LoadRulesProposalHandler.java rename to base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/LoadRulesProposalHandler.java index c6a9235bf..2ce90186d 100644 --- a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/LoadRulesProposalHandler.java +++ b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/LoadRulesProposalHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; import com.google.protobuf.Struct; diff --git a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/NameUtil.java b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/NameUtil.java similarity index 91% rename from base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/NameUtil.java rename to base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/NameUtil.java index 1371a1d9a..2d926b66f 100644 --- a/base-kv/base-kv-meta-service/src/main/java/com/baidu/bifromq/basekv/metaservice/NameUtil.java +++ b/base-kv/base-kv-meta-service/src/main/java/org/apache/bifromq/basekv/metaservice/NameUtil.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; class NameUtil { private static final String PREFIX_LOAD_RULES = "loadRules-"; diff --git a/base-kv/base-kv-meta-service/src/main/proto/DescriptorKey.proto b/base-kv/base-kv-meta-service/src/main/proto/DescriptorKey.proto index 7c3c558f1..f4c842c88 100644 --- a/base-kv/base-kv-meta-service/src/main/proto/DescriptorKey.proto +++ b/base-kv/base-kv-meta-service/src/main/proto/DescriptorKey.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message DescriptorKey{ diff --git a/base-kv/base-kv-meta-service/src/main/proto/LoadRules.proto b/base-kv/base-kv-meta-service/src/main/proto/LoadRules.proto index 4c5e78034..105bcdf25 100644 --- a/base-kv/base-kv-meta-service/src/main/proto/LoadRules.proto +++ b/base-kv/base-kv-meta-service/src/main/proto/LoadRules.proto @@ -5,7 +5,7 @@ import "google/protobuf/struct.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message LoadRules{ diff --git a/base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java b/base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java similarity index 91% rename from base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java rename to base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java index 638e59256..4915276b2 100644 --- a/base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java +++ b/base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/BaseKVClusterMetadataManagerTest.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; -import static com.baidu.bifromq.basekv.metaservice.LoadRulesProposalHandler.Result.ACCEPTED; -import static com.baidu.bifromq.basekv.metaservice.LoadRulesProposalHandler.Result.NO_BALANCER; -import static com.baidu.bifromq.basekv.metaservice.LoadRulesProposalHandler.Result.REJECTED; +import static org.apache.bifromq.basekv.metaservice.LoadRulesProposalHandler.Result.ACCEPTED; +import static org.apache.bifromq.basekv.metaservice.LoadRulesProposalHandler.Result.NO_BALANCER; +import static org.apache.bifromq.basekv.metaservice.LoadRulesProposalHandler.Result.REJECTED; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; import com.google.protobuf.Struct; import com.google.protobuf.Value; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java b/base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java similarity index 92% rename from base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java rename to base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java index 581879c08..24f90cda7 100644 --- a/base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java +++ b/base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/BaseKVMetaServiceTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; import io.reactivex.rxjava3.observers.TestObserver; import java.net.InetSocketAddress; import java.util.Set; diff --git a/base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/LandscapeCleanupTest.java b/base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/LandscapeCleanupTest.java similarity index 89% rename from base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/LandscapeCleanupTest.java rename to base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/LandscapeCleanupTest.java index 56065a122..0dc692b8a 100644 --- a/base-kv/base-kv-meta-service/src/test/java/com/baidu/bifromq/basekv/metaservice/LandscapeCleanupTest.java +++ b/base-kv/base-kv-meta-service/src/test/java/org/apache/bifromq/basekv/metaservice/LandscapeCleanupTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.metaservice; +package org.apache.bifromq.basekv.metaservice; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; import java.net.InetSocketAddress; import java.util.Map; import java.util.Set; diff --git a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/ClusterConfig.proto b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/ClusterConfig.proto index 0d3afe84d..920c964f4 100644 --- a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/ClusterConfig.proto +++ b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/ClusterConfig.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basekv.raft; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.raft.proto"; +option java_package = "org.apache.bifromq.basekv.raft.proto"; option optimize_for = SPEED; // ClusterConfig has following invariants depending on whether nextVoters is diff --git a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Enums.proto b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Enums.proto index d5ef23b83..d4959dced 100644 --- a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Enums.proto +++ b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Enums.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package basekv.raft; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.raft.proto"; +option java_package = "org.apache.bifromq.basekv.raft.proto"; option optimize_for = SPEED; enum RaftNodeStatus { diff --git a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/LogEntry.proto b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/LogEntry.proto index b7397d11f..dbbf928e8 100644 --- a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/LogEntry.proto +++ b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/LogEntry.proto @@ -4,7 +4,7 @@ import "basekv/raft/ClusterConfig.proto"; package basekv.raft; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.raft.proto"; +option java_package = "org.apache.bifromq.basekv.raft.proto"; option optimize_for = SPEED; message LogEntry { diff --git a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/RaftMessage.proto b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/RaftMessage.proto index bbf73db59..dadce7418 100644 --- a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/RaftMessage.proto +++ b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/RaftMessage.proto @@ -6,7 +6,7 @@ import "basekv/raft/Snapshot.proto"; package basekv.raft; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.raft.proto"; +option java_package = "org.apache.bifromq.basekv.raft.proto"; option optimize_for = SPEED; message AppendEntries { diff --git a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Snapshot.proto b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Snapshot.proto index 29aaad6be..030336e6b 100644 --- a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Snapshot.proto +++ b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Snapshot.proto @@ -3,7 +3,7 @@ import "basekv/raft/ClusterConfig.proto"; package basekv.raft; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.raft.proto"; +option java_package = "org.apache.bifromq.basekv.raft.proto"; option optimize_for = SPEED; message Snapshot { diff --git a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Voting.proto b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Voting.proto index c1043317d..8c409ef0f 100644 --- a/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Voting.proto +++ b/base-kv/base-kv-raft-type/src/main/proto/basekv/raft/Voting.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package basekv.raft; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.raft.proto"; +option java_package = "org.apache.bifromq.basekv.raft.proto"; option optimize_for = SPEED; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/BasicStateStoreTest.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/BasicStateStoreTest.java similarity index 98% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/BasicStateStoreTest.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/BasicStateStoreTest.java index 0fb6513f0..8e6852c91 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/BasicStateStoreTest.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/BasicStateStoreTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; @@ -21,10 +21,10 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.Iterator; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IPeerLogReplicator.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IPeerLogReplicator.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IPeerLogReplicator.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IPeerLogReplicator.java index d2aaea6f6..25ae8060d 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IPeerLogReplicator.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IPeerLogReplicator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; interface IPeerLogReplicator { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftNode.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftNode.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftNode.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftNode.java index cb275919a..3dba2b030 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftNode.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftNode.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.event.RaftEvent; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.event.RaftEvent; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Iterator; import java.util.List; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftNodeState.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftNodeState.java similarity index 84% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftNodeState.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftNodeState.java index 64d1ba339..4d55a57a3 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftNodeState.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftNodeState.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; interface IRaftNodeState { String id(); diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftStateStore.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftStateStore.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftStateStore.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftStateStore.java index 07b24351b..8491cfaf7 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/IRaftStateStore.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/IRaftStateStore.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; import java.util.Iterator; import java.util.List; import java.util.Optional; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/InMemoryStateStore.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/InMemoryStateStore.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/InMemoryStateStore.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/InMemoryStateStore.java index 3e9ac49e8..2bf91c774 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/InMemoryStateStore.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/InMemoryStateStore.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.Iterator; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/MetricMonitoredStateStore.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/MetricMonitoredStateStore.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/MetricMonitoredStateStore.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/MetricMonitoredStateStore.java index a3b69cd38..f5f9bdaa9 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/MetricMonitoredStateStore.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/MetricMonitoredStateStore.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.Timer; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicator.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicator.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicator.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicator.java index d63e355c5..9a53d548d 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicator.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import org.slf4j.Logger; final class PeerLogReplicator implements IPeerLogReplicator { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorState.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorState.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorState.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorState.java index 068e066c3..e450b2468 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorState.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorState.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import org.slf4j.Logger; abstract class PeerLogReplicatorState { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java index 2b1687a99..4c99f4d5b 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateProbing.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import org.slf4j.Logger; class PeerLogReplicatorStateProbing extends PeerLogReplicatorState { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java index 7972b1725..0e9cf72d8 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateReplicating.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.util.LinkedList; import java.util.Optional; import org.slf4j.Logger; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java index 3410dd7a4..226fd54e1 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncing.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import org.slf4j.Logger; class PeerLogReplicatorStateSnapshotSyncing extends PeerLogReplicatorState { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogTracker.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogTracker.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogTracker.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogTracker.java index 408b75161..30d0101c5 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/PeerLogTracker.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/PeerLogTracker.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.event.SyncStateChangedEvent; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.event.SyncStateChangedEvent; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/QuorumTracker.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/QuorumTracker.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/QuorumTracker.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/QuorumTracker.java index 97e80beef..0026c3166 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/QuorumTracker.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/QuorumTracker.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import static com.baidu.bifromq.basekv.raft.QuorumTracker.VoteResult.Won; +import static org.apache.bifromq.basekv.raft.QuorumTracker.VoteResult.Won; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftConfig.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftConfig.java similarity index 98% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftConfig.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftConfig.java index 5a39b3f36..21766918c 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftConfig.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftConfigChanger.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftConfigChanger.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftConfigChanger.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftConfigChanger.java index e8e1a7868..85878aeda 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftConfigChanger.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftConfigChanger.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.Abort; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.CatchingUp; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.JointConfigCommitting; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.TargetConfigCommitting; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.Waiting; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.Abort; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.CatchingUp; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.JointConfigCommitting; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.TargetConfigCommitting; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.Waiting; -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.util.Collections; import java.util.HashSet; import java.util.Set; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftLogger.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftLogger.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftLogger.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftLogger.java index 674936866..17c443b98 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftLogger.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftLogger.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.logger.SiftLogger; import org.slf4j.MDC; import org.slf4j.Marker; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNode.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNode.java similarity index 98% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNode.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNode.java index ac153839a..361146b0b 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNode.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNode.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; - -import com.baidu.bifromq.basekv.raft.event.RaftEvent; -import com.baidu.bifromq.basekv.raft.event.RaftEventType; -import com.baidu.bifromq.basekv.raft.exception.InternalError; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.logger.SiftLogger; +package org.apache.bifromq.basekv.raft; + +import org.apache.bifromq.basekv.raft.event.RaftEvent; +import org.apache.bifromq.basekv.raft.event.RaftEventType; +import org.apache.bifromq.basekv.raft.exception.InternalError; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.logger.SiftLogger; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeState.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeState.java similarity index 94% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeState.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeState.java index cffb6d5e6..5ee8369cc 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeState.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeState.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; - -import com.baidu.bifromq.basekv.raft.event.CommitEvent; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.event.SnapshotRestoredEvent; -import com.baidu.bifromq.basekv.raft.event.StatusChangedEvent; -import com.baidu.bifromq.basekv.raft.exception.CompactionException; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.proto.AppendEntriesReply; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVote; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVoteReply; -import com.baidu.bifromq.basekv.raft.proto.RequestVoteReply; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; +package org.apache.bifromq.basekv.raft; + +import org.apache.bifromq.basekv.raft.event.CommitEvent; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.event.SnapshotRestoredEvent; +import org.apache.bifromq.basekv.raft.event.StatusChangedEvent; +import org.apache.bifromq.basekv.raft.exception.CompactionException; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.proto.AppendEntriesReply; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RequestPreVote; +import org.apache.bifromq.basekv.raft.proto.RequestPreVoteReply; +import org.apache.bifromq.basekv.raft.proto.RequestVoteReply; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.HashMap; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateCandidate.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateCandidate.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateCandidate.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateCandidate.java index a28dab326..d220b2d49 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateCandidate.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateCandidate.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.raft.exception.RecoveryException; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVote; -import com.baidu.bifromq.basekv.raft.proto.RequestVote; +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.raft.exception.RecoveryException; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RequestPreVote; +import org.apache.bifromq.basekv.raft.proto.RequestVote; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.HashMap; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateFollower.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateFollower.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateFollower.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateFollower.java index ac65ef60b..51d0fcf16 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateFollower.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateFollower.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; - -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.raft.exception.RecoveryException; -import com.baidu.bifromq.basekv.raft.exception.SnapshotException; -import com.baidu.bifromq.basekv.raft.proto.AppendEntries; -import com.baidu.bifromq.basekv.raft.proto.AppendEntriesReply; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshot; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshotReply; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Propose; -import com.baidu.bifromq.basekv.raft.proto.ProposeReply; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RequestReadIndex; -import com.baidu.bifromq.basekv.raft.proto.RequestReadIndexReply; -import com.baidu.bifromq.basekv.raft.proto.RequestVote; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; +package org.apache.bifromq.basekv.raft; + +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.raft.exception.RecoveryException; +import org.apache.bifromq.basekv.raft.exception.SnapshotException; +import org.apache.bifromq.basekv.raft.proto.AppendEntries; +import org.apache.bifromq.basekv.raft.proto.AppendEntriesReply; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshot; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshotReply; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Propose; +import org.apache.bifromq.basekv.raft.proto.ProposeReply; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RequestReadIndex; +import org.apache.bifromq.basekv.raft.proto.RequestReadIndexReply; +import org.apache.bifromq.basekv.raft.proto.RequestVote; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; import com.google.protobuf.ByteString; import java.util.HashMap; import java.util.HashSet; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateLeader.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateLeader.java similarity index 96% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateLeader.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateLeader.java index b7c90bb7b..40e7ae3a3 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/RaftNodeStateLeader.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/RaftNodeStateLeader.java @@ -11,32 +11,32 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; - -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.JointConfigCommitting; -import static com.baidu.bifromq.basekv.raft.RaftConfigChanger.State.TargetConfigCommitting; - -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.raft.exception.RecoveryException; -import com.baidu.bifromq.basekv.raft.proto.AppendEntries; -import com.baidu.bifromq.basekv.raft.proto.AppendEntriesReply; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshot; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshotReply; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Propose; -import com.baidu.bifromq.basekv.raft.proto.ProposeReply; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.RequestReadIndex; -import com.baidu.bifromq.basekv.raft.proto.RequestReadIndexReply; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.TimeoutNow; +package org.apache.bifromq.basekv.raft; + +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.JointConfigCommitting; +import static org.apache.bifromq.basekv.raft.RaftConfigChanger.State.TargetConfigCommitting; + +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.raft.exception.RecoveryException; +import org.apache.bifromq.basekv.raft.proto.AppendEntries; +import org.apache.bifromq.basekv.raft.proto.AppendEntriesReply; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshot; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshotReply; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Propose; +import org.apache.bifromq.basekv.raft.proto.ProposeReply; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RequestReadIndex; +import org.apache.bifromq.basekv.raft.proto.RequestReadIndexReply; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.TimeoutNow; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.Collections; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/ReadProgressTracker.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/ReadProgressTracker.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/ReadProgressTracker.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/ReadProgressTracker.java index 73c9149db..514549d3f 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/ReadProgressTracker.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/ReadProgressTracker.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/CommitEvent.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/CommitEvent.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/CommitEvent.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/CommitEvent.java index e2cc3a9ff..ca1b72c01 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/CommitEvent.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/CommitEvent.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/ElectionEvent.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/ElectionEvent.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/ElectionEvent.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/ElectionEvent.java index ff558d8eb..de92a88e5 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/ElectionEvent.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/ElectionEvent.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/RaftEvent.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/RaftEvent.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/RaftEvent.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/RaftEvent.java index 6f470bcdb..d8702c613 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/RaftEvent.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/RaftEvent.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/RaftEventType.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/RaftEventType.java similarity index 94% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/RaftEventType.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/RaftEventType.java index 863adff0d..c4c250011 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/RaftEventType.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/RaftEventType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; public enum RaftEventType { COMMIT, diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/SnapshotRestoredEvent.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/SnapshotRestoredEvent.java similarity index 90% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/SnapshotRestoredEvent.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/SnapshotRestoredEvent.java index fc4db7969..2038278a3 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/SnapshotRestoredEvent.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/SnapshotRestoredEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/StatusChangedEvent.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/StatusChangedEvent.java similarity index 90% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/StatusChangedEvent.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/StatusChangedEvent.java index 006388a66..bb0e23073 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/StatusChangedEvent.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/StatusChangedEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/SyncStateChangedEvent.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/SyncStateChangedEvent.java similarity index 91% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/SyncStateChangedEvent.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/SyncStateChangedEvent.java index ed4ce8074..0e5dbbf12 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/event/SyncStateChangedEvent.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/event/SyncStateChangedEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.util.Collections; import java.util.Map; import lombok.EqualsAndHashCode; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/ClusterConfigChangeException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/ClusterConfigChangeException.java similarity index 98% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/ClusterConfigChangeException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/ClusterConfigChangeException.java index c13beeb6b..b83278dcb 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/ClusterConfigChangeException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/ClusterConfigChangeException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class ClusterConfigChangeException extends RuntimeException { protected ClusterConfigChangeException(String message) { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/CompactionException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/CompactionException.java similarity index 95% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/CompactionException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/CompactionException.java index 386ac0563..afb42d0e1 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/CompactionException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/CompactionException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class CompactionException extends RuntimeException { public static StaleSnapshotException staleSnapshot() { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/DropProposalException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/DropProposalException.java similarity index 98% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/DropProposalException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/DropProposalException.java index c0c3d9add..41c330ced 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/DropProposalException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/DropProposalException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public abstract class DropProposalException extends RuntimeException { public final Code code; diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/InternalError.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/InternalError.java similarity index 94% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/InternalError.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/InternalError.java index 878af9239..163fc7d91 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/InternalError.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/InternalError.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class InternalError extends Error { public InternalError(String message) { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/LeaderTransferException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/LeaderTransferException.java similarity index 98% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/LeaderTransferException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/LeaderTransferException.java index 159d25636..d3c1450ef 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/LeaderTransferException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/LeaderTransferException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class LeaderTransferException extends RuntimeException { protected LeaderTransferException(String message) { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/ReadIndexException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/ReadIndexException.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/ReadIndexException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/ReadIndexException.java index f087c5a65..95fc94202 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/ReadIndexException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/ReadIndexException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class ReadIndexException extends RuntimeException { private ReadIndexException(String message) { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/RecoveryException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/RecoveryException.java similarity index 97% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/RecoveryException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/RecoveryException.java index ae298a18b..468084cf4 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/RecoveryException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/RecoveryException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class RecoveryException extends RuntimeException { private RecoveryException(String message) { diff --git a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/SnapshotException.java b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/SnapshotException.java similarity index 94% rename from base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/SnapshotException.java rename to base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/SnapshotException.java index e91f45cef..eafb30115 100644 --- a/base-kv/base-kv-raft/src/main/java/com/baidu/bifromq/basekv/raft/exception/SnapshotException.java +++ b/base-kv/base-kv-raft/src/main/java/org/apache/bifromq/basekv/raft/exception/SnapshotException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.exception; +package org.apache.bifromq.basekv.raft.exception; public class SnapshotException extends RuntimeException { public SnapshotException(String message) { diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/InMemoryStateStoreTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/InMemoryStateStoreTest.java similarity index 90% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/InMemoryStateStoreTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/InMemoryStateStoreTest.java index aa1bb290f..a94a00fb5 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/InMemoryStateStoreTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/InMemoryStateStoreTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Snapshot; public class InMemoryStateStoreTest extends BasicStateStoreTest { @Override diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java similarity index 96% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java index 45b7940cc..e9f686e48 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateProbingTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import java.util.Optional; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java similarity index 97% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java index e15f543be..7cd4326b9 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateReplicatingTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import java.util.Optional; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java similarity index 96% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java index 92c7e8932..851403988 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogReplicatorStateSnapshotSyncingTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.slf4j.Logger; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogTrackerTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogTrackerTest.java similarity index 95% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogTrackerTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogTrackerTest.java index de089929a..d9087bd71 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/PeerLogTrackerTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/PeerLogTrackerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.times; @@ -20,10 +20,10 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.event.SyncStateChangedEvent; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.event.SyncStateChangedEvent; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import java.util.HashMap; import java.util.HashSet; import org.mockito.ArgumentCaptor; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/QuorumTrackerTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/QuorumTrackerTest.java similarity index 98% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/QuorumTrackerTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/QuorumTrackerTest.java index 658444cff..f03ad2ae3 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/QuorumTrackerTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/QuorumTrackerTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.slf4j.Logger; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftConfigChangerTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftConfigChangerTest.java similarity index 98% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftConfigChangerTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftConfigChangerTest.java index 851bfcc63..1ea1650aa 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftConfigChangerTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftConfigChangerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; @@ -20,10 +20,10 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateCandidateTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateCandidateTest.java similarity index 97% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateCandidateTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateCandidateTest.java index 9f9a28dca..c61e9ced9 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateCandidateTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateCandidateTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; @@ -19,17 +19,17 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.proto.AppendEntries; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshot; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVote; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVoteReply; -import com.baidu.bifromq.basekv.raft.proto.RequestVote; -import com.baidu.bifromq.basekv.raft.proto.RequestVoteReply; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.AppendEntries; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshot; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RequestPreVote; +import org.apache.bifromq.basekv.raft.proto.RequestPreVoteReply; +import org.apache.bifromq.basekv.raft.proto.RequestVote; +import org.apache.bifromq.basekv.raft.proto.RequestVoteReply; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import com.google.protobuf.ByteString; import java.util.Arrays; import java.util.Collections; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateFollowerTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateFollowerTest.java similarity index 97% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateFollowerTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateFollowerTest.java index 1c22db1ff..e8f8f5c13 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateFollowerTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateFollowerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; @@ -25,28 +25,28 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.event.RaftEvent; -import com.baidu.bifromq.basekv.raft.event.RaftEventType; -import com.baidu.bifromq.basekv.raft.event.SnapshotRestoredEvent; -import com.baidu.bifromq.basekv.raft.proto.AppendEntries; -import com.baidu.bifromq.basekv.raft.proto.AppendEntriesReply; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshot; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshotReply; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Propose; -import com.baidu.bifromq.basekv.raft.proto.ProposeReply; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVote; -import com.baidu.bifromq.basekv.raft.proto.RequestPreVoteReply; -import com.baidu.bifromq.basekv.raft.proto.RequestReadIndex; -import com.baidu.bifromq.basekv.raft.proto.RequestReadIndexReply; -import com.baidu.bifromq.basekv.raft.proto.RequestVote; -import com.baidu.bifromq.basekv.raft.proto.RequestVoteReply; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.TimeoutNow; -import com.baidu.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.raft.event.RaftEvent; +import org.apache.bifromq.basekv.raft.event.RaftEventType; +import org.apache.bifromq.basekv.raft.event.SnapshotRestoredEvent; +import org.apache.bifromq.basekv.raft.proto.AppendEntries; +import org.apache.bifromq.basekv.raft.proto.AppendEntriesReply; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshot; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshotReply; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Propose; +import org.apache.bifromq.basekv.raft.proto.ProposeReply; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RequestPreVote; +import org.apache.bifromq.basekv.raft.proto.RequestPreVoteReply; +import org.apache.bifromq.basekv.raft.proto.RequestReadIndex; +import org.apache.bifromq.basekv.raft.proto.RequestReadIndexReply; +import org.apache.bifromq.basekv.raft.proto.RequestVote; +import org.apache.bifromq.basekv.raft.proto.RequestVoteReply; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.TimeoutNow; +import org.apache.bifromq.basekv.raft.proto.Voting; import com.google.protobuf.ByteString; import java.util.Arrays; import java.util.Collections; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateLeaderTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateLeaderTest.java similarity index 95% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateLeaderTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateLeaderTest.java index b2bf30888..5a4a8b8e8 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateLeaderTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateLeaderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -19,23 +19,23 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.event.CommitEvent; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.event.RaftEventType; -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.raft.proto.AppendEntries; -import com.baidu.bifromq.basekv.raft.proto.AppendEntriesReply; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshot; -import com.baidu.bifromq.basekv.raft.proto.InstallSnapshotReply; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.RequestVote; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.TimeoutNow; +import org.apache.bifromq.basekv.raft.event.CommitEvent; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.event.RaftEventType; +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.raft.proto.AppendEntries; +import org.apache.bifromq.basekv.raft.proto.AppendEntriesReply; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshot; +import org.apache.bifromq.basekv.raft.proto.InstallSnapshotReply; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.RequestVote; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.TimeoutNow; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.Collections; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateTest.java similarity index 94% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateTest.java index 6eea55b3d..ee17c728d 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeStateTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeStateTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import com.google.protobuf.ByteString; import java.util.Arrays; import java.util.Collections; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeTest.java similarity index 97% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeTest.java index cfc9c2306..2fa536a6e 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/RaftNodeTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/RaftNodeTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/ReadProgressTrackerTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/ReadProgressTrackerTest.java similarity index 96% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/ReadProgressTrackerTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/ReadProgressTrackerTest.java index 10a41174e..dad2bedbc 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/ReadProgressTrackerTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/ReadProgressTrackerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; @@ -19,8 +19,8 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import java.util.concurrent.CompletableFuture; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/ReflectionUtils.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/ReflectionUtils.java similarity index 96% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/ReflectionUtils.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/ReflectionUtils.java index f0326f06e..364c1f3c9 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/ReflectionUtils.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/ReflectionUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft; +package org.apache.bifromq.basekv.raft; import java.lang.reflect.Field; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/event/RaftEventTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/event/RaftEventTest.java similarity index 93% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/event/RaftEventTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/event/RaftEventTest.java index 62c70bdb9..b7549bc2e 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/event/RaftEventTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/event/RaftEventTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.event; +package org.apache.bifromq.basekv.raft.event; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import java.util.Collections; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/AbnormalTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/AbnormalTest.java similarity index 93% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/AbnormalTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/AbnormalTest.java index b487455e7..ba1115d45 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/AbnormalTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/AbnormalTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.time.Duration; import java.util.Arrays; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java similarity index 97% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java index 7e76bf28e..6d4085445 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ChangeClusterConfigTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.awaitility.Awaitility.await; @@ -20,14 +20,14 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.annotation.Ticker; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.annotation.Ticker; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import com.google.protobuf.ByteString; import java.util.Arrays; import java.util.Collections; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/CompactionTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/CompactionTest.java similarity index 91% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/CompactionTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/CompactionTest.java index 175a80c98..030bdfe2f 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/CompactionTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/CompactionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static com.google.protobuf.ByteString.EMPTY; import static com.google.protobuf.ByteString.copyFromUtf8; @@ -19,9 +19,9 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.exception.CompactionException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.exception.CompactionException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/LeaderElectionTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/LeaderElectionTest.java similarity index 96% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/LeaderElectionTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/LeaderElectionTest.java index e0486da84..d725c3a42 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/LeaderElectionTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/LeaderElectionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; @@ -20,15 +20,15 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.annotation.Ticker; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.annotation.Ticker; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.HashSet; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/LogReplicationTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/LogReplicationTest.java similarity index 95% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/LogReplicationTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/LogReplicationTest.java index 0f6a8afa5..7d0471b51 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/LogReplicationTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/LogReplicationTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import com.google.protobuf.ByteString; import java.util.Arrays; import java.util.List; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ProposeTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ProposeTest.java similarity index 96% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ProposeTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ProposeTest.java index 4db072f59..e1e4e3eef 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ProposeTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ProposeTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static com.google.protobuf.ByteString.EMPTY; import static com.google.protobuf.ByteString.copyFromUtf8; @@ -22,12 +22,12 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.exception.CompactionException; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.exception.CompactionException; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.LogEntry; import com.google.protobuf.ByteString; import java.util.List; import java.util.Optional; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java similarity index 91% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java index e61218f05..fbdbc9cfa 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftConfigMigrationTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; -import static com.baidu.bifromq.basekv.raft.functest.RaftNodeGroup.DefaultRaftConfig; +import static org.apache.bifromq.basekv.raft.functest.RaftNodeGroup.DefaultRaftConfig; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.RaftConfig; -import com.baidu.bifromq.basekv.raft.functest.template.RaftGroupTestTemplate; +import org.apache.bifromq.basekv.raft.RaftConfig; +import org.apache.bifromq.basekv.raft.functest.template.RaftGroupTestTemplate; import com.google.protobuf.ByteString; import java.util.HashMap; import java.util.Map; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeGroup.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeGroup.java similarity index 95% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeGroup.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeGroup.java index 70d992cba..12c6980be 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeGroup.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeGroup.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; - -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.IRaftStateStore; -import com.baidu.bifromq.basekv.raft.InMemoryStateStore; -import com.baidu.bifromq.basekv.raft.RaftConfig; -import com.baidu.bifromq.basekv.raft.RaftNode; -import com.baidu.bifromq.basekv.raft.event.CommitEvent; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.event.SnapshotRestoredEvent; -import com.baidu.bifromq.basekv.raft.event.SyncStateChangedEvent; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +package org.apache.bifromq.basekv.raft.functest; + +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.IRaftStateStore; +import org.apache.bifromq.basekv.raft.InMemoryStateStore; +import org.apache.bifromq.basekv.raft.RaftConfig; +import org.apache.bifromq.basekv.raft.RaftNode; +import org.apache.bifromq.basekv.raft.event.CommitEvent; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.event.SnapshotRestoredEvent; +import org.apache.bifromq.basekv.raft.event.SyncStateChangedEvent; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.Arrays; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeNetwork.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeNetwork.java similarity index 98% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeNetwork.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeNetwork.java index 77215683f..ae4e94a03 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeNetwork.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeNetwork.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; import java.util.Comparator; import java.util.HashSet; import java.util.List; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java similarity index 98% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java index be263980b..000c438f3 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RaftNodeNetworkTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -23,9 +23,9 @@ import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.proto.AppendEntries; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.proto.AppendEntries; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ReadIndexTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ReadIndexTest.java similarity index 94% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ReadIndexTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ReadIndexTest.java index de67c2f2b..0dafe245d 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/ReadIndexTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/ReadIndexTest.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.annotation.Ticker; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.annotation.Ticker; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.LogEntry; import com.google.protobuf.ByteString; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RecoveryTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RecoveryTest.java similarity index 97% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RecoveryTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RecoveryTest.java index c631b2912..90841b71a 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/RecoveryTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/RecoveryTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; @@ -19,11 +19,11 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.raft.exception.RecoveryException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.exception.RecoveryException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.HashSet; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/SnapshotRestoreTest.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/SnapshotRestoreTest.java similarity index 90% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/SnapshotRestoreTest.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/SnapshotRestoreTest.java index 3811df2d4..39c91333f 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/SnapshotRestoreTest.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/SnapshotRestoreTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest; +package org.apache.bifromq.basekv.raft.functest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.event.SnapshotRestoredEvent; -import com.baidu.bifromq.basekv.raft.exception.ClusterConfigChangeException; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.event.SnapshotRestoredEvent; +import org.apache.bifromq.basekv.raft.exception.ClusterConfigChangeException; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.template.SharedRaftConfigTestTemplate; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.HashSet; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Cluster.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Cluster.java similarity index 94% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Cluster.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Cluster.java index 61564d3d1..bc6d7eb18 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Cluster.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Cluster.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest.annotation; +package org.apache.bifromq.basekv.raft.functest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Config.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Config.java similarity index 95% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Config.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Config.java index b83f3afa6..d73138a65 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Config.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Config.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest.annotation; +package org.apache.bifromq.basekv.raft.functest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Ticker.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Ticker.java similarity index 94% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Ticker.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Ticker.java index 7e478f1bf..0a33058ec 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/annotation/Ticker.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/annotation/Ticker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest.annotation; +package org.apache.bifromq.basekv.raft.functest.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java similarity index 93% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java index bf0698d4f..28748eec9 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/template/RaftGroupTestTemplate.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest.template; +package org.apache.bifromq.basekv.raft.functest.template; -import com.baidu.bifromq.basekv.raft.functest.annotation.Cluster; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.functest.annotation.Cluster; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import java.lang.reflect.Method; import java.util.Arrays; import java.util.HashSet; diff --git a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java similarity index 89% rename from base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java rename to base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java index b1568d329..af0def8b2 100644 --- a/base-kv/base-kv-raft/src/test/java/com/baidu/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java +++ b/base-kv/base-kv-raft/src/test/java/org/apache/bifromq/basekv/raft/functest/template/SharedRaftConfigTestTemplate.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.raft.functest.template; +package org.apache.bifromq.basekv.raft.functest.template; -import static com.baidu.bifromq.basekv.raft.functest.RaftNodeGroup.RaftNodeTickMagnitude; +import static org.apache.bifromq.basekv.raft.functest.RaftNodeGroup.RaftNodeTickMagnitude; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.raft.RaftConfig; -import com.baidu.bifromq.basekv.raft.functest.RaftNodeGroup; -import com.baidu.bifromq.basekv.raft.functest.annotation.Config; -import com.baidu.bifromq.basekv.raft.functest.annotation.Ticker; +import org.apache.bifromq.basekv.raft.RaftConfig; +import org.apache.bifromq.basekv.raft.functest.RaftNodeGroup; +import org.apache.bifromq.basekv.raft.functest.annotation.Config; +import org.apache.bifromq.basekv.raft.functest.annotation.Ticker; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-raft/src/test/resources/logback.xml b/base-kv/base-kv-raft/src/test/resources/logback.xml index 082a508de..df64db2f5 100644 --- a/base-kv/base-kv-raft/src/test/resources/logback.xml +++ b/base-kv/base-kv-raft/src/test/resources/logback.xml @@ -19,7 +19,7 @@ - + diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/KVStoreBalanceController.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/KVStoreBalanceController.java similarity index 92% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/KVStoreBalanceController.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/KVStoreBalanceController.java index 7b7b85892..1c8bfd5fc 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/KVStoreBalanceController.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/KVStoreBalanceController.java @@ -11,37 +11,37 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import com.baidu.bifromq.basekv.balance.command.BalanceCommand; -import com.baidu.bifromq.basekv.balance.command.BootstrapCommand; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.balance.command.MergeCommand; -import com.baidu.bifromq.basekv.balance.command.RangeCommand; -import com.baidu.bifromq.basekv.balance.command.RecoveryCommand; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.balance.command.TransferLeadershipCommand; -import com.baidu.bifromq.basekv.balance.impl.RangeBootstrapBalancer; -import com.baidu.bifromq.basekv.balance.impl.RedundantRangeRemovalBalancer; -import com.baidu.bifromq.basekv.balance.impl.UnreachableReplicaRemovalBalancer; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.LoadRulesProposalHandler; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.store.proto.BootstrapRequest; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigReply; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitRequest; -import com.baidu.bifromq.basekv.store.proto.RecoverRequest; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipReply; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipRequest; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.balance.command.BalanceCommand; +import org.apache.bifromq.basekv.balance.command.BootstrapCommand; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.balance.command.MergeCommand; +import org.apache.bifromq.basekv.balance.command.RangeCommand; +import org.apache.bifromq.basekv.balance.command.RecoveryCommand; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.balance.command.TransferLeadershipCommand; +import org.apache.bifromq.basekv.balance.impl.RangeBootstrapBalancer; +import org.apache.bifromq.basekv.balance.impl.RedundantRangeRemovalBalancer; +import org.apache.bifromq.basekv.balance.impl.UnreachableReplicaRemovalBalancer; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.LoadRulesProposalHandler; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.store.proto.BootstrapRequest; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigReply; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeReply; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitReply; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitRequest; +import org.apache.bifromq.basekv.store.proto.RecoverRequest; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipReply; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipRequest; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Lists; import com.google.protobuf.Struct; import com.google.protobuf.Value; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java similarity index 90% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java index 1c6b33b99..90c59eb52 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/RangeBootstrapBalancerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import com.baidu.bifromq.basekv.balance.impl.RangeBootstrapBalancer; +import org.apache.bifromq.basekv.balance.impl.RangeBootstrapBalancer; import java.time.Duration; /** diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java similarity index 88% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java index cee249c05..a9e4ccabb 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/RedundantRangeRemovalBalancerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import com.baidu.bifromq.basekv.balance.impl.RedundantRangeRemovalBalancer; +import org.apache.bifromq.basekv.balance.impl.RedundantRangeRemovalBalancer; /** * Builtin balancer for redundant range removal. diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java similarity index 90% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java index d427d8c24..81c7b9130 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/UnreachableReplicaRemovalBalancerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import com.baidu.bifromq.basekv.balance.impl.UnreachableReplicaRemovalBalancer; +import org.apache.bifromq.basekv.balance.impl.UnreachableReplicaRemovalBalancer; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java similarity index 85% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java index c5d259a47..8bc31a7ab 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeBootstrapBalancer.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.NoNeedBalance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.command.BootstrapCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.utils.EffectiveEpoch; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.NoNeedBalance; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.command.BootstrapCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.utils.EffectiveEpoch; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import java.time.Duration; import java.util.Optional; import java.util.Set; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeLeaderBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeLeaderBalancer.java similarity index 87% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeLeaderBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeLeaderBalancer.java index a96eb5185..0baa9e403 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeLeaderBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeLeaderBalancer.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.NoNeedBalance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.command.TransferLeadershipCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.EffectiveEpoch; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; -import com.baidu.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.NoNeedBalance; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.command.TransferLeadershipCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.EffectiveEpoch; +import org.apache.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.utils.LeaderRange; import com.google.common.collect.Sets; import java.util.Comparator; import java.util.HashMap; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeSplitBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeSplitBalancer.java similarity index 91% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeSplitBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeSplitBalancer.java index b12d2140e..9aefe30ca 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RangeSplitBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RangeSplitBalancer.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareStartKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareStartKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; -import com.baidu.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.utils.LeaderRange; import com.google.protobuf.Struct; import com.google.protobuf.Value; import java.util.HashMap; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java similarity index 84% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java index 75b9a70ae..291911422 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancer.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.balance.util.CommandUtil.quit; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.organizeByEpoch; +import static org.apache.bifromq.basekv.balance.util.CommandUtil.quit; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.organizeByEpoch; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.NoNeedBalance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.utils.EffectiveEpoch; -import com.baidu.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.NoNeedBalance; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.utils.EffectiveEpoch; +import org.apache.bifromq.basekv.utils.LeaderRange; import java.util.Collections; import java.util.Map; import java.util.NavigableMap; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/ReplicaCntBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/ReplicaCntBalancer.java similarity index 98% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/ReplicaCntBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/ReplicaCntBalancer.java index 035579133..bcbab78c5 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/ReplicaCntBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/ReplicaCntBalancer.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.union; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; -import com.baidu.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.utils.LeaderRange; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.protobuf.Struct; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java similarity index 89% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java index 8ef9dc242..a1f0111de 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/RuleBasedPlacementBalancer.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.balance.util.CommandUtil.diffBy; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; +import static org.apache.bifromq.basekv.balance.util.CommandUtil.diffBy; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.NoNeedBalance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.command.BalanceCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.EffectiveEpoch; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.NoNeedBalance; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.command.BalanceCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.EffectiveEpoch; +import org.apache.bifromq.basekv.utils.EffectiveRoute; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Sets; import com.google.protobuf.Struct; diff --git a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java similarity index 90% rename from base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java rename to base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java index 7ccf85b29..764bad2e9 100644 --- a/base-kv/base-kv-store-balance-controller/src/main/java/com/baidu/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java +++ b/base-kv/base-kv-store-balance-controller/src/main/java/org/apache/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancer.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; - -import static com.baidu.bifromq.basekv.proto.State.StateType.Normal; - -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.NoNeedBalance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +package org.apache.bifromq.basekv.balance.impl; + +import static org.apache.bifromq.basekv.proto.State.StateType.Normal; + +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.NoNeedBalance; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.collect.Sets; import java.time.Duration; import java.util.HashMap; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/KVStoreBalanceControllerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/KVStoreBalanceControllerTest.java similarity index 94% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/KVStoreBalanceControllerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/KVStoreBalanceControllerTest.java index 172712acb..ffcf5894f 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/KVStoreBalanceControllerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/KVStoreBalanceControllerTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -23,22 +23,22 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.balance.command.BootstrapCommand; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.balance.command.MergeCommand; -import com.baidu.bifromq.basekv.balance.command.RecoveryCommand; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.balance.command.TransferLeadershipCommand; -import com.baidu.bifromq.basekv.balance.utils.DescriptorUtils; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.LoadRulesProposalHandler; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitReply; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.balance.command.BootstrapCommand; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.balance.command.MergeCommand; +import org.apache.bifromq.basekv.balance.command.RecoveryCommand; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.balance.command.TransferLeadershipCommand; +import org.apache.bifromq.basekv.balance.utils.DescriptorUtils; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.LoadRulesProposalHandler; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitReply; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java similarity index 85% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java index aa94b4597..f129f0b78 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeBootstrapBalancerTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.BootstrapCommand; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.BootstrapCommand; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; import java.time.Duration; import java.util.Collections; import java.util.Set; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java similarity index 93% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java index 2266d45b6..864b47bd2 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeLeaderBalancerTest.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.BalanceCommand; -import com.baidu.bifromq.basekv.balance.command.TransferLeadershipCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.BalanceCommand; +import org.apache.bifromq.basekv.balance.command.TransferLeadershipCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Set; import org.testng.annotations.BeforeMethod; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java similarity index 90% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java index 12131ee58..3b9eaa9cf 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RangeSplitBalancerTest.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import java.util.Set; import org.testng.annotations.BeforeMethod; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java similarity index 93% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java index 5d5b00e29..7a82d81e1 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/RedundantRangeRemovalBalancerTest.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertSame; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.HashSet; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java similarity index 95% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java index af4188ab1..2221ee77a 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/ReplicaCntBalancerTest.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.utils.EffectiveRoute; import com.google.protobuf.ByteString; import java.util.HashMap; import java.util.HashSet; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java similarity index 93% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java index a75024e0e..fc678f6cf 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/impl/UnreachableReplicaRemovalBalancerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.impl; +package org.apache.bifromq.basekv.balance.impl; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -19,17 +19,17 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import java.time.Duration; import java.util.Arrays; import java.util.Collections; diff --git a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/utils/DescriptorUtils.java b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/utils/DescriptorUtils.java similarity index 84% rename from base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/utils/DescriptorUtils.java rename to base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/utils/DescriptorUtils.java index 71af35b51..067efd3ec 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/java/com/baidu/bifromq/basekv/balance/utils/DescriptorUtils.java +++ b/base-kv/base-kv-store-balance-controller/src/test/java/org/apache/bifromq/basekv/balance/utils/DescriptorUtils.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.utils; +package org.apache.bifromq.basekv.balance.utils; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State.StateType; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State.StateType; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/base-kv/base-kv-store-balance-controller/src/test/resources/logback.xml b/base-kv/base-kv-store-balance-controller/src/test/resources/logback.xml index 128215703..97d108bab 100644 --- a/base-kv/base-kv-store-balance-controller/src/test/resources/logback.xml +++ b/base-kv/base-kv-store-balance-controller/src/test/resources/logback.xml @@ -20,7 +20,7 @@ - + diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/AwaitBalance.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/AwaitBalance.java similarity index 96% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/AwaitBalance.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/AwaitBalance.java index d8b3b5e5b..0dbbce0e3 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/AwaitBalance.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/AwaitBalance.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; import java.time.Duration; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceNow.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceNow.java similarity index 90% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceNow.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceNow.java index 2eddd78c5..20117c0aa 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceNow.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceNow.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import com.baidu.bifromq.basekv.balance.command.BalanceCommand; +import org.apache.bifromq.basekv.balance.command.BalanceCommand; /** * The balance command need to be run now. diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceResult.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceResult.java similarity index 94% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceResult.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceResult.java index 1b65698dd..e445c4276 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceResult.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; public interface BalanceResult { diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceResultType.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceResultType.java similarity index 94% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceResultType.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceResultType.java index 9576c0dc6..b46639dd4 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/BalanceResultType.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/BalanceResultType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; /** * The type of balance result generated from StoreBalancer. diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/IStoreBalancerFactory.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/IStoreBalancerFactory.java similarity index 94% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/IStoreBalancerFactory.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/IStoreBalancerFactory.java index 07197585a..ac140ad57 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/IStoreBalancerFactory.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/IStoreBalancerFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; /** * The factory SPI to create {@link StoreBalancer}. diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/NoNeedBalance.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/NoNeedBalance.java similarity index 95% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/NoNeedBalance.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/NoNeedBalance.java index 4859cec59..40711c889 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/NoNeedBalance.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/NoNeedBalance.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; /** * No balance command generated. diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/StoreBalancer.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/StoreBalancer.java similarity index 93% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/StoreBalancer.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/StoreBalancer.java index 24aae3898..871698349 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/StoreBalancer.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/StoreBalancer.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance; +package org.apache.bifromq.basekv.balance; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.logger.SiftLogger; import com.google.protobuf.Struct; import java.util.Set; import org.slf4j.Logger; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/BalanceCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/BalanceCommand.java similarity index 89% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/BalanceCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/BalanceCommand.java index 7e98ecb30..ff4bf2028 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/BalanceCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/BalanceCommand.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/BootstrapCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/BootstrapCommand.java similarity index 88% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/BootstrapCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/BootstrapCommand.java index bb0323c82..ff87bbff5 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/BootstrapCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/BootstrapCommand.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/ChangeConfigCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/ChangeConfigCommand.java similarity index 92% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/ChangeConfigCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/ChangeConfigCommand.java index 89710a6a0..cc283c88a 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/ChangeConfigCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/ChangeConfigCommand.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import java.util.Set; import lombok.Getter; import lombok.Setter; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/CommandType.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/CommandType.java similarity index 93% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/CommandType.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/CommandType.java index 070e2e517..7a7ee3524 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/CommandType.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/CommandType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; /** * The balance command type. diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/MergeCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/MergeCommand.java similarity index 88% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/MergeCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/MergeCommand.java index f51cae349..10fa059a8 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/MergeCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/MergeCommand.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/RangeCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/RangeCommand.java similarity index 94% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/RangeCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/RangeCommand.java index 46d806ab9..3bc80be61 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/RangeCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/RangeCommand.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; import lombok.Getter; import lombok.Setter; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/RecoveryCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/RecoveryCommand.java similarity index 95% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/RecoveryCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/RecoveryCommand.java index 3dc835f1d..821f4b041 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/RecoveryCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/RecoveryCommand.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; import lombok.Getter; import lombok.Setter; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/SplitCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/SplitCommand.java similarity index 92% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/SplitCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/SplitCommand.java index 5804dbd7c..a8a4cb40e 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/SplitCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/SplitCommand.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import lombok.Getter; import lombok.Setter; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/TransferLeadershipCommand.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/TransferLeadershipCommand.java similarity index 92% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/TransferLeadershipCommand.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/TransferLeadershipCommand.java index 8772602b2..ef6822670 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/command/TransferLeadershipCommand.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/command/TransferLeadershipCommand.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.command; +package org.apache.bifromq.basekv.balance.command; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import lombok.Getter; import lombok.Setter; import lombok.experimental.SuperBuilder; diff --git a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/util/CommandUtil.java b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/util/CommandUtil.java similarity index 89% rename from base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/util/CommandUtil.java rename to base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/util/CommandUtil.java index bba57561f..f8e45b519 100644 --- a/base-kv/base-kv-store-balance-spi/src/main/java/com/baidu/bifromq/basekv/balance/util/CommandUtil.java +++ b/base-kv/base-kv-store-balance-spi/src/main/java/org/apache/bifromq/basekv/balance/util/CommandUtil.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.util; +package org.apache.bifromq.basekv.balance.util; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.inRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.inRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.command.BalanceCommand; -import com.baidu.bifromq.basekv.balance.command.BootstrapCommand; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.balance.command.MergeCommand; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.command.BalanceCommand; +import org.apache.bifromq.basekv.balance.command.BootstrapCommand; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.balance.command.MergeCommand; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.utils.LeaderRange; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/base-kv/base-kv-store-balance-spi/src/test/java/com/baidu/bifromq/basekv/balance/util/CommandUtilTest.java b/base-kv/base-kv-store-balance-spi/src/test/java/org/apache/bifromq/basekv/balance/util/CommandUtilTest.java similarity index 94% rename from base-kv/base-kv-store-balance-spi/src/test/java/com/baidu/bifromq/basekv/balance/util/CommandUtilTest.java rename to base-kv/base-kv-store-balance-spi/src/test/java/org/apache/bifromq/basekv/balance/util/CommandUtilTest.java index 2e3cec975..d6afd863f 100644 --- a/base-kv/base-kv-store-balance-spi/src/test/java/com/baidu/bifromq/basekv/balance/util/CommandUtilTest.java +++ b/base-kv/base-kv-store-balance-spi/src/test/java/org/apache/bifromq/basekv/balance/util/CommandUtilTest.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.balance.util; +package org.apache.bifromq.basekv.balance.util; -import static com.baidu.bifromq.basekv.balance.util.CommandUtil.diffBy; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.balance.util.CommandUtil.diffBy; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.BalanceCommand; -import com.baidu.bifromq.basekv.balance.command.BootstrapCommand; -import com.baidu.bifromq.basekv.balance.command.ChangeConfigCommand; -import com.baidu.bifromq.basekv.balance.command.MergeCommand; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.BalanceCommand; +import org.apache.bifromq.basekv.balance.command.BootstrapCommand; +import org.apache.bifromq.basekv.balance.command.ChangeConfigCommand; +import org.apache.bifromq.basekv.balance.command.MergeCommand; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.utils.LeaderRange; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.NavigableMap; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/BaseKVStoreClient.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/BaseKVStoreClient.java similarity index 88% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/BaseKVStoreClient.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/BaseKVStoreClient.java index 2c35c4337..a6e13c0c5 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/BaseKVStoreClient.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/BaseKVStoreClient.java @@ -11,58 +11,58 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; - -import static com.baidu.bifromq.basekv.RPCBluePrint.toScopedFullMethodName; -import static com.baidu.bifromq.basekv.RPCServerMetadataUtil.RPC_METADATA_STORE_ID; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getBootstrapMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getChangeReplicaConfigMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getExecuteMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getLinearizedQueryMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getMergeMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getQueryMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getRecoverMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getSplitMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getTransferLeadershipMethod; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; +package org.apache.bifromq.basekv.client; + +import static org.apache.bifromq.basekv.RPCBluePrint.toScopedFullMethodName; +import static org.apache.bifromq.basekv.RPCServerMetadataUtil.RPC_METADATA_STORE_ID; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getBootstrapMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getChangeReplicaConfigMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getExecuteMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getLinearizedQueryMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getMergeMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getQueryMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getRecoverMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getSplitMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getTransferLeadershipMethod; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveRoute; import static java.util.Collections.emptyMap; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.RPCBluePrint; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.store.proto.BootstrapReply; -import com.baidu.bifromq.basekv.store.proto.BootstrapRequest; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigReply; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitRequest; -import com.baidu.bifromq.basekv.store.proto.RecoverReply; -import com.baidu.bifromq.basekv.store.proto.RecoverRequest; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipReply; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipRequest; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.EffectiveEpoch; -import com.baidu.bifromq.basekv.utils.EffectiveRoute; -import com.baidu.bifromq.basekv.utils.LeaderRange; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.RPCBluePrint; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.store.proto.BootstrapReply; +import org.apache.bifromq.basekv.store.proto.BootstrapRequest; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigReply; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeReply; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitReply; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitRequest; +import org.apache.bifromq.basekv.store.proto.RecoverReply; +import org.apache.bifromq.basekv.store.proto.RecoverRequest; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipReply; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipRequest; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.EffectiveEpoch; +import org.apache.bifromq.basekv.utils.EffectiveRoute; +import org.apache.bifromq.basekv.utils.LeaderRange; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import io.grpc.MethodDescriptor; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/BaseKVStoreClientBuilder.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/BaseKVStoreClientBuilder.java similarity index 86% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/BaseKVStoreClientBuilder.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/BaseKVStoreClientBuilder.java index 648f42873..7f1f21122 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/BaseKVStoreClientBuilder.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/BaseKVStoreClientBuilder.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; import lombok.Setter; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IBaseKVStoreClient.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IBaseKVStoreClient.java similarity index 78% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IBaseKVStoreClient.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IBaseKVStoreClient.java index a0d8b6fd2..9dc7fc9bd 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IBaseKVStoreClient.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IBaseKVStoreClient.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; - -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.store.proto.BootstrapReply; -import com.baidu.bifromq.basekv.store.proto.BootstrapRequest; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigReply; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitRequest; -import com.baidu.bifromq.basekv.store.proto.RecoverReply; -import com.baidu.bifromq.basekv.store.proto.RecoverRequest; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipReply; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipRequest; -import com.baidu.bifromq.baserpc.client.IConnectable; +package org.apache.bifromq.basekv.client; + +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.store.proto.BootstrapReply; +import org.apache.bifromq.basekv.store.proto.BootstrapRequest; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigReply; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeReply; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitReply; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitRequest; +import org.apache.bifromq.basekv.store.proto.RecoverReply; +import org.apache.bifromq.basekv.store.proto.RecoverRequest; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipReply; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipRequest; +import org.apache.bifromq.baserpc.client.IConnectable; import io.reactivex.rxjava3.core.Observable; import java.util.NavigableMap; import java.util.Set; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IMutationPipeline.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IMutationPipeline.java similarity index 82% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IMutationPipeline.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IMutationPipeline.java index 465b24cec..4d420d6b2 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IMutationPipeline.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IMutationPipeline.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; import java.util.concurrent.CompletableFuture; public interface IMutationPipeline { diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IQueryPipeline.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IQueryPipeline.java similarity index 82% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IQueryPipeline.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IQueryPipeline.java index 59f448c21..60afa04d7 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/IQueryPipeline.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/IQueryPipeline.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; import java.util.concurrent.CompletableFuture; public interface IQueryPipeline { diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/KVRangeRouterUtil.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/KVRangeRouterUtil.java similarity index 92% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/KVRangeRouterUtil.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/KVRangeRouterUtil.java index 0367a748c..d7b5f1f72 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/KVRangeRouterUtil.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/KVRangeRouterUtil.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.utils.BoundaryUtil; import com.google.protobuf.ByteString; import java.util.Collection; import java.util.Collections; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/KVRangeSetting.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/KVRangeSetting.java similarity index 94% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/KVRangeSetting.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/KVRangeSetting.java index 3db191b8d..a9d7a105d 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/KVRangeSetting.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/KVRangeSetting.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import static com.baidu.bifromq.basekv.InProcStores.getInProcStores; +import static org.apache.bifromq.basekv.InProcStores.getInProcStores; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/ManagedMutationPipeline.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/ManagedMutationPipeline.java similarity index 88% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/ManagedMutationPipeline.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/ManagedMutationPipeline.java index 09f753f3a..0c26e138f 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/ManagedMutationPipeline.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/ManagedMutationPipeline.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.baserpc.client.IRPCClient; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.Disposable; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/ManagedQueryPipeline.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/ManagedQueryPipeline.java similarity index 88% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/ManagedQueryPipeline.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/ManagedQueryPipeline.java index e2d0d06cb..bb36721f1 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/ManagedQueryPipeline.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/ManagedQueryPipeline.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.baserpc.client.IRPCClient; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.Disposable; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/BadRequestException.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/BadRequestException.java similarity index 92% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/BadRequestException.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/BadRequestException.java index 042f4821f..6557d8db4 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/BadRequestException.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/BadRequestException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.exception; +package org.apache.bifromq.basekv.client.exception; public class BadRequestException extends RuntimeException { } diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/BadVersionException.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/BadVersionException.java similarity index 92% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/BadVersionException.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/BadVersionException.java index 76ed04ad7..c16239908 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/BadVersionException.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/BadVersionException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.exception; +package org.apache.bifromq.basekv.client.exception; public class BadVersionException extends RuntimeException { } diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/InternalErrorException.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/InternalErrorException.java similarity index 92% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/InternalErrorException.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/InternalErrorException.java index 8d8d5a91c..dcf3825cc 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/InternalErrorException.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/InternalErrorException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.exception; +package org.apache.bifromq.basekv.client.exception; public class InternalErrorException extends RuntimeException { } diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/TryLaterException.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/TryLaterException.java similarity index 92% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/TryLaterException.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/TryLaterException.java index bdebf0425..18dd107e4 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/exception/TryLaterException.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/exception/TryLaterException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.exception; +package org.apache.bifromq.basekv.client.exception; public class TryLaterException extends RuntimeException { } diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCall.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCall.java similarity index 88% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCall.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCall.java index 4bacdd22c..9cfdd123c 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCall.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCall.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; - -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; - -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; +package org.apache.bifromq.basekv.client.scheduler; + +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; + +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; import java.util.ArrayDeque; import java.util.Deque; import java.util.LinkedList; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java similarity index 84% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java index f303ec1e6..2e67cad52 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCallBuilderFactory.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.IBatchCallBuilder; -import com.baidu.bifromq.basescheduler.IBatchCallBuilderFactory; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.IBatchCallBuilder; +import org.apache.bifromq.basescheduler.IBatchCallBuilderFactory; final class BatchMutationCallBuilderFactory> implements IBatchCallBuilderFactory { diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCall.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCall.java similarity index 86% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCall.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCall.java index 40d3682d7..626794328 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCall.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCall.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; - -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; - -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; +package org.apache.bifromq.basekv.client.scheduler; + +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; + +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; import java.util.ArrayDeque; import java.util.Deque; import java.util.Iterator; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java similarity index 85% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java index a251d52c8..e1782a93d 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCallBuilderFactory.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.IBatchCallBuilder; -import com.baidu.bifromq.basescheduler.IBatchCallBuilderFactory; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.IBatchCallBuilder; +import org.apache.bifromq.basescheduler.IBatchCallBuilderFactory; final class BatchQueryCallBuilderFactory> implements IBatchCallBuilderFactory { diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java similarity index 91% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java index bba960b3b..b3468cbd6 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/IBatchMutationCallBuilder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.IMutationPipeline; /** * Interface for building batch mutation calls. diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java similarity index 91% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java index c095e1a91..ee5fc4a67 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/IBatchQueryCallBuilder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.client.IQueryPipeline; /** * Interface for building batch query calls. diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java similarity index 89% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java index 3e8e6d998..6894431b2 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/MutationCallBatcherKey.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/MutationCallScheduler.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/MutationCallScheduler.java similarity index 86% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/MutationCallScheduler.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/MutationCallScheduler.java index 0c4846260..d3fd58847 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/MutationCallScheduler.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/MutationCallScheduler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basescheduler.BatchCallScheduler; import com.google.protobuf.ByteString; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java similarity index 90% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java index b6d211076..a2d2ee25d 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/QueryCallBatcherKey.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/QueryCallScheduler.java b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/QueryCallScheduler.java similarity index 87% rename from base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/QueryCallScheduler.java rename to base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/QueryCallScheduler.java index 4bd6bad2a..5e69ada0d 100644 --- a/base-kv/base-kv-store-client/src/main/java/com/baidu/bifromq/basekv/client/scheduler/QueryCallScheduler.java +++ b/base-kv/base-kv-store-client/src/main/java/org/apache/bifromq/basekv/client/scheduler/QueryCallScheduler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basescheduler.BatchCallScheduler; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/KVRangeRouterUtilTest.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/KVRangeRouterUtilTest.java similarity index 93% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/KVRangeRouterUtilTest.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/KVRangeRouterUtilTest.java index 16440e93f..630623a0b 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/KVRangeRouterUtilTest.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/KVRangeRouterUtilTest.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.utils.BoundaryUtil; import com.beust.jcommander.internal.Lists; import com.google.protobuf.ByteString; import java.util.Collection; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/KVRangeSettingTest.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/KVRangeSettingTest.java similarity index 90% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/KVRangeSettingTest.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/KVRangeSettingTest.java index cbff81b1a..0b03c7633 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/KVRangeSettingTest.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/KVRangeSettingTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client; +package org.apache.bifromq.basekv.client; -import static com.baidu.bifromq.basekv.InProcStores.regInProcStore; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.InProcStores.regInProcStore; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.Struct; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCallTest.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCallTest.java similarity index 90% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCallTest.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCallTest.java index e9e633c05..cce7df007 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/BatchMutationCallTest.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/BatchMutationCallTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import static com.baidu.bifromq.basekv.client.scheduler.Fixtures.setting; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.client.scheduler.Fixtures.setting; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.ArrayList; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCallTest.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCallTest.java similarity index 91% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCallTest.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCallTest.java index ffbfbd9e1..cf6232e1e 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/BatchQueryCallTest.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/BatchQueryCallTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import static com.baidu.bifromq.basekv.client.scheduler.Fixtures.setting; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.client.scheduler.Fixtures.setting; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.ArrayList; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/Fixtures.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/Fixtures.java similarity index 76% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/Fixtures.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/Fixtures.java index 7fc33eed7..7a5854f7c 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/Fixtures.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/Fixtures.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; public class Fixtures { static KVRangeSetting setting(KVRangeId id, String leaderStoreId, long ver) { diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestBatchMutationCall.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestBatchMutationCall.java similarity index 91% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestBatchMutationCall.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestBatchMutationCall.java index b555741b8..3e2494c81 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestBatchMutationCall.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestBatchMutationCall.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basescheduler.ICallTask; import com.google.common.collect.Iterables; import com.google.protobuf.ByteString; import java.util.HashSet; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestBatchQueryCall.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestBatchQueryCall.java similarity index 87% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestBatchQueryCall.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestBatchQueryCall.java index dafa77ad7..8fb945150 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestBatchQueryCall.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestBatchQueryCall.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basescheduler.ICallTask; import com.google.protobuf.ByteString; import java.util.Iterator; import java.util.Queue; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java similarity index 90% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java index 047233ba7..f13673330 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestMutationCallScheduler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java similarity index 92% rename from base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java rename to base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java index 8345a7f41..8ffc23f2c 100644 --- a/base-kv/base-kv-store-client/src/test/java/com/baidu/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java +++ b/base-kv/base-kv-store-client/src/test/java/org/apache/bifromq/basekv/client/scheduler/TestQueryCallScheduler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.client.scheduler; +package org.apache.bifromq.basekv.client.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/base-kv/base-kv-store-client/src/test/resources/logback.xml b/base-kv/base-kv-store-client/src/test/resources/logback.xml index 83cbdac1a..ec7578be2 100644 --- a/base-kv/base-kv-store-client/src/test/resources/logback.xml +++ b/base-kv/base-kv-store-client/src/test/resources/logback.xml @@ -18,7 +18,7 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + diff --git a/base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/InProcStores.java b/base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/InProcStores.java similarity index 97% rename from base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/InProcStores.java rename to base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/InProcStores.java index 59252caa4..6f4848355 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/InProcStores.java +++ b/base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/InProcStores.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; import java.util.Collections; import java.util.HashSet; diff --git a/base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/RPCBluePrint.java b/base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/RPCBluePrint.java similarity index 79% rename from base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/RPCBluePrint.java rename to base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/RPCBluePrint.java index 9753ca2e9..0ebc4d128 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/RPCBluePrint.java +++ b/base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/RPCBluePrint.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getBootstrapMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getChangeReplicaConfigMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getExecuteMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getLinearizedQueryMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getMergeMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getQueryMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getRecoverMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getSplitMethod; -import static com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getTransferLeadershipMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getBootstrapMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getChangeReplicaConfigMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getExecuteMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getLinearizedQueryMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getMergeMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getQueryMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getRecoverMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getSplitMethod; +import static org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc.getTransferLeadershipMethod; import static io.grpc.MethodDescriptor.generateFullMethodName; -import com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc; -import com.baidu.bifromq.baserpc.BluePrint; +import org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc; +import org.apache.bifromq.baserpc.BluePrint; import io.grpc.MethodDescriptor; import io.grpc.ServerMethodDefinition; import io.grpc.ServerServiceDefinition; diff --git a/base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/RPCServerMetadataUtil.java b/base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/RPCServerMetadataUtil.java similarity index 95% rename from base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/RPCServerMetadataUtil.java rename to base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/RPCServerMetadataUtil.java index 64a2ac37e..844c1fcd5 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/java/com/baidu/bifromq/basekv/RPCServerMetadataUtil.java +++ b/base-kv/base-kv-store-rpc-definition/src/main/java/org/apache/bifromq/basekv/RPCServerMetadataUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; public class RPCServerMetadataUtil { public static final String RPC_METADATA_STORE_ID = "store_id"; diff --git a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/BaseKVStoreService.proto b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/BaseKVStoreService.proto index 23aad4d98..a79c4b52e 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/BaseKVStoreService.proto +++ b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/BaseKVStoreService.proto @@ -7,7 +7,7 @@ import "basekv/CoProc.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.store.proto"; +option java_package = "org.apache.bifromq.basekv.store.proto"; option optimize_for = SPEED; service BaseKVStoreService{ diff --git a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/CoProc.proto b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/CoProc.proto index d98e47801..b4a518007 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/CoProc.proto +++ b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/CoProc.proto @@ -5,7 +5,7 @@ import "retainservice/RetainStoreCoProc.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.store.proto"; +option java_package = "org.apache.bifromq.basekv.store.proto"; option optimize_for = SPEED; message ROCoProcInput{ diff --git a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/Command.proto b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/Command.proto index 9ee52d34d..d24ad9c52 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/Command.proto +++ b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/Command.proto @@ -6,7 +6,7 @@ import "basekv/CoProc.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message ChangeConfig { diff --git a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/StoreMessage.proto b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/StoreMessage.proto index b4cf5fb28..d670bfe25 100644 --- a/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/StoreMessage.proto +++ b/base-kv/base-kv-store-rpc-definition/src/main/proto/basekv/StoreMessage.proto @@ -8,7 +8,7 @@ import "basekv/Snapshot.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message WALRaftMessages{ diff --git a/base-kv/base-kv-store-rpc-definition/src/test/java/com/baidu/bifromq/basekv/NullableValueTest.java b/base-kv/base-kv-store-rpc-definition/src/test/java/org/apache/bifromq/basekv/NullableValueTest.java similarity index 92% rename from base-kv/base-kv-store-rpc-definition/src/test/java/com/baidu/bifromq/basekv/NullableValueTest.java rename to base-kv/base-kv-store-rpc-definition/src/test/java/org/apache/bifromq/basekv/NullableValueTest.java index 85be925e3..cf9bb26a8 100644 --- a/base-kv/base-kv-store-rpc-definition/src/test/java/com/baidu/bifromq/basekv/NullableValueTest.java +++ b/base-kv/base-kv-store-rpc-definition/src/test/java/org/apache/bifromq/basekv/NullableValueTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.proto.NullableValue; +import org.apache.bifromq.basekv.store.proto.NullableValue; import com.google.protobuf.ByteString; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-rpc-definition/src/test/java/com/baidu/bifromq/basekv/RPCBluePrintTest.java b/base-kv/base-kv-store-rpc-definition/src/test/java/org/apache/bifromq/basekv/RPCBluePrintTest.java similarity index 92% rename from base-kv/base-kv-store-rpc-definition/src/test/java/com/baidu/bifromq/basekv/RPCBluePrintTest.java rename to base-kv/base-kv-store-rpc-definition/src/test/java/org/apache/bifromq/basekv/RPCBluePrintTest.java index 37893ad18..051637b00 100644 --- a/base-kv/base-kv-store-rpc-definition/src/test/java/com/baidu/bifromq/basekv/RPCBluePrintTest.java +++ b/base-kv/base-kv-store-rpc-definition/src/test/java/org/apache/bifromq/basekv/RPCBluePrintTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc; -import com.baidu.bifromq.baserpc.BluePrint; +import org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc; +import org.apache.bifromq.baserpc.BluePrint; import io.grpc.ServerMethodDefinition; import io.grpc.ServerServiceDefinition; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/AgentHostStoreMessenger.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/AgentHostStoreMessenger.java similarity index 84% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/AgentHostStoreMessenger.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/AgentHostStoreMessenger.java index 861b9c698..fc992a7da 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/AgentHostStoreMessenger.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/AgentHostStoreMessenger.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import static com.baidu.bifromq.basekv.Constants.toBaseKVAgentId; +import static org.apache.bifromq.basekv.Constants.toBaseKVAgentId; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; -import com.baidu.bifromq.baseenv.ZeroCopyParser; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.store.IStoreMessenger; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.baseenv.ZeroCopyParser; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.store.IStoreMessenger; +import org.apache.bifromq.logger.SiftLogger; import com.google.protobuf.InvalidProtocolBufferException; import io.reactivex.rxjava3.core.Observable; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServer.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServer.java similarity index 93% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServer.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServer.java index af33b898e..054334d41 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServer.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServer.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import static com.baidu.bifromq.basekv.RPCServerMetadataUtil.RPC_METADATA_STORE_ID; +import static org.apache.bifromq.basekv.RPCServerMetadataUtil.RPC_METADATA_STORE_ID; import static java.util.Collections.singletonMap; -import com.baidu.bifromq.basekv.RPCBluePrint; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.basekv.RPCBluePrint; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; import com.google.common.base.Preconditions; import io.grpc.ServerServiceDefinition; import java.util.Collections; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServerBuilder.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServerBuilder.java similarity index 88% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServerBuilder.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServerBuilder.java index c56bb50e3..e8e769ba3 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServerBuilder.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServerBuilder.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; import java.util.HashMap; import java.util.Map; import lombok.Setter; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreService.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreService.java similarity index 84% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreService.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreService.java index 78cec8032..e0998a324 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreService.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreService.java @@ -11,38 +11,38 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.baserpc.server.UnaryResponse.response; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.baserpc.server.UnaryResponse.response; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.store.IKVRangeStore; -import com.baidu.bifromq.basekv.store.KVRangeStore; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc; -import com.baidu.bifromq.basekv.store.proto.BootstrapReply; -import com.baidu.bifromq.basekv.store.proto.BootstrapRequest; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigReply; -import com.baidu.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeMergeRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeSplitRequest; -import com.baidu.bifromq.basekv.store.proto.RecoverReply; -import com.baidu.bifromq.basekv.store.proto.RecoverRequest; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipReply; -import com.baidu.bifromq.basekv.store.proto.TransferLeadershipRequest; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.store.IKVRangeStore; +import org.apache.bifromq.basekv.store.KVRangeStore; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.store.proto.BaseKVStoreServiceGrpc; +import org.apache.bifromq.basekv.store.proto.BootstrapReply; +import org.apache.bifromq.basekv.store.proto.BootstrapRequest; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigReply; +import org.apache.bifromq.basekv.store.proto.ChangeReplicaConfigRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeReply; +import org.apache.bifromq.basekv.store.proto.KVRangeMergeRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitReply; +import org.apache.bifromq.basekv.store.proto.KVRangeSplitRequest; +import org.apache.bifromq.basekv.store.proto.RecoverReply; +import org.apache.bifromq.basekv.store.proto.RecoverRequest; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipReply; +import org.apache.bifromq.basekv.store.proto.TransferLeadershipRequest; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Sets; import io.grpc.stub.StreamObserver; import io.reactivex.rxjava3.disposables.CompositeDisposable; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServiceBuilder.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServiceBuilder.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServiceBuilder.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServiceBuilder.java index 9ff5254f8..e242a5370 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/BaseKVStoreServiceBuilder.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/BaseKVStoreServiceBuilder.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executor; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/IBaseKVStoreServer.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/IBaseKVStoreServer.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/IBaseKVStoreServer.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/IBaseKVStoreServer.java index ab9844d8c..718a637cc 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/IBaseKVStoreServer.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/IBaseKVStoreServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; /** * The interface of the BaseKV store server. diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/MutatePipeline.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/MutatePipeline.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/MutatePipeline.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/MutatePipeline.java index 516341842..506de0842 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/MutatePipeline.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/MutatePipeline.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; -import com.baidu.bifromq.basekv.raft.exception.DropProposalException; -import com.baidu.bifromq.basekv.store.IKVRangeStore; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.baserpc.server.ResponsePipeline; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.raft.exception.DropProposalException; +import org.apache.bifromq.basekv.store.IKVRangeStore; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.baserpc.server.ResponsePipeline; +import org.apache.bifromq.logger.SiftLogger; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/QueryPipeline.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/QueryPipeline.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/QueryPipeline.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/QueryPipeline.java index af4e227cf..1c0d6153f 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/server/QueryPipeline.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/server/QueryPipeline.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; -import com.baidu.bifromq.basekv.raft.exception.ReadIndexException; -import com.baidu.bifromq.basekv.store.IKVRangeStore; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.NullableValue; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.baserpc.server.ResponsePipeline; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.raft.exception.ReadIndexException; +import org.apache.bifromq.basekv.store.IKVRangeStore; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.NullableValue; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.baserpc.server.ResponsePipeline; +import org.apache.bifromq.logger.SiftLogger; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IKVRangeStore.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IKVRangeStore.java similarity index 93% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IKVRangeStore.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IKVRangeStore.java index e85bbc98f..ed67dc487 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IKVRangeStore.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IKVRangeStore.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; - -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; +package org.apache.bifromq.basekv.store; + +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java similarity index 88% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java index 80b779bbf..9b88cc2c4 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IKVRangeStoreDescriptorReporter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; public interface IKVRangeStoreDescriptorReporter { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IStoreMessenger.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IStoreMessenger.java similarity index 89% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IStoreMessenger.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IStoreMessenger.java index 428e50c00..d40be5096 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/IStoreMessenger.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/IStoreMessenger.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import com.baidu.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.proto.StoreMessage; import io.reactivex.rxjava3.core.Observable; public interface IStoreMessenger { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeMessenger.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeMessenger.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeMessenger.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeMessenger.java index a5534f57e..747565b09 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeMessenger.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeMessenger.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.range.IKVRangeMessenger; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.range.IKVRangeMessenger; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.Disposable; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeStore.java similarity index 92% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeStore.java index 24e2a4143..ed14c54bb 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStore.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeStore.java @@ -11,48 +11,48 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.InProcStores.regInProcStore; -import static com.baidu.bifromq.basekv.proto.State.StateType.Normal; -import static com.baidu.bifromq.basekv.store.exception.KVRangeStoreException.rangeNotFound; -import static com.baidu.bifromq.basekv.store.util.ExecutorServiceUtil.awaitShutdown; +import static org.apache.bifromq.basekv.InProcStores.regInProcStore; +import static org.apache.bifromq.basekv.proto.State.StateType.Normal; +import static org.apache.bifromq.basekv.store.exception.KVRangeStoreException.rangeNotFound; +import static org.apache.bifromq.basekv.store.util.ExecutorServiceUtil.awaitShutdown; import static java.util.Collections.emptyList; -import com.baidu.bifromq.base.util.AsyncRunner; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.KVEngineFactory; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.EnsureRange; -import com.baidu.bifromq.basekv.proto.EnsureRangeReply; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basekv.store.range.IKVRange; -import com.baidu.bifromq.basekv.store.range.IKVRangeFSM; -import com.baidu.bifromq.basekv.store.range.KVRange; -import com.baidu.bifromq.basekv.store.range.KVRangeFSM; -import com.baidu.bifromq.basekv.store.stats.IStatsCollector; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWALStore; -import com.baidu.bifromq.basekv.store.wal.KVRangeWALStorageEngine; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.KVEngineFactory; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.EnsureRange; +import org.apache.bifromq.basekv.proto.EnsureRangeReply; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.store.range.IKVRange; +import org.apache.bifromq.basekv.store.range.IKVRangeFSM; +import org.apache.bifromq.basekv.store.range.KVRange; +import org.apache.bifromq.basekv.store.range.KVRangeFSM; +import org.apache.bifromq.basekv.store.stats.IStatsCollector; +import org.apache.bifromq.basekv.store.wal.IKVRangeWALStore; +import org.apache.bifromq.basekv.store.wal.KVRangeWALStorageEngine; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStoreStatsCollector.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeStoreStatsCollector.java similarity index 86% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStoreStatsCollector.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeStoreStatsCollector.java index 96c49c384..af899c8b3 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/KVRangeStoreStatsCollector.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/KVRangeStoreStatsCollector.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.stats.StatsCollector; -import com.baidu.bifromq.basekv.store.util.ProcessUtil; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.stats.StatsCollector; +import org.apache.bifromq.basekv.store.util.ProcessUtil; import java.io.File; import java.time.Duration; import java.util.Map; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVCloseableReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVCloseableReader.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVCloseableReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVCloseableReader.java index 8845930d1..c15fc0266 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVCloseableReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVCloseableReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; public interface IKVCloseableReader extends IKVReader, AutoCloseable { @Override diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVIterator.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVIterator.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVIterator.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVIterator.java index b7004d561..1adebb111 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVIterator.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVIterator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVLoadRecord.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVLoadRecord.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVLoadRecord.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVLoadRecord.java index 9aea6b01c..aeb744c9f 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVLoadRecord.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVLoadRecord.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; import com.google.protobuf.ByteString; import java.util.Map; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeCoProc.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeCoProc.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeCoProc.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeCoProc.java index 61957f841..c25f373d4 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeCoProc.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeCoProc.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; import com.google.protobuf.Any; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeCoProcFactory.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeCoProcFactory.java similarity index 93% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeCoProcFactory.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeCoProcFactory.java index bad5cb9d1..200e30cfe 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeCoProcFactory.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeCoProcFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import java.util.Collections; import java.util.List; import java.util.function.Supplier; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeMetadata.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeMetadata.java similarity index 77% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeMetadata.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeMetadata.java index 300b329fc..ccdea5b1e 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeMetadata.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeMetadata.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; public interface IKVRangeMetadata { KVRangeId id(); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeReader.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeReader.java index 59b1feaab..a38841443 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeReader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; /** * Thread-Unsafe reader to access the consistent view of KVRange. diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeSplitHinter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeSplitHinter.java similarity index 76% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeSplitHinter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeSplitHinter.java index f3134ef49..95346f5c1 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVRangeSplitHinter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVRangeSplitHinter.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; public interface IKVRangeSplitHinter { void recordQuery(ROCoProcInput input, IKVLoadRecord ioRecord); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVReader.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVReader.java index ec93338d2..f036db2ac 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVReader.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVWriter.java similarity index 92% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVWriter.java index 2b510d393..0aa55fd64 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/api/IKVWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/api/IKVWriter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.api; +package org.apache.bifromq.basekv.store.api; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; public interface IKVWriter { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/exception/KVRangeException.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/exception/KVRangeException.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/exception/KVRangeException.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/exception/KVRangeException.java index aa06a2f7f..1045f3134 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/exception/KVRangeException.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/exception/KVRangeException.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.exception; +package org.apache.bifromq.basekv.store.exception; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; public class KVRangeException extends RuntimeException { public KVRangeException(String message) { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/exception/KVRangeStoreException.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/exception/KVRangeStoreException.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/exception/KVRangeStoreException.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/exception/KVRangeStoreException.java index db7a3665a..05e1ba923 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/exception/KVRangeStoreException.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/exception/KVRangeStoreException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.exception; +package org.apache.bifromq.basekv.store.exception; public class KVRangeStoreException extends RuntimeException { public KVRangeStoreException(String message) { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/option/KVRangeOptions.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/option/KVRangeOptions.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/option/KVRangeOptions.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/option/KVRangeOptions.java index a2703846e..7300d8677 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/option/KVRangeOptions.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/option/KVRangeOptions.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.option; +package org.apache.bifromq.basekv.store.option; -import com.baidu.bifromq.basekv.raft.RaftConfig; +import org.apache.bifromq.basekv.raft.RaftConfig; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/option/KVRangeStoreOptions.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/option/KVRangeStoreOptions.java similarity index 83% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/option/KVRangeStoreOptions.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/option/KVRangeStoreOptions.java index f33652b13..7e0332b26 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/option/KVRangeStoreOptions.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/option/KVRangeStoreOptions.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.option; +package org.apache.bifromq.basekv.store.option; -import com.baidu.bifromq.basekv.localengine.ICPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.IWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.store.util.ProcessUtil; +import org.apache.bifromq.basekv.localengine.ICPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.IWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.store.util.ProcessUtil; import java.nio.file.Paths; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeMetadata.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeMetadata.java similarity index 81% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeMetadata.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeMetadata.java index 94724ce62..0e921e36e 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeMetadata.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeMetadata.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_LAST_APPLIED_INDEX_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_LAST_APPLIED_INDEX_BYTES; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadata; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.api.IKVRangeMetadata; -import com.baidu.bifromq.basekv.store.util.KVUtil; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadata; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.api.IKVRangeMetadata; +import org.apache.bifromq.basekv.store.util.KVUtil; import com.google.protobuf.ByteString; import lombok.SneakyThrows; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java similarity index 69% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java index 3e10854b1..2bf6d9a8e 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeMetadataUpdatable.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_LAST_APPLIED_INDEX_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; -import static com.baidu.bifromq.basekv.store.util.VerUtil.bump; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_LAST_APPLIED_INDEX_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; +import static org.apache.bifromq.basekv.store.util.VerUtil.bump; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadata; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadataUpdatable; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.util.KVUtil; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadata; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadataUpdatable; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.util.KVUtil; abstract class AbstractKVRangeMetadataUpdatable> extends AbstractKVRangeMetadata implements IKVRangeMetadataUpdatable { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVCheckpointIterator.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVCheckpointIterator.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVCheckpointIterator.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVCheckpointIterator.java index be374ec65..4ed002a91 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVCheckpointIterator.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVCheckpointIterator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVIterator; public interface IKVCheckpointIterator extends IKVIterator, AutoCloseable { @Override diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVCheckpointReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVCheckpointReader.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVCheckpointReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVCheckpointReader.java index 9d5f5ac61..257aa546f 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVCheckpointReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVCheckpointReader.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVReader; public interface IKVCheckpointReader extends IKVReader { @Override diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVLoadRecorder.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVLoadRecorder.java similarity index 91% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVLoadRecorder.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVLoadRecorder.java index 0d0e1148f..d3da3bcd3 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVLoadRecorder.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVLoadRecorder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; import com.google.protobuf.ByteString; public interface IKVLoadRecorder { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVLoadTracker.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVLoadTracker.java similarity index 97% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVLoadTracker.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVLoadTracker.java index d1d96446d..024bbab75 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVLoadTracker.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVLoadTracker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import com.google.protobuf.ByteString; import java.util.Map; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRange.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRange.java similarity index 84% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRange.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRange.java index 74debe72e..cb4923e4e 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRange.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRange.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.api.IKVReader; import io.reactivex.rxjava3.core.Observable; public interface IKVRange extends IKVRangeReader { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeCheckpointReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeCheckpointReader.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeCheckpointReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeCheckpointReader.java index 290552dd7..90b7bf991 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeCheckpointReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeCheckpointReader.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; public interface IKVRangeCheckpointReader extends IKVRangeReader { @Override diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeFSM.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeFSM.java similarity index 85% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeFSM.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeFSM.java index 13e128a5d..f8e7ea6fb 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeFSM.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeFSM.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; - -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; +package org.apache.bifromq.basekv.store.range; + +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMessenger.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMessenger.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMessenger.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMessenger.java index 6dce4d524..1e56e346c 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMessenger.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMessenger.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeMessage; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java similarity index 78% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java index 645b7b0c3..4a5375359 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetadataUpdatable.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.api.IKVRangeMetadata; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.api.IKVRangeMetadata; public interface IKVRangeMetadataUpdatable> extends IKVRangeMetadata { T bumpVer(boolean boundaryChange); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetadataWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetadataWriter.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetadataWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetadataWriter.java index 83ddddd09..dba719b03 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetadataWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetadataWriter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; public interface IKVRangeMetadataWriter> extends IKVRangeMetadataUpdatable { void done(); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetricManager.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetricManager.java similarity index 91% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetricManager.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetricManager.java index dccfbf8ee..c35909307 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeMetricManager.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeMetricManager.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Timer; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java index 9cedb8668..826297fbe 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeQueryLinearizer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import java.util.concurrent.CompletionStage; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeQueryRunner.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeQueryRunner.java similarity index 86% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeQueryRunner.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeQueryRunner.java index 1887202b6..029ecaabf 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeQueryRunner.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeQueryRunner.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; import com.google.protobuf.ByteString; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeWritable.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeWritable.java similarity index 82% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeWritable.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeWritable.java index d6ae4b67e..f54b37d39 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeWritable.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeWritable.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVWriter; public interface IKVRangeWritable> extends IKVRangeMetadataUpdatable { IKVRangeMetadataWriter migrateTo(KVRangeId targetRangeId, Boundary boundary); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeWriter.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeWriter.java index 9dfd88693..c5c8143f7 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVRangeWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVRangeWriter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; public interface IKVRangeWriter> extends IKVRangeWritable { void done(); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVReseter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVReseter.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVReseter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVReseter.java index 9cc29843f..21a76af5d 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/IKVReseter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/IKVReseter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVCheckpointDataIterator.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVCheckpointDataIterator.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVCheckpointDataIterator.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVCheckpointDataIterator.java index e689fa6ba..6e4afd77b 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVCheckpointDataIterator.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVCheckpointDataIterator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; class KVCheckpointDataIterator extends KVIterator implements IKVCheckpointIterator { private final IKVSpaceIterator kvSpaceIterator; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVCheckpointReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVCheckpointReader.java similarity index 83% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVCheckpointReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVCheckpointReader.java index 5b4ee71b5..ac5169d84 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVCheckpointReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVCheckpointReader.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.inRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.inRange; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceReader; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVIterator.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVIterator.java similarity index 91% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVIterator.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVIterator.java index e11d5a9da..a47e208d9 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVIterator.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVIterator.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.store.api.IKVIterator; import com.google.protobuf.ByteString; class KVIterator implements IKVIterator { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVLoadRecorder.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVLoadRecorder.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVLoadRecorder.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVLoadRecorder.java index fad2d5fd0..d36cb7b13 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVLoadRecorder.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVLoadRecorder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; import com.google.protobuf.ByteString; import java.util.HashMap; import java.util.Map; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRange.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRange.java similarity index 85% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRange.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRange.java index b4dd0770c..822e5bf09 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRange.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRange.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; - -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; - -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.api.IKVWriter; +package org.apache.bifromq.basekv.store.range; + +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; + +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVWriter; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeCheckpoint.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeCheckpoint.java similarity index 73% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeCheckpoint.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeCheckpoint.java index 563efcb93..d810568ee 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeCheckpoint.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeCheckpoint.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; - -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; - -import com.baidu.bifromq.basekv.localengine.IKVSpaceReader; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +package org.apache.bifromq.basekv.store.range; + +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; + +import org.apache.bifromq.basekv.localengine.IKVSpaceReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeDumpSession.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeDumpSession.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeDumpSession.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeDumpSession.java index 14a589497..4f39f1380 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeDumpSession.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeDumpSession.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.base.util.AsyncRunner; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.proto.KVPair; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataReply; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataRequest; -import com.baidu.bifromq.basekv.proto.SnapshotSyncRequest; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.proto.KVPair; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataReply; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataRequest; +import org.apache.bifromq.basekv.proto.SnapshotSyncRequest; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.util.concurrent.RateLimiter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Tags; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeFSM.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeFSM.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeFSM.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeFSM.java index 1b8543b62..8f6ae4d72 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeFSM.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeFSM.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; - -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.basekv.proto.State.StateType.ConfigChanging; -import static com.baidu.bifromq.basekv.proto.State.StateType.Merged; -import static com.baidu.bifromq.basekv.proto.State.StateType.MergedQuiting; -import static com.baidu.bifromq.basekv.proto.State.StateType.NoUse; -import static com.baidu.bifromq.basekv.proto.State.StateType.Normal; -import static com.baidu.bifromq.basekv.proto.State.StateType.PreparedMerging; -import static com.baidu.bifromq.basekv.proto.State.StateType.Removed; -import static com.baidu.bifromq.basekv.proto.State.StateType.ToBePurged; -import static com.baidu.bifromq.basekv.proto.State.StateType.WaitingForMerge; -import static com.baidu.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Closed; -import static com.baidu.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Destroyed; -import static com.baidu.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Destroying; -import static com.baidu.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Init; -import static com.baidu.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Open; -import static com.baidu.bifromq.basekv.store.util.ExecutorServiceUtil.awaitShutdown; -import static com.baidu.bifromq.basekv.store.util.VerUtil.boundaryCompatible; -import static com.baidu.bifromq.basekv.store.util.VerUtil.print; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.canCombine; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.combine; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isSplittable; +package org.apache.bifromq.basekv.store.range; + +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.basekv.proto.State.StateType.ConfigChanging; +import static org.apache.bifromq.basekv.proto.State.StateType.Merged; +import static org.apache.bifromq.basekv.proto.State.StateType.MergedQuiting; +import static org.apache.bifromq.basekv.proto.State.StateType.NoUse; +import static org.apache.bifromq.basekv.proto.State.StateType.Normal; +import static org.apache.bifromq.basekv.proto.State.StateType.PreparedMerging; +import static org.apache.bifromq.basekv.proto.State.StateType.Removed; +import static org.apache.bifromq.basekv.proto.State.StateType.ToBePurged; +import static org.apache.bifromq.basekv.proto.State.StateType.WaitingForMerge; +import static org.apache.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Closed; +import static org.apache.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Destroyed; +import static org.apache.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Destroying; +import static org.apache.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Init; +import static org.apache.bifromq.basekv.store.range.KVRangeFSM.Lifecycle.Open; +import static org.apache.bifromq.basekv.store.util.ExecutorServiceUtil.awaitShutdown; +import static org.apache.bifromq.basekv.store.util.VerUtil.boundaryCompatible; +import static org.apache.bifromq.basekv.store.util.VerUtil.print; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.canCombine; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.combine; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isSplittable; import static com.google.common.collect.Sets.difference; import static com.google.common.collect.Sets.newHashSet; import static com.google.common.collect.Sets.union; @@ -42,67 +42,67 @@ import static java.util.Collections.singleton; import static java.util.Collections.singletonList; -import com.baidu.bifromq.base.util.AsyncRunner; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.baseenv.ZeroCopyParser; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.CancelMerging; -import com.baidu.bifromq.basekv.proto.CancelMergingReply; -import com.baidu.bifromq.basekv.proto.CancelMergingRequest; -import com.baidu.bifromq.basekv.proto.ChangeConfig; -import com.baidu.bifromq.basekv.proto.Delete; -import com.baidu.bifromq.basekv.proto.EnsureRange; -import com.baidu.bifromq.basekv.proto.EnsureRangeReply; -import com.baidu.bifromq.basekv.proto.KVRangeCommand; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.Merge; -import com.baidu.bifromq.basekv.proto.MergeDone; -import com.baidu.bifromq.basekv.proto.MergeDoneReply; -import com.baidu.bifromq.basekv.proto.MergeDoneRequest; -import com.baidu.bifromq.basekv.proto.MergeReply; -import com.baidu.bifromq.basekv.proto.MergeRequest; -import com.baidu.bifromq.basekv.proto.PrepareMergeTo; -import com.baidu.bifromq.basekv.proto.PrepareMergeToReply; -import com.baidu.bifromq.basekv.proto.PrepareMergeToRequest; -import com.baidu.bifromq.basekv.proto.PrepareMergeWith; -import com.baidu.bifromq.basekv.proto.Put; -import com.baidu.bifromq.basekv.proto.SnapshotSyncRequest; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.proto.SplitRange; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.proto.WALRaftMessages; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.raft.exception.SnapshotException; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.option.KVRangeOptions; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basekv.store.stats.IStatsCollector; -import com.baidu.bifromq.basekv.store.util.VerUtil; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWAL; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWALStore; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWALSubscriber; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWALSubscription; -import com.baidu.bifromq.basekv.store.wal.KVRangeWAL; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.ZeroCopyParser; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.CancelMerging; +import org.apache.bifromq.basekv.proto.CancelMergingReply; +import org.apache.bifromq.basekv.proto.CancelMergingRequest; +import org.apache.bifromq.basekv.proto.ChangeConfig; +import org.apache.bifromq.basekv.proto.Delete; +import org.apache.bifromq.basekv.proto.EnsureRange; +import org.apache.bifromq.basekv.proto.EnsureRangeReply; +import org.apache.bifromq.basekv.proto.KVRangeCommand; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.Merge; +import org.apache.bifromq.basekv.proto.MergeDone; +import org.apache.bifromq.basekv.proto.MergeDoneReply; +import org.apache.bifromq.basekv.proto.MergeDoneRequest; +import org.apache.bifromq.basekv.proto.MergeReply; +import org.apache.bifromq.basekv.proto.MergeRequest; +import org.apache.bifromq.basekv.proto.PrepareMergeTo; +import org.apache.bifromq.basekv.proto.PrepareMergeToReply; +import org.apache.bifromq.basekv.proto.PrepareMergeToRequest; +import org.apache.bifromq.basekv.proto.PrepareMergeWith; +import org.apache.bifromq.basekv.proto.Put; +import org.apache.bifromq.basekv.proto.SnapshotSyncRequest; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.proto.SplitRange; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.proto.WALRaftMessages; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.raft.exception.SnapshotException; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.option.KVRangeOptions; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.store.stats.IStatsCollector; +import org.apache.bifromq.basekv.store.util.VerUtil; +import org.apache.bifromq.basekv.store.wal.IKVRangeWAL; +import org.apache.bifromq.basekv.store.wal.IKVRangeWALStore; +import org.apache.bifromq.basekv.store.wal.IKVRangeWALSubscriber; +import org.apache.bifromq.basekv.store.wal.IKVRangeWALSubscription; +import org.apache.bifromq.basekv.store.wal.KVRangeWAL; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Maps; import com.google.protobuf.Any; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeKeys.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeKeys.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeKeys.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeKeys.java index 9afddbc01..5bd8bf756 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeKeys.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeKeys.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeMetadataWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeMetadataWriter.java similarity index 74% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeMetadataWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeMetadataWriter.java index 81e20189b..63e382b3a 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeMetadataWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeMetadataWriter.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadataUpdatable; -import com.baidu.bifromq.basekv.localengine.IKVSpaceMetadataWriter; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadataUpdatable; +import org.apache.bifromq.basekv.localengine.IKVSpaceMetadataWriter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeMetricManager.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeMetricManager.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeMetricManager.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeMetricManager.java index d7cc77f3b..cd38f3a6a 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeMetricManager.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeMetricManager.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Gauge; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryLinearizer.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeQueryLinearizer.java similarity index 97% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryLinearizer.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeQueryLinearizer.java index f0bbb0239..0f83d0445 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryLinearizer.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeQueryLinearizer.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Maps; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryRunner.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeQueryRunner.java similarity index 89% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryRunner.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeQueryRunner.java index 712929e9b..6ad0b2a77 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryRunner.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeQueryRunner.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.proto.State.StateType.Merged; -import static com.baidu.bifromq.basekv.proto.State.StateType.Removed; -import static com.baidu.bifromq.basekv.proto.State.StateType.ToBePurged; -import static com.baidu.bifromq.basekv.store.util.VerUtil.boundaryCompatible; +import static org.apache.bifromq.basekv.proto.State.StateType.Merged; +import static org.apache.bifromq.basekv.proto.State.StateType.Removed; +import static org.apache.bifromq.basekv.proto.State.StateType.ToBePurged; +import static org.apache.bifromq.basekv.store.util.VerUtil.boundaryCompatible; import static java.util.concurrent.CompletableFuture.completedFuture; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.util.List; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorer.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeRestorer.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorer.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeRestorer.java index fcf4c1946..1501fc20f 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorer.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeRestorer.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.KVPair; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataReply; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataRequest; -import com.baidu.bifromq.basekv.proto.SnapshotSyncRequest; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.basekv.proto.KVPair; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataReply; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataRequest; +import org.apache.bifromq.basekv.proto.SnapshotSyncRequest; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.logger.SiftLogger; import io.reactivex.rxjava3.annotations.NonNull; import io.reactivex.rxjava3.observers.DisposableObserver; import io.reactivex.rxjava3.schedulers.Schedulers; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeStatsCollector.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeStatsCollector.java similarity index 85% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeStatsCollector.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeStatsCollector.java index 32aae0bff..9b1006c5d 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeStatsCollector.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeStatsCollector.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; -import com.baidu.bifromq.basekv.store.stats.StatsCollector; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWAL; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.stats.StatsCollector; +import org.apache.bifromq.basekv.store.wal.IKVRangeWAL; import java.time.Duration; import java.util.Map; import java.util.concurrent.Executor; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeWriter.java similarity index 77% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeWriter.java index b6332e99e..366b7777b 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVRangeWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVRangeWriter.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; - -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; -import static com.baidu.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; - -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +package org.apache.bifromq.basekv.store.range; + +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_CLUSTER_CONFIG_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_RANGE_BOUND_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_STATE_BYTES; +import static org.apache.bifromq.basekv.store.range.KVRangeKeys.METADATA_VER_BYTES; + +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVReader.java similarity index 82% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVReader.java index 37af04c08..8257f7cbe 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVReader.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.inRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.inRange; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceReader; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVWriter.java similarity index 85% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVWriter.java index 6bfc67f2f..1d86cd52d 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/KVWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/KVWriter.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVWriter; import com.google.protobuf.ByteString; public class KVWriter implements IKVWriter { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVIterator.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVIterator.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVIterator.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVIterator.java index 0dbb28073..7bb835f34 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVIterator.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVIterator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVIterator; import com.google.protobuf.ByteString; public class LoadRecordableKVIterator implements IKVIterator { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java similarity index 86% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java index 124073779..b14b794a2 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVRangeWriter.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVWriter; public class LoadRecordableKVRangeWriter extends KVRangeWriter { private final IKVLoadRecorder recorder; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVReader.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVReader.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVReader.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVReader.java index 631c0ca5e..740806ee0 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVReader.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVReader.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVReader; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVWriter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVWriter.java similarity index 92% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVWriter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVWriter.java index 29aada44a..6823ccc38 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/LoadRecordableKVWriter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/LoadRecordableKVWriter.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVWriter; import com.google.protobuf.ByteString; class LoadRecordableKVWriter implements IKVWriter { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java index e772105c1..e9c7ccfb2 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/KVLoadBasedSplitHinter.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; import com.google.common.base.Preconditions; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Gauge; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecordWindow.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/LoadRecordWindow.java similarity index 98% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecordWindow.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/LoadRecordWindow.java index 157b56153..704a38857 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecordWindow.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/LoadRecordWindow.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; import static com.google.protobuf.ByteString.unsignedLexicographicalComparator; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java similarity index 86% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java index b26cd2034..74d30d460 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/MutationKVLoadBasedSplitHinter.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java similarity index 89% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java index 764bf661c..286f5c495 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/range/hinter/QueryKVLoadBasedSplitHinter.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/stats/IStatsCollector.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/stats/IStatsCollector.java similarity index 94% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/stats/IStatsCollector.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/stats/IStatsCollector.java index f4f27a19e..016a86da1 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/stats/IStatsCollector.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/stats/IStatsCollector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.stats; +package org.apache.bifromq.basekv.store.stats; import io.reactivex.rxjava3.core.Observable; import java.util.Map; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/stats/StatsCollector.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/stats/StatsCollector.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/stats/StatsCollector.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/stats/StatsCollector.java index c8fad3f16..950eb220e 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/stats/StatsCollector.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/stats/StatsCollector.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.stats; +package org.apache.bifromq.basekv.store.stats; -import com.baidu.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.base.util.AsyncRunner; import com.google.common.collect.Maps; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/ExecutorServiceUtil.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/ExecutorServiceUtil.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/ExecutorServiceUtil.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/ExecutorServiceUtil.java index 24856e8cc..61126837a 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/ExecutorServiceUtil.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/ExecutorServiceUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/KVUtil.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/KVUtil.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/KVUtil.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/KVUtil.java index dc7fd8700..dc3f89a94 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/KVUtil.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/KVUtil.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; import java.nio.ByteBuffer; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/ProcessUtil.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/ProcessUtil.java similarity index 98% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/ProcessUtil.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/ProcessUtil.java index b61dffeae..e232568f1 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/ProcessUtil.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/ProcessUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/VerUtil.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/VerUtil.java similarity index 97% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/VerUtil.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/VerUtil.java index 41b1b1dbc..745f98b1e 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/util/VerUtil.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/util/VerUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; public class VerUtil { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWAL.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWAL.java similarity index 85% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWAL.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWAL.java index 61ccd89df..1c8ba059b 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWAL.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWAL.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; - -import com.baidu.bifromq.basekv.proto.KVRangeCommand; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; +package org.apache.bifromq.basekv.store.wal; + +import org.apache.bifromq.basekv.proto.KVRangeCommand; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import io.reactivex.rxjava3.core.Observable; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALStore.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALStore.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALStore.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALStore.java index 497f60302..87feb4b9f 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALStore.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALStore.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; -import com.baidu.bifromq.basekv.raft.IRaftStateStore; +import org.apache.bifromq.basekv.raft.IRaftStateStore; public interface IKVRangeWALStore extends IRaftStateStore { long size(); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java similarity index 86% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java index 42d1d5825..c8c7a8e45 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALStoreEngine.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.Snapshot; import java.util.Set; public interface IKVRangeWALStoreEngine { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java index f5bcb7f86..a865ff934 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALSubscriber.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.raft.proto.LogEntry; import java.util.concurrent.CompletableFuture; public interface IKVRangeWALSubscriber { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALSubscription.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALSubscription.java similarity index 93% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALSubscription.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALSubscription.java index 557f77c96..615b7ea75 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/IKVRangeWALSubscription.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/IKVRangeWALSubscription.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; public interface IKVRangeWALSubscription { void stop(); diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWAL.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWAL.java similarity index 88% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWAL.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWAL.java index c38be2b27..089dd74f4 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWAL.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWAL.java @@ -11,32 +11,32 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; import static java.util.Collections.emptyMap; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.baseenv.ZeroCopyParser; -import com.baidu.bifromq.basekv.proto.KVRangeCommand; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.RaftConfig; -import com.baidu.bifromq.basekv.raft.RaftNode; -import com.baidu.bifromq.basekv.raft.event.CommitEvent; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.event.RaftEvent; -import com.baidu.bifromq.basekv.raft.event.SnapshotRestoredEvent; -import com.baidu.bifromq.basekv.raft.event.StatusChangedEvent; -import com.baidu.bifromq.basekv.raft.event.SyncStateChangedEvent; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.ZeroCopyParser; +import org.apache.bifromq.basekv.proto.KVRangeCommand; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.RaftConfig; +import org.apache.bifromq.basekv.raft.RaftNode; +import org.apache.bifromq.basekv.raft.event.CommitEvent; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.event.RaftEvent; +import org.apache.bifromq.basekv.raft.event.SnapshotRestoredEvent; +import org.apache.bifromq.basekv.raft.event.StatusChangedEvent; +import org.apache.bifromq.basekv.raft.event.SyncStateChangedEvent; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALKeys.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALKeys.java similarity index 95% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALKeys.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALKeys.java index 714118323..2b0ab9795 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALKeys.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALKeys.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.store.util.KVUtil; +import org.apache.bifromq.basekv.store.util.KVUtil; import com.google.protobuf.ByteString; class KVRangeWALKeys { diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java similarity index 87% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java index 208162dc0..f5b683e75 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStorageEngine.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; - -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_LATEST_SNAPSHOT_BYTES; - -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.IWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.IWALableKVSpace; -import com.baidu.bifromq.basekv.localengine.KVEngineFactory; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +package org.apache.bifromq.basekv.store.wal; + +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_LATEST_SNAPSHOT_BYTES; + +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.IWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.IWALableKVSpace; +import org.apache.bifromq.basekv.localengine.KVEngineFactory; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStore.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStore.java similarity index 88% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStore.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStore.java index 74045a2ad..1164a3027 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStore.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStore.java @@ -11,38 +11,38 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; - -import static com.baidu.bifromq.basekv.store.util.KVUtil.toByteString; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_CONFIG_ENTRY_INDEXES_BYTES; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_CURRENT_TERM_BYTES; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_CURRENT_VOTING_BYTES; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_LATEST_SNAPSHOT_BYTES; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_LOG_ENTRIES_INCAR; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_PREFIX_LOG_ENTRIES_BYTES; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.configEntriesKey; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.configEntriesKeyPrefixInfix; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.logEntriesKeyPrefixInfix; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.logEntryKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; +package org.apache.bifromq.basekv.store.wal; + +import static org.apache.bifromq.basekv.store.util.KVUtil.toByteString; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_CONFIG_ENTRY_INDEXES_BYTES; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_CURRENT_TERM_BYTES; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_CURRENT_VOTING_BYTES; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_LATEST_SNAPSHOT_BYTES; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_LOG_ENTRIES_INCAR; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.KEY_PREFIX_LOG_ENTRIES_BYTES; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.configEntriesKey; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.configEntriesKeyPrefixInfix; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.logEntriesKeyPrefixInfix; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.logEntryKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; import static java.lang.String.format; -import com.baidu.bifromq.baseenv.ZeroCopyParser; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.localengine.IWALableKVSpace; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.store.util.KVUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.baseenv.ZeroCopyParser; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.localengine.IWALableKVSpace; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.store.util.KVUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALSubscription.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALSubscription.java similarity index 96% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALSubscription.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALSubscription.java index 38e39a059..96e5139a8 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALSubscription.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/KVRangeWALSubscription.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; -import com.baidu.bifromq.base.util.AsyncRunner; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.logger.SiftLogger; +import org.apache.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.logger.SiftLogger; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.disposables.CompositeDisposable; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/LogEntryIteratorPool.java b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/LogEntryIteratorPool.java similarity index 90% rename from base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/LogEntryIteratorPool.java rename to base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/LogEntryIteratorPool.java index c50ae92b6..ff8c859e9 100644 --- a/base-kv/base-kv-store-server/src/main/java/com/baidu/bifromq/basekv/store/wal/LogEntryIteratorPool.java +++ b/base-kv/base-kv-store-server/src/main/java/org/apache/bifromq/basekv/store/wal/LogEntryIteratorPool.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; -import static com.baidu.bifromq.basekv.store.wal.KVRangeWALKeys.logEntryKey; +import static org.apache.bifromq.basekv.store.wal.KVRangeWALKeys.logEntryKey; -import com.baidu.bifromq.baseenv.ZeroCopyParser; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IWALableKVSpace; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.baseenv.ZeroCopyParser; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IWALableKVSpace; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; import com.google.protobuf.ByteString; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/MockableTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/MockableTest.java similarity index 98% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/MockableTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/MockableTest.java index e980e5ffd..219b9ed11 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/MockableTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/MockableTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; import java.lang.reflect.Method; import lombok.SneakyThrows; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestCoProc.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestCoProc.java similarity index 77% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestCoProc.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestCoProc.java index 9ff4e360d..581d53b46 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestCoProc.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestCoProc.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; - -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; +package org.apache.bifromq.basekv; + +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; import com.google.protobuf.ByteString; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestCoProcFactory.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestCoProcFactory.java similarity index 78% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestCoProcFactory.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestCoProcFactory.java index 535ea8bae..360bec941 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestCoProcFactory.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestCoProcFactory.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; import java.util.function.Supplier; public class TestCoProcFactory implements IKVRangeCoProcFactory { diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestUtil.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestUtil.java similarity index 97% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestUtil.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestUtil.java index ae7a3c476..b6565feea 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/TestUtil.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/TestUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/annotation/Cluster.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/annotation/Cluster.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/annotation/Cluster.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/annotation/Cluster.java index 67b479d8d..eded058d3 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/annotation/Cluster.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/annotation/Cluster.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.annotation; +package org.apache.bifromq.basekv.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/benchmark/SingleNodeBenchmark.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/benchmark/SingleNodeBenchmark.java similarity index 92% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/benchmark/SingleNodeBenchmark.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/benchmark/SingleNodeBenchmark.java index 7ac35e2f7..fe72a0448 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/benchmark/SingleNodeBenchmark.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/benchmark/SingleNodeBenchmark.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.benchmark; +package org.apache.bifromq.basekv.benchmark; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.KVRangeConfig; -import com.baidu.bifromq.basekv.store.KVRangeStoreTestCluster; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.KVRangeConfig; +import org.apache.bifromq.basekv.store.KVRangeStoreTestCluster; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java similarity index 91% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java index 39f7fd89f..19cd536c1 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/benchmark/SplitKeyEstimatorBenchmark.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.benchmark; +package org.apache.bifromq.basekv.benchmark; -import com.baidu.bifromq.basekv.store.range.IKVLoadRecorder; -import com.baidu.bifromq.basekv.store.range.KVLoadRecorder; -import com.baidu.bifromq.basekv.store.range.hinter.QueryKVLoadBasedSplitHinter; +import org.apache.bifromq.basekv.store.range.IKVLoadRecorder; +import org.apache.bifromq.basekv.store.range.KVLoadRecorder; +import org.apache.bifromq.basekv.store.range.hinter.QueryKVLoadBasedSplitHinter; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.concurrent.ThreadLocalRandom; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/AgentHostStoreMessengerTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/AgentHostStoreMessengerTest.java similarity index 90% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/AgentHostStoreMessengerTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/AgentHostStoreMessengerTest.java index eb71e6367..56861b4d8 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/AgentHostStoreMessengerTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/AgentHostStoreMessengerTest.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; -import static com.baidu.bifromq.basekv.Constants.toBaseKVAgentId; +import static org.apache.bifromq.basekv.Constants.toBaseKVAgentId; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecluster.agent.proto.AgentMemberAddr; -import com.baidu.bifromq.basecluster.agent.proto.AgentMessage; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgent; -import com.baidu.bifromq.basecluster.memberlist.agent.IAgentMember; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecluster.agent.proto.AgentMemberAddr; +import org.apache.bifromq.basecluster.agent.proto.AgentMessage; +import org.apache.bifromq.basecluster.memberlist.agent.IAgent; +import org.apache.bifromq.basecluster.memberlist.agent.IAgentMember; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.subjects.PublishSubject; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/MutatePipelineTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/MutatePipelineTest.java similarity index 90% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/MutatePipelineTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/MutatePipelineTest.java index db0f7ae95..aebd6ced2 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/MutatePipelineTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/MutatePipelineTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.Put; -import com.baidu.bifromq.basekv.store.IKVRangeStore; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.Put; +import org.apache.bifromq.basekv.store.IKVRangeStore; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import io.grpc.stub.ServerCallStreamObserver; import java.util.concurrent.CompletableFuture; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/QueryPipelineTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/QueryPipelineTest.java similarity index 93% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/QueryPipelineTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/QueryPipelineTest.java index dd05aa9bf..c8277ca93 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/server/QueryPipelineTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/server/QueryPipelineTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.server; +package org.apache.bifromq.basekv.server; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.IKVRangeStore; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.IKVRangeStore; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import io.grpc.stub.ServerCallStreamObserver; import java.util.ArrayList; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeBootstrapTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeBootstrapTest.java similarity index 86% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeBootstrapTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeBootstrapTest.java index 5f39a4bf2..60912e4da 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeBootstrapTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeBootstrapTest.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.proto.State.StateType.Normal; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.proto.State.StateType.Normal; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static java.util.Collections.emptyMap; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.TestCoProcFactory; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeSyncState; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.TestCoProcFactory; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.RaftNodeSyncState; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.Any; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.PublishSubject; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeConfig.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeConfig.java similarity index 82% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeConfig.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeConfig.java index 156b019da..7cff4ea6c 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeConfig.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeConfig.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeMessengerTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeMessengerTest.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeMessengerTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeMessengerTest.java index c91770ae7..32484d084 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeMessengerTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeMessengerTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import io.reactivex.rxjava3.observers.TestObserver; import io.reactivex.rxjava3.subjects.PublishSubject; import java.lang.reflect.Method; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java similarity index 91% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java index 7e5646028..bac852806 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterBootstrapTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basekv.annotation.Cluster; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.annotation.Cluster; +import org.apache.bifromq.basekv.proto.KVRangeId; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java similarity index 98% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java index ac5781bf4..ec0be672c 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterConfigChangeTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static java.util.Collections.emptySet; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basekv.annotation.Cluster; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.annotation.Cluster; +import org.apache.bifromq.basekv.proto.KVRangeId; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java similarity index 97% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java index 75d6ec2f9..f5ddf3996 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterMergeTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.proto.State.StateType.Merged; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compare; +import static org.apache.bifromq.basekv.proto.State.StateType.Merged; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compare; import static com.google.protobuf.ByteString.copyFromUtf8; import static java.util.Collections.emptySet; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.basekv.annotation.Cluster; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.annotation.Cluster; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.collect.Sets; import java.time.Duration; import java.util.Objects; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterRWTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterRWTest.java similarity index 98% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterRWTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterRWTest.java index fdacb0c9f..5021f2841 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterRWTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterRWTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static com.google.protobuf.ByteString.copyFromUtf8; import static java.util.Collections.emptySet; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java similarity index 91% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java index f1cbcf20b..057f79b84 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterRecoveryTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus.Candidate; +import static org.apache.bifromq.basekv.raft.proto.RaftNodeStatus.Candidate; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.annotation.Cluster; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.exception.KVRangeStoreException; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.annotation.Cluster; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.exception.KVRangeStoreException; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import java.time.Duration; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java index 8d8e7defe..8123d58fb 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterSplitTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.util.VerUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.util.VerUtil; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java similarity index 92% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java index 7ea495d72..43f6e1b42 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreClusterTestTemplate.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static org.awaitility.Awaitility.await; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.annotation.Cluster; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.option.KVRangeOptions; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.annotation.Cluster; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.option.KVRangeOptions; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import java.lang.reflect.Method; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java similarity index 93% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java index d1c21e72b..7b14d136a 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreStatsCollectorTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; import com.google.common.util.concurrent.MoreExecutors; import io.reactivex.rxjava3.observers.TestObserver; import java.time.Duration; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTest.java similarity index 93% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTest.java index 464019f5a..1f1da524e 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.proto.State.StateType.Merged; -import static com.baidu.bifromq.basekv.proto.State.StateType.Normal; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.combine; +import static org.apache.bifromq.basekv.proto.State.StateType.Merged; +import static org.apache.bifromq.basekv.proto.State.StateType.Normal; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.combine; import static com.google.protobuf.ByteString.copyFromUtf8; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -27,28 +27,28 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.TestCoProcFactory; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.proto.EnsureRange; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.util.VerUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.TestCoProcFactory; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.proto.EnsureRange; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.util.VerUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.PublishSubject; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTestCluster.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTestCluster.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTestCluster.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTestCluster.java index b939693f5..f5734bc99 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTestCluster.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTestCluster.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static org.awaitility.Awaitility.await; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.TestCoProcFactory; -import com.baidu.bifromq.basekv.TestUtil; -import com.baidu.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.proto.StoreMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.TestCoProcFactory; +import org.apache.bifromq.basekv.TestUtil; +import org.apache.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.proto.StoreMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java index 60bd7d78c..a7da89bf2 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/KVRangeStoreTransferLeadershipTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store; +package org.apache.bifromq.basekv.store; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.exception.LeaderTransferException; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.exception.LeaderTransferException; +import org.apache.bifromq.basekv.store.exception.KVRangeException; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeTest.java similarity index 81% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeTest.java index 2feb9c09b..8c8eb78c2 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/AbstractKVRangeTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/AbstractKVRangeTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.TestUtil; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.localengine.IKVEngine; -import com.baidu.bifromq.basekv.localengine.KVEngineFactory; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.TestUtil; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.localengine.IKVEngine; +import org.apache.bifromq.basekv.localengine.KVEngineFactory; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; import java.lang.reflect.Method; import java.nio.file.Files; import java.nio.file.Path; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeDumpSessionTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeDumpSessionTest.java similarity index 96% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeDumpSessionTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeDumpSessionTest.java index 0e6d25705..76e132605 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeDumpSessionTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeDumpSessionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -24,14 +24,14 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataReply; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataRequest; -import com.baidu.bifromq.basekv.proto.SnapshotSyncRequest; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataReply; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataRequest; +import org.apache.bifromq.basekv.proto.SnapshotSyncRequest; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.subjects.PublishSubject; import java.time.Duration; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeIteratorTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeIteratorTest.java similarity index 93% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeIteratorTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeIteratorTest.java index 3406b6cc2..fe1741846 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeIteratorTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeIteratorTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.store.api.IKVIterator; import com.google.protobuf.ByteString; import org.mockito.ArgumentCaptor; import org.mockito.Mock; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeMetadataTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeMetadataTest.java similarity index 89% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeMetadataTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeMetadataTest.java index ee20bad38..6e3836050 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeMetadataTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeMetadataTest.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import io.reactivex.rxjava3.core.Maybe; import java.util.concurrent.TimeUnit; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java similarity index 96% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java index b2878b963..f510fbf4f 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeQueryLinearizerTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.MockableTest; import com.google.common.util.concurrent.MoreExecutors; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java similarity index 94% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java index 11c145e7f..b9d3a5f9b 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeQueryRunnerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static org.mockito.ArgumentMatchers.any; @@ -22,15 +22,15 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.util.VerUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.util.VerUtil; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorerTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeRestorerTest.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorerTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeRestorerTest.java index dad2d530a..b4adae136 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeRestorerTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeRestorerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -22,11 +22,11 @@ import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeMessage; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.SaveSnapshotDataRequest; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeMessage; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.SaveSnapshotDataRequest; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import io.reactivex.rxjava3.subjects.PublishSubject; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java similarity index 85% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java index 8050e18d3..bed6f4d4f 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeStatsCollectorTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.wal.IKVRangeWAL; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.wal.IKVRangeWAL; import com.google.common.util.concurrent.MoreExecutors; import io.reactivex.rxjava3.observers.TestObserver; import java.time.Duration; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeTest.java similarity index 95% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeTest.java index d4966a57f..d9e1caf93 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVRangeTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVRangeTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -21,17 +21,17 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.localengine.ICPableKVSpace; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.localengine.ICPableKVSpace; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVReaderTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVReaderTest.java similarity index 84% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVReaderTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVReaderTest.java index ccece036d..302d56668 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVReaderTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVReaderTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -21,14 +21,14 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.localengine.IKVSpaceIterator; -import com.baidu.bifromq.basekv.localengine.IKVSpaceReader; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.localengine.IKVSpaceIterator; +import org.apache.bifromq.basekv.localengine.IKVSpaceReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeReader; +import org.apache.bifromq.basekv.store.api.IKVReader; import com.google.protobuf.ByteString; import java.lang.reflect.Method; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVWriterTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVWriterTest.java similarity index 88% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVWriterTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVWriterTest.java index b8dfa1d6a..6ef753bbc 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/KVWriterTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/KVWriterTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range; +package org.apache.bifromq.basekv.store.range; import static org.mockito.Mockito.verify; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.localengine.IKVSpaceWriter; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.localengine.IKVSpaceWriter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVWriter; import com.google.protobuf.ByteString; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecorderTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/LoadRecorderTest.java similarity index 87% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecorderTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/LoadRecorderTest.java index a1aa1b6f1..fdfff1ddd 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/LoadRecorderTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/LoadRecorderTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.range.IKVLoadRecorder; -import com.baidu.bifromq.basekv.store.range.KVLoadRecorder; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.range.IKVLoadRecorder; +import org.apache.bifromq.basekv.store.range.KVLoadRecorder; import com.google.protobuf.ByteString; import java.util.function.Supplier; import org.mockito.Mock; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java similarity index 90% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java index ca2a52ac0..cd7ad7828 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/QueryKVIOBasedSplitHinterTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; -import static com.baidu.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_DENSITY; +import static org.apache.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_DENSITY; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -21,10 +21,10 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.store.range.IKVLoadRecorder; -import com.baidu.bifromq.basekv.store.range.KVLoadRecorder; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.store.range.IKVLoadRecorder; +import org.apache.bifromq.basekv.store.range.KVLoadRecorder; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.Optional; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java similarity index 94% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java index 0fc31a4a9..35809a934 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/range/hinter/RecordingWindowSlotTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.range.hinter; +package org.apache.bifromq.basekv.store.range.hinter; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.range.KVLoadRecorder; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.range.KVLoadRecorder; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.function.Supplier; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/stats/StatsCollectorTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/stats/StatsCollectorTest.java similarity index 97% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/stats/StatsCollectorTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/stats/StatsCollectorTest.java index 984640fde..e8dafbaa5 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/stats/StatsCollectorTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/stats/StatsCollectorTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.stats; +package org.apache.bifromq.basekv.store.stats; import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.Mockito.doAnswer; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.MockableTest; import com.google.common.util.concurrent.AtomicDouble; import com.google.common.util.concurrent.MoreExecutors; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/KVUtilTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/KVUtilTest.java similarity index 77% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/KVUtilTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/KVUtilTest.java index 8bbe69c30..dd3710ace 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/KVUtilTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/KVUtilTest.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; -import static com.baidu.bifromq.basekv.store.util.KVUtil.cap; -import static com.baidu.bifromq.basekv.store.util.KVUtil.toByteString; -import static com.baidu.bifromq.basekv.store.util.KVUtil.toInt; -import static com.baidu.bifromq.basekv.store.util.KVUtil.toKVRangeId; -import static com.baidu.bifromq.basekv.store.util.KVUtil.toLong; -import static com.baidu.bifromq.basekv.store.util.KVUtil.toLongNativeOrder; +import static org.apache.bifromq.basekv.store.util.KVUtil.cap; +import static org.apache.bifromq.basekv.store.util.KVUtil.toByteString; +import static org.apache.bifromq.basekv.store.util.KVUtil.toInt; +import static org.apache.bifromq.basekv.store.util.KVUtil.toKVRangeId; +import static org.apache.bifromq.basekv.store.util.KVUtil.toLong; +import static org.apache.bifromq.basekv.store.util.KVUtil.toLongNativeOrder; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/ProcessUtilTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/ProcessUtilTest.java similarity index 90% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/ProcessUtilTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/ProcessUtilTest.java index 3f9f340c0..cf6d02c7d 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/ProcessUtilTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/ProcessUtilTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.MockableTest; import org.testng.annotations.Test; public class ProcessUtilTest extends MockableTest { diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/VerUtilTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/VerUtilTest.java similarity index 97% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/VerUtilTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/VerUtilTest.java index afd31d222..c50bfa71f 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/util/VerUtilTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/util/VerUtilTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.util; +package org.apache.bifromq.basekv.store.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.MockableTest; import org.testng.annotations.Test; public class VerUtilTest extends MockableTest { diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java similarity index 93% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java index 80bbea294..9b2fbbb20 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStoreEngineTest.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.TestUtil; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.raft.IRaftStateStore; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.TestUtil; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.raft.IRaftStateStore; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.protobuf.ByteString; import java.io.File; import java.lang.reflect.Method; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStoreTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStoreTest.java similarity index 83% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStoreTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStoreTest.java index 7d6ee67f9..d69bd172b 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALStoreTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALStoreTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; -import com.baidu.bifromq.basekv.TestUtil; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.raft.BasicStateStoreTest; -import com.baidu.bifromq.basekv.raft.IRaftStateStore; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.TestUtil; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.raft.BasicStateStoreTest; +import org.apache.bifromq.basekv.raft.IRaftStateStore; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java similarity index 97% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java index 4c7fbd65d..b47b6584d 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALSubscriptionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -25,12 +25,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.store.exception.KVRangeException; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.store.exception.KVRangeException; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.collect.Iterators; import com.google.common.util.concurrent.MoreExecutors; import io.reactivex.rxjava3.subjects.BehaviorSubject; diff --git a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALTest.java b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALTest.java similarity index 91% rename from base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALTest.java rename to base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALTest.java index 03b30f646..10b6f6874 100644 --- a/base-kv/base-kv-store-server/src/test/java/com/baidu/bifromq/basekv/store/wal/KVRangeWALTest.java +++ b/base-kv/base-kv-store-server/src/test/java/org/apache/bifromq/basekv/store/wal/KVRangeWALTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.store.wal; +package org.apache.bifromq.basekv.store.wal; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -24,23 +24,23 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.MockableTest; -import com.baidu.bifromq.basekv.proto.KVRangeCommand; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeSnapshot; -import com.baidu.bifromq.basekv.raft.IRaftNode; -import com.baidu.bifromq.basekv.raft.IRaftStateStore; -import com.baidu.bifromq.basekv.raft.InMemoryStateStore; -import com.baidu.bifromq.basekv.raft.RaftConfig; -import com.baidu.bifromq.basekv.raft.event.CommitEvent; -import com.baidu.bifromq.basekv.raft.event.ElectionEvent; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.basekv.raft.proto.LogEntry; -import com.baidu.bifromq.basekv.raft.proto.RaftMessage; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.raft.proto.Snapshot; -import com.baidu.bifromq.basekv.raft.proto.Voting; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.MockableTest; +import org.apache.bifromq.basekv.proto.KVRangeCommand; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeSnapshot; +import org.apache.bifromq.basekv.raft.IRaftNode; +import org.apache.bifromq.basekv.raft.IRaftStateStore; +import org.apache.bifromq.basekv.raft.InMemoryStateStore; +import org.apache.bifromq.basekv.raft.RaftConfig; +import org.apache.bifromq.basekv.raft.event.CommitEvent; +import org.apache.bifromq.basekv.raft.event.ElectionEvent; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.basekv.raft.proto.LogEntry; +import org.apache.bifromq.basekv.raft.proto.RaftMessage; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.raft.proto.Snapshot; +import org.apache.bifromq.basekv.raft.proto.Voting; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import com.google.common.util.concurrent.MoreExecutors; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/base-kv/base-kv-store-server/src/test/resources/logback.xml b/base-kv/base-kv-store-server/src/test/resources/logback.xml index 2219bc45b..29938bba3 100644 --- a/base-kv/base-kv-store-server/src/test/resources/logback.xml +++ b/base-kv/base-kv-store-server/src/test/resources/logback.xml @@ -19,7 +19,7 @@ - + diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/Constants.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/Constants.java similarity index 95% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/Constants.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/Constants.java index 7d8e51a2e..3c7899316 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/Constants.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/Constants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv; +package org.apache.bifromq.basekv; public class Constants { public static String BaseKVAgentPrefix = "BaseKV:"; diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/BoundaryUtil.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/BoundaryUtil.java similarity index 99% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/BoundaryUtil.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/BoundaryUtil.java index e90c22403..461bdf450 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/BoundaryUtil.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/BoundaryUtil.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Iterator; import java.util.NavigableSet; diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/DescriptorUtil.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/DescriptorUtil.java similarity index 93% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/DescriptorUtil.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/DescriptorUtil.java index 988913c5b..05e03c189 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/DescriptorUtil.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/DescriptorUtil.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Comparator; import java.util.HashMap; diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/EffectiveEpoch.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/EffectiveEpoch.java similarity index 89% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/EffectiveEpoch.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/EffectiveEpoch.java index 7f85755f5..e49bb7b03 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/EffectiveEpoch.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/EffectiveEpoch.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; import java.util.Set; /** diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/EffectiveRoute.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/EffectiveRoute.java similarity index 90% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/EffectiveRoute.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/EffectiveRoute.java index 153dccb95..e48f19750 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/EffectiveRoute.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/EffectiveRoute.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import java.util.NavigableMap; /** diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/KVRangeIdUtil.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/KVRangeIdUtil.java similarity index 93% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/KVRangeIdUtil.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/KVRangeIdUtil.java index a29d6ac7e..683e56fc2 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/KVRangeIdUtil.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/KVRangeIdUtil.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.KVRangeId; /** * Utility class for generating and manipulating KVRangeId objects. diff --git a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/LeaderRange.java b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/LeaderRange.java similarity index 84% rename from base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/LeaderRange.java rename to base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/LeaderRange.java index 0a4e116a1..6e65f0c0a 100644 --- a/base-kv/base-kv-type-proto/src/main/java/com/baidu/bifromq/basekv/utils/LeaderRange.java +++ b/base-kv/base-kv-type-proto/src/main/java/org/apache/bifromq/basekv/utils/LeaderRange.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; /** * The descriptors of leader range and its hosting store. diff --git a/base-kv/base-kv-type-proto/src/main/proto/basekv/Descriptor.proto b/base-kv/base-kv-type-proto/src/main/proto/basekv/Descriptor.proto index 0bfa4b229..87de127ff 100644 --- a/base-kv/base-kv-type-proto/src/main/proto/basekv/Descriptor.proto +++ b/base-kv/base-kv-type-proto/src/main/proto/basekv/Descriptor.proto @@ -7,7 +7,7 @@ import "basekv/raft/Enums.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message SplitHint{ diff --git a/base-kv/base-kv-type-proto/src/main/proto/basekv/Snapshot.proto b/base-kv/base-kv-type-proto/src/main/proto/basekv/Snapshot.proto index 0a0bb6246..42673202f 100644 --- a/base-kv/base-kv-type-proto/src/main/proto/basekv/Snapshot.proto +++ b/base-kv/base-kv-type-proto/src/main/proto/basekv/Snapshot.proto @@ -5,7 +5,7 @@ import "basekv/raft/ClusterConfig.proto"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message State{ diff --git a/base-kv/base-kv-type-proto/src/main/proto/basekv/Type.proto b/base-kv/base-kv-type-proto/src/main/proto/basekv/Type.proto index ea3fdac46..311a1e0f6 100644 --- a/base-kv/base-kv-type-proto/src/main/proto/basekv/Type.proto +++ b/base-kv/base-kv-type-proto/src/main/proto/basekv/Type.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package basekv; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.basekv.proto"; +option java_package = "org.apache.bifromq.basekv.proto"; option optimize_for = SPEED; message KVRangeId{ diff --git a/base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/BoundaryUtilTest.java b/base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/BoundaryUtilTest.java similarity index 97% rename from base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/BoundaryUtilTest.java rename to base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/BoundaryUtilTest.java index 166104b0c..9e454ede1 100644 --- a/base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/BoundaryUtilTest.java +++ b/base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/BoundaryUtilTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; - -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.MIN_KEY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.inRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isSplittable; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.split; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; +package org.apache.bifromq.basekv.utils; + +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.MIN_KEY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.NULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.inRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isSplittable; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.split; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; import static com.google.protobuf.ByteString.EMPTY; import static com.google.protobuf.ByteString.copyFrom; import static com.google.protobuf.ByteString.copyFromUtf8; @@ -30,7 +30,7 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.Set; import org.testng.annotations.Test; diff --git a/base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/DescriptorUtilTest.java b/base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/DescriptorUtilTest.java similarity index 97% rename from base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/DescriptorUtilTest.java rename to base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/DescriptorUtilTest.java index 791aa17a0..b798159d9 100644 --- a/base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/DescriptorUtilTest.java +++ b/base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/DescriptorUtilTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.organizeByEpoch; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.organizeByEpoch; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; import com.google.protobuf.ByteString; import java.util.Arrays; import java.util.HashSet; diff --git a/base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/KVRangeIdUtilTest.java b/base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/KVRangeIdUtilTest.java similarity index 92% rename from base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/KVRangeIdUtilTest.java rename to base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/KVRangeIdUtilTest.java index 2dd0cd524..1673dcdad 100644 --- a/base-kv/base-kv-type-proto/src/test/java/com/baidu/bifromq/basekv/utils/KVRangeIdUtilTest.java +++ b/base-kv/base-kv-type-proto/src/test/java/org/apache/bifromq/basekv/utils/KVRangeIdUtilTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basekv.utils; +package org.apache.bifromq.basekv.utils; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import lombok.SneakyThrows; import org.testng.annotations.Test; diff --git a/base-logger/src/main/java/com/baidu/bifromq/logger/FormatableLogger.java b/base-logger/src/main/java/org/apache/bifromq/logger/FormatableLogger.java similarity index 98% rename from base-logger/src/main/java/com/baidu/bifromq/logger/FormatableLogger.java rename to base-logger/src/main/java/org/apache/bifromq/logger/FormatableLogger.java index 8a6fccdfe..41087d2e6 100644 --- a/base-logger/src/main/java/com/baidu/bifromq/logger/FormatableLogger.java +++ b/base-logger/src/main/java/org/apache/bifromq/logger/FormatableLogger.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.logger; +package org.apache.bifromq.logger; -import static com.baidu.bifromq.logger.LogFormatter.STRINGIFIER_MAP; +import static org.apache.bifromq.logger.LogFormatter.STRINGIFIER_MAP; import org.reflections.Reflections; import org.slf4j.Logger; @@ -26,7 +26,7 @@ public class FormatableLogger implements Logger { if (root instanceof ch.qos.logback.classic.Logger) { ((ch.qos.logback.classic.Logger) root).getLoggerContext() .getFrameworkPackages().add(FormatableLogger.class.getName()); - Reflections reflections = new Reflections("com.baidu.bifromq"); + Reflections reflections = new Reflections("org.apache.bifromq"); for (Class subLoggerClass : reflections.getSubTypesOf(FormatableLogger.class)) { ((ch.qos.logback.classic.Logger) root).getLoggerContext() .getFrameworkPackages().add(subLoggerClass.getName()); diff --git a/base-logger/src/main/java/com/baidu/bifromq/logger/LogFormatter.java b/base-logger/src/main/java/org/apache/bifromq/logger/LogFormatter.java similarity index 96% rename from base-logger/src/main/java/com/baidu/bifromq/logger/LogFormatter.java rename to base-logger/src/main/java/org/apache/bifromq/logger/LogFormatter.java index e1bb75296..a48d7efed 100644 --- a/base-logger/src/main/java/com/baidu/bifromq/logger/LogFormatter.java +++ b/base-logger/src/main/java/org/apache/bifromq/logger/LogFormatter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.logger; +package org.apache.bifromq.logger; import java.util.IdentityHashMap; diff --git a/base-logger/src/main/java/com/baidu/bifromq/logger/SiftKeyUtil.java b/base-logger/src/main/java/org/apache/bifromq/logger/SiftKeyUtil.java similarity index 96% rename from base-logger/src/main/java/com/baidu/bifromq/logger/SiftKeyUtil.java rename to base-logger/src/main/java/org/apache/bifromq/logger/SiftKeyUtil.java index b49945d0e..2e9cec368 100644 --- a/base-logger/src/main/java/com/baidu/bifromq/logger/SiftKeyUtil.java +++ b/base-logger/src/main/java/org/apache/bifromq/logger/SiftKeyUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.logger; +package org.apache.bifromq.logger; public class SiftKeyUtil { /** diff --git a/base-logger/src/main/java/com/baidu/bifromq/logger/SiftLogger.java b/base-logger/src/main/java/org/apache/bifromq/logger/SiftLogger.java similarity index 99% rename from base-logger/src/main/java/com/baidu/bifromq/logger/SiftLogger.java rename to base-logger/src/main/java/org/apache/bifromq/logger/SiftLogger.java index 459d5cb32..7dd46ed9f 100644 --- a/base-logger/src/main/java/com/baidu/bifromq/logger/SiftLogger.java +++ b/base-logger/src/main/java/org/apache/bifromq/logger/SiftLogger.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.logger; +package org.apache.bifromq.logger; import org.slf4j.Logger; import org.slf4j.MDC; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/BiDiStream.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/BiDiStream.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/BiDiStream.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/BiDiStream.java index a686d98fd..92d0a639b 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/BiDiStream.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/BiDiStream.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import static io.grpc.stub.ClientCalls.asyncBidiStreamingCall; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.client.util.FastBehaviorSubject; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.client.util.FastBehaviorSubject; import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.Context; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ClientChannel.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ClientChannel.java similarity index 90% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ClientChannel.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ClientChannel.java index 628041a57..bc3023b7b 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ClientChannel.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ClientChannel.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.interceptor.TenantAwareClientInterceptor; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerSelector; -import com.baidu.bifromq.baserpc.client.loadbalancer.TrafficDirectiveLoadBalancerProvider; -import com.baidu.bifromq.baserpc.client.nameresolver.TrafficGovernorNameResolverProvider; -import com.baidu.bifromq.baserpc.client.util.FastBehaviorSubject; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.interceptor.TenantAwareClientInterceptor; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerSelector; +import org.apache.bifromq.baserpc.client.loadbalancer.TrafficDirectiveLoadBalancerProvider; +import org.apache.bifromq.baserpc.client.nameresolver.TrafficGovernorNameResolverProvider; +import org.apache.bifromq.baserpc.client.util.FastBehaviorSubject; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.google.common.util.concurrent.MoreExecutors; import io.grpc.Channel; import io.grpc.ConnectivityState; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ConnStateListener.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ConnStateListener.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ConnStateListener.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ConnStateListener.java index 2de40b0b8..751add150 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ConnStateListener.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ConnStateListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import io.grpc.ConnectivityState; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/DummyServerSelector.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/DummyServerSelector.java similarity index 90% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/DummyServerSelector.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/DummyServerSelector.java index fffd45dbc..e63726331 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/DummyServerSelector.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/DummyServerSelector.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerGroupRouter; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerSelector; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerGroupRouter; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerSelector; import java.util.Optional; class DummyServerSelector implements IServerSelector { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IBiDiStream.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IBiDiStream.java similarity index 95% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IBiDiStream.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IBiDiStream.java index 10ad5edf6..db9acf572 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IBiDiStream.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IBiDiStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import io.reactivex.rxjava3.core.Observable; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IClientChannel.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IClientChannel.java similarity index 90% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IClientChannel.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IClientChannel.java index ed63e490d..e6d8d8406 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IClientChannel.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IClientChannel.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerSelector; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerSelector; import io.grpc.Channel; import io.reactivex.rxjava3.core.Observable; import java.util.Map; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IConnectable.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IConnectable.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IConnectable.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IConnectable.java index 882613e54..4af12879e 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IConnectable.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IConnectable.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import io.reactivex.rxjava3.core.Observable; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IRPCClient.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IRPCClient.java similarity index 99% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IRPCClient.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IRPCClient.java index 3a1a0301a..99e4b7904 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IRPCClient.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IRPCClient.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import static java.util.Collections.emptyMap; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IUnaryCaller.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IUnaryCaller.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IUnaryCaller.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IUnaryCaller.java index 0cbe453da..7f6acffa6 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/IUnaryCaller.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/IUnaryCaller.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import static java.util.Collections.emptyMap; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedBiDiStream.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedBiDiStream.java similarity index 98% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedBiDiStream.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedBiDiStream.java index 86940d3f1..2965f2f34 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedBiDiStream.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedBiDiStream.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; import static com.google.common.base.Preconditions.checkArgument; import static java.util.concurrent.TimeUnit.MILLISECONDS; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerGroupRouter; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerSelector; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerGroupRouter; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerSelector; import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.MethodDescriptor; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedMessageStream.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedMessageStream.java similarity index 95% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedMessageStream.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedMessageStream.java index acc02e2b9..7adfd299c 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedMessageStream.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedMessageStream.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.exception.RequestRejectedException; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.exception.RequestRejectedException; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.CallOptions; import io.grpc.MethodDescriptor; import io.reactivex.rxjava3.subjects.PublishSubject; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedRequestPipeline.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedRequestPipeline.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedRequestPipeline.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedRequestPipeline.java index d1a4e44e2..5e3aaa747 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/ManagedRequestPipeline.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/ManagedRequestPipeline.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.exception.RequestAbortException; -import com.baidu.bifromq.baserpc.client.exception.RequestRejectedException; -import com.baidu.bifromq.baserpc.client.exception.RequestThrottledException; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.baserpc.client.exception.ServiceUnavailableException; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.exception.RequestAbortException; +import org.apache.bifromq.baserpc.client.exception.RequestRejectedException; +import org.apache.bifromq.baserpc.client.exception.RequestThrottledException; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.baserpc.client.exception.ServiceUnavailableException; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.CallOptions; import io.grpc.MethodDescriptor; import jakarta.annotation.Nullable; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClient.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/RPCClient.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClient.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/RPCClient.java index 1f546af83..2e3b38d6f 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClient.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/RPCClient.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerSelector; -import com.baidu.bifromq.baserpc.metrics.RPCMeter; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerSelector; +import org.apache.bifromq.baserpc.metrics.RPCMeter; import com.google.common.collect.Maps; import io.grpc.CallOptions; import io.grpc.MethodDescriptor; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClientBuilder.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/RPCClientBuilder.java similarity index 92% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClientBuilder.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/RPCClientBuilder.java index 1dd8eee06..12cd6b5c1 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/RPCClientBuilder.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/RPCClientBuilder.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.google.common.base.Preconditions; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/UnaryCaller.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/UnaryCaller.java similarity index 90% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/UnaryCaller.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/UnaryCaller.java index a2486a668..fa69cca47 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/UnaryCaller.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/UnaryCaller.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client; +package org.apache.bifromq.baserpc.client; -import static com.baidu.bifromq.baserpc.RPCContext.DESIRED_SERVER_ID_CTX_KEY; -import static com.baidu.bifromq.baserpc.RPCContext.TENANT_ID_CTX_KEY; -import static com.baidu.bifromq.baserpc.client.exception.ExceptionUtil.toConcreteException; +import static org.apache.bifromq.baserpc.RPCContext.DESIRED_SERVER_ID_CTX_KEY; +import static org.apache.bifromq.baserpc.RPCContext.TENANT_ID_CTX_KEY; +import static org.apache.bifromq.baserpc.client.exception.ExceptionUtil.toConcreteException; import static io.grpc.stub.ClientCalls.asyncUnaryCall; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.baserpc.client.exception.ServiceUnavailableException; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerGroupRouter; -import com.baidu.bifromq.baserpc.client.loadbalancer.IServerSelector; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.baserpc.client.exception.ServiceUnavailableException; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerGroupRouter; +import org.apache.bifromq.baserpc.client.loadbalancer.IServerSelector; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.Context; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ExceptionUtil.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ExceptionUtil.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ExceptionUtil.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ExceptionUtil.java index b5f5d768c..e9c4b97ef 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ExceptionUtil.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ExceptionUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestAbortException.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestAbortException.java similarity index 93% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestAbortException.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestAbortException.java index 62d1277ba..4341ef965 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestAbortException.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestAbortException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; public class RequestAbortException extends RuntimeException { public RequestAbortException(String reason) { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestCanceledException.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestCanceledException.java similarity index 93% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestCanceledException.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestCanceledException.java index ffa026abe..2e89683ce 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestCanceledException.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestCanceledException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; public class RequestCanceledException extends RuntimeException { public RequestCanceledException(Throwable e) { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestRejectedException.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestRejectedException.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestRejectedException.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestRejectedException.java index 459acdf1d..bc19c2078 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestRejectedException.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestRejectedException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; public class RequestRejectedException extends RuntimeException { public RequestRejectedException(Throwable e) { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestThrottledException.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestThrottledException.java similarity index 93% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestThrottledException.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestThrottledException.java index 80a6e4ab0..6b7661a70 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/RequestThrottledException.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/RequestThrottledException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; public class RequestThrottledException extends RuntimeException { public RequestThrottledException(Throwable e) { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ServerNotFoundException.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ServerNotFoundException.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ServerNotFoundException.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ServerNotFoundException.java index f57d7bbf3..6842074f9 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ServerNotFoundException.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ServerNotFoundException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; public class ServerNotFoundException extends RuntimeException { public ServerNotFoundException(Throwable e) { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ServiceUnavailableException.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ServiceUnavailableException.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ServiceUnavailableException.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ServiceUnavailableException.java index 81e8d266f..6ebcfcbcf 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/exception/ServiceUnavailableException.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/exception/ServiceUnavailableException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.exception; +package org.apache.bifromq.baserpc.client.exception; public class ServiceUnavailableException extends RuntimeException { public ServiceUnavailableException(Throwable e) { diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java similarity index 85% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java index b87341946..715fa2862 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/interceptor/TenantAwareClientInterceptor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.interceptor; +package org.apache.bifromq.baserpc.client.interceptor; -import static com.baidu.bifromq.baserpc.MetadataKeys.CUSTOM_METADATA_META_KEY; -import static com.baidu.bifromq.baserpc.MetadataKeys.TENANT_ID_META_KEY; +import static org.apache.bifromq.baserpc.MetadataKeys.CUSTOM_METADATA_META_KEY; +import static org.apache.bifromq.baserpc.MetadataKeys.TENANT_ID_META_KEY; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.client.loadbalancer.Constants; -import com.baidu.bifromq.baserpc.proto.PipelineMetadata; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.client.loadbalancer.Constants; +import org.apache.bifromq.baserpc.proto.PipelineMetadata; import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.ClientCall; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/ChannelList.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/ChannelList.java similarity index 95% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/ChannelList.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/ChannelList.java index 6b1405b34..edcb4fde8 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/ChannelList.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/ChannelList.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import io.grpc.LoadBalancer; import java.util.ArrayList; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/Constants.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/Constants.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/Constants.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/Constants.java index 140754ef7..cadb9673a 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/Constants.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/Constants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import io.grpc.Attributes; import io.grpc.ConnectivityStateInfo; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java index ca88cf4c6..5473d2141 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerGroupRouter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import java.util.Optional; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerSelector.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerSelector.java similarity index 95% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerSelector.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerSelector.java index 428f72045..86070a728 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerSelector.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerSelector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; /** * The interface for choosing server for load balancing. diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java similarity index 93% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java index 7718f1dc4..9b4640f43 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/IServerSelectorUpdateListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; /** * Callback listener for server selector update. diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/ITenantRouter.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/ITenantRouter.java similarity index 93% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/ITenantRouter.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/ITenantRouter.java index 7095b0f38..0724e29b2 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/ITenantRouter.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/ITenantRouter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; interface ITenantRouter { /** diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/LBUtils.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/LBUtils.java similarity index 97% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/LBUtils.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/LBUtils.java index e0e919711..73485fb60 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/LBUtils.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/LBUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import com.google.common.collect.Lists; import java.util.ArrayList; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java similarity index 91% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java index a946c7a03..a9dd3e44f 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/SubChannelPicker.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; -import static com.baidu.bifromq.baserpc.client.exception.ExceptionUtil.SERVER_NOT_FOUND; -import static com.baidu.bifromq.baserpc.client.exception.ExceptionUtil.SERVER_UNREACHABLE; +import static org.apache.bifromq.baserpc.client.exception.ExceptionUtil.SERVER_NOT_FOUND; +import static org.apache.bifromq.baserpc.client.exception.ExceptionUtil.SERVER_UNREACHABLE; import static io.grpc.ConnectivityState.READY; import io.grpc.LoadBalancer; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TenantRouter.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TenantRouter.java similarity index 98% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TenantRouter.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TenantRouter.java index 4e5290d3a..8214795dc 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TenantRouter.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TenantRouter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java similarity index 96% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java index 32bd74b76..235df125a 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancer.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; -import static com.baidu.bifromq.baserpc.client.loadbalancer.Constants.IN_PROC_SERVER_ATTR_KEY; -import static com.baidu.bifromq.baserpc.client.loadbalancer.Constants.SERVER_GROUP_TAG_ATTR_KEY; -import static com.baidu.bifromq.baserpc.client.loadbalancer.Constants.SERVER_ID_ATTR_KEY; +import static org.apache.bifromq.baserpc.client.loadbalancer.Constants.IN_PROC_SERVER_ATTR_KEY; +import static org.apache.bifromq.baserpc.client.loadbalancer.Constants.SERVER_GROUP_TAG_ATTR_KEY; +import static org.apache.bifromq.baserpc.client.loadbalancer.Constants.SERVER_ID_ATTR_KEY; import static com.google.common.base.Preconditions.checkNotNull; import static io.grpc.ConnectivityState.CONNECTING; import static io.grpc.ConnectivityState.IDLE; @@ -23,7 +23,7 @@ import static io.grpc.ConnectivityState.SHUTDOWN; import static io.grpc.ConnectivityState.TRANSIENT_FAILURE; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import com.google.common.collect.Maps; import io.grpc.Attributes; import io.grpc.ConnectivityState; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java similarity index 93% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java index 1cbe970a5..af6575bb8 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficDirectiveLoadBalancerProvider.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; -import com.baidu.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.BluePrint; import io.grpc.LoadBalancer; import io.grpc.LoadBalancerProvider; import lombok.AllArgsConstructor; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrieMap.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrieMap.java similarity index 99% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrieMap.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrieMap.java index 1e1a466b9..4d2cdc0a9 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrieMap.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/TrieMap.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import java.util.AbstractMap; import java.util.ArrayList; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/WCHRouter.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/WCHRouter.java similarity index 98% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/WCHRouter.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/WCHRouter.java index dbdde26ec..365c19e36 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/WCHRouter.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/WCHRouter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import com.google.common.base.Charsets; import com.google.common.hash.HashCode; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java similarity index 98% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java index 25f66c965..dac1d8faf 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import com.google.common.collect.Maps; import java.util.Collections; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java similarity index 87% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java index a76fe5b84..f431de015 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolver.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.nameresolver; +package org.apache.bifromq.baserpc.client.nameresolver; -import static com.baidu.bifromq.baserpc.client.loadbalancer.Constants.IN_PROC_SERVER_ATTR_KEY; -import static com.baidu.bifromq.baserpc.client.loadbalancer.Constants.SERVER_GROUP_TAG_ATTR_KEY; +import static org.apache.bifromq.baserpc.client.loadbalancer.Constants.IN_PROC_SERVER_ATTR_KEY; +import static org.apache.bifromq.baserpc.client.loadbalancer.Constants.SERVER_GROUP_TAG_ATTR_KEY; -import com.baidu.bifromq.baserpc.client.loadbalancer.Constants; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.ServerEndpoint; +import org.apache.bifromq.baserpc.client.loadbalancer.Constants; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.ServerEndpoint; import io.grpc.Attributes; import io.grpc.EquivalentAddressGroup; import io.grpc.NameResolver; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java similarity index 94% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java index bae5bf785..005bd389f 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/nameresolver/TrafficGovernorNameResolverProvider.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.nameresolver; +package org.apache.bifromq.baserpc.client.nameresolver; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; import io.grpc.NameResolver; import io.grpc.NameResolverProvider; import io.grpc.NameResolverRegistry; diff --git a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/util/FastBehaviorSubject.java b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/util/FastBehaviorSubject.java similarity index 99% rename from base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/util/FastBehaviorSubject.java rename to base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/util/FastBehaviorSubject.java index 668fdb6c0..ec0094649 100644 --- a/base-rpc/base-rpc-client/src/main/java/com/baidu/bifromq/baserpc/client/util/FastBehaviorSubject.java +++ b/base-rpc/base-rpc-client/src/main/java/org/apache/bifromq/baserpc/client/util/FastBehaviorSubject.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.util; +package org.apache.bifromq.baserpc.client.util; import static java.util.Collections.emptySet; diff --git a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java similarity index 98% rename from base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java rename to base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java index 02a25828a..c435351be 100644 --- a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java +++ b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/LBUtilsTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java similarity index 97% rename from base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java rename to base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java index 5e0a6268c..6a73f662e 100644 --- a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java +++ b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/TrafficRouterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrieMapTest.java b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/TrieMapTest.java similarity index 98% rename from base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrieMapTest.java rename to base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/TrieMapTest.java index 10029ee80..733dcdfd3 100644 --- a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/TrieMapTest.java +++ b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/TrieMapTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java similarity index 98% rename from base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java rename to base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java index 1bd4c20ce..27c4e3985 100644 --- a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java +++ b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/WCHRouterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java similarity index 99% rename from base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java rename to base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java index fe5ec44d0..15bd8a01f 100644 --- a/base-rpc/base-rpc-client/src/test/java/com/baidu/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java +++ b/base-rpc/base-rpc-client/src/test/java/org/apache/bifromq/baserpc/client/loadbalancer/WeightedServerGroupRouterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.client.loadbalancer; +package org.apache.bifromq.baserpc.client.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/base-rpc/base-rpc-common/src/main/java/io/grpc/protobuf/lite/EnhancedMarshaller.java b/base-rpc/base-rpc-common/src/main/java/io/grpc/protobuf/lite/EnhancedMarshaller.java index 09d4665a6..aa29b0844 100644 --- a/base-rpc/base-rpc-common/src/main/java/io/grpc/protobuf/lite/EnhancedMarshaller.java +++ b/base-rpc/base-rpc-common/src/main/java/io/grpc/protobuf/lite/EnhancedMarshaller.java @@ -13,7 +13,7 @@ package io.grpc.protobuf.lite; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basehlc.HLC; import com.google.protobuf.CodedInputStream; import com.google.protobuf.ExtensionRegistryLite; import com.google.protobuf.Message; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/BluePrint.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/BluePrint.java similarity index 99% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/BluePrint.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/BluePrint.java index 2100a019e..4c11af849 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/BluePrint.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/BluePrint.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc; +package org.apache.bifromq.baserpc; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/MetadataKeys.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/MetadataKeys.java similarity index 96% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/MetadataKeys.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/MetadataKeys.java index aac3835b8..43a776a94 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/MetadataKeys.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/MetadataKeys.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc; +package org.apache.bifromq.baserpc; import io.grpc.Metadata; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/RPCContext.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/RPCContext.java similarity index 92% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/RPCContext.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/RPCContext.java index 16fa9426c..9f5556ef9 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/RPCContext.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/RPCContext.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc; +package org.apache.bifromq.baserpc; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; import io.grpc.Context; import java.util.Map; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/IRPCMeter.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/IRPCMeter.java similarity index 95% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/IRPCMeter.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/IRPCMeter.java index 90d209df1..bf72155c3 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/IRPCMeter.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/IRPCMeter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.metrics; +package org.apache.bifromq.baserpc.metrics; import io.grpc.MethodDescriptor; import io.micrometer.core.instrument.Timer; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/MetricTag.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/MetricTag.java similarity index 94% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/MetricTag.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/MetricTag.java index 60a64d370..cbe03c69b 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/MetricTag.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/MetricTag.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.metrics; +package org.apache.bifromq.baserpc.metrics; public class MetricTag { public static final String SERVICE = "service"; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMeter.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMeter.java similarity index 94% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMeter.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMeter.java index bc93b7cd1..43a287189 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMeter.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMeter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.metrics; +package org.apache.bifromq.baserpc.metrics; -import com.baidu.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.BluePrint; import io.grpc.MethodDescriptor; import io.grpc.ServiceDescriptor; import java.util.HashMap; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMethodMeter.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMethodMeter.java similarity index 97% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMethodMeter.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMethodMeter.java index 907147553..1177f76c7 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMethodMeter.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMethodMeter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.metrics; +package org.apache.bifromq.baserpc.metrics; -import com.baidu.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.BluePrint; import io.grpc.MethodDescriptor; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; diff --git a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMetric.java b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMetric.java similarity index 98% rename from base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMetric.java rename to base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMetric.java index 19b31000a..7d71fa294 100644 --- a/base-rpc/base-rpc-common/src/main/java/com/baidu/bifromq/baserpc/metrics/RPCMetric.java +++ b/base-rpc/base-rpc-common/src/main/java/org/apache/bifromq/baserpc/metrics/RPCMetric.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.metrics; +package org.apache.bifromq.baserpc.metrics; -import com.baidu.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.BluePrint; import io.micrometer.core.instrument.Meter; public enum RPCMetric { diff --git a/base-rpc/base-rpc-common/src/main/proto/baserpc/PipelineMetadata.proto b/base-rpc/base-rpc-common/src/main/proto/baserpc/PipelineMetadata.proto index 0865a5c2c..f10df9565 100644 --- a/base-rpc/base-rpc-common/src/main/proto/baserpc/PipelineMetadata.proto +++ b/base-rpc/base-rpc-common/src/main/proto/baserpc/PipelineMetadata.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.baserpc.proto"; +option java_package = "org.apache.bifromq.baserpc.proto"; option java_outer_classname = "PipelineMetadataProto"; package baserpc; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AbstractResponsePipeline.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AbstractResponsePipeline.java similarity index 97% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AbstractResponsePipeline.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AbstractResponsePipeline.java index d4fad5be7..cb7c28e96 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AbstractResponsePipeline.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AbstractResponsePipeline.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.base.util.FutureTracker; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.base.util.FutureTracker; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.Status; import io.grpc.stub.StreamObserver; import io.micrometer.core.instrument.Timer; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AbstractStreamObserver.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AbstractStreamObserver.java similarity index 92% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AbstractStreamObserver.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AbstractStreamObserver.java index e50a69423..b3de012e1 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AbstractStreamObserver.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AbstractStreamObserver.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; import io.grpc.stub.ServerCallStreamObserver; import io.grpc.stub.StreamObserver; import java.util.Map; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AckStream.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AckStream.java similarity index 95% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AckStream.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AckStream.java index fdecc3a2a..97bf58958 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/AckStream.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/AckStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.stub.StreamObserver; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.subjects.PublishSubject; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/IRPCServer.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/IRPCServer.java similarity index 94% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/IRPCServer.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/IRPCServer.java index f1156590d..5e0f6fd59 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/IRPCServer.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/IRPCServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; public interface IRPCServer { static RPCServerBuilder newBuilder() { diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/RPCServer.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/RPCServer.java similarity index 96% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/RPCServer.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/RPCServer.java index de7ba6a21..a07c87ab5 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/RPCServer.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/RPCServer.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.baserpc.server.interceptor.TenantAwareServerInterceptor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceServerRegister; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.baserpc.server.interceptor.TenantAwareServerInterceptor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceServerRegister; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import io.grpc.Metadata; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/RPCServerBuilder.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/RPCServerBuilder.java similarity index 92% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/RPCServerBuilder.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/RPCServerBuilder.java index a46bcbe15..0de017813 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/RPCServerBuilder.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/RPCServerBuilder.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.trafficgovernor.GlobalProcessId; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.trafficgovernor.GlobalProcessId; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.google.common.base.Preconditions; import io.grpc.ServerServiceDefinition; import io.netty.handler.ssl.SslContext; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/ResponsePipeline.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/ResponsePipeline.java similarity index 97% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/ResponsePipeline.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/ResponsePipeline.java index cf2bdc32a..c113fb4ab 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/ResponsePipeline.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/ResponsePipeline.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import io.grpc.Status; import io.grpc.stub.StreamObserver; import java.time.Duration; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/UnaryResponse.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/UnaryResponse.java similarity index 91% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/UnaryResponse.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/UnaryResponse.java index 8dc685715..fdb2de157 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/UnaryResponse.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/UnaryResponse.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server; +package org.apache.bifromq.baserpc.server; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.stub.StreamObserver; import io.micrometer.core.instrument.Timer; import java.util.Map; diff --git a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java similarity index 89% rename from base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java rename to base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java index f6b0e19e9..5f5d515d8 100644 --- a/base-rpc/base-rpc-server/src/main/java/com/baidu/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java +++ b/base-rpc/base-rpc-server/src/main/java/org/apache/bifromq/baserpc/server/interceptor/TenantAwareServerInterceptor.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.server.interceptor; +package org.apache.bifromq.baserpc.server.interceptor; -import static com.baidu.bifromq.baserpc.MetadataKeys.CUSTOM_METADATA_META_KEY; -import static com.baidu.bifromq.baserpc.MetadataKeys.TENANT_ID_META_KEY; +import static org.apache.bifromq.baserpc.MetadataKeys.CUSTOM_METADATA_META_KEY; +import static org.apache.bifromq.baserpc.MetadataKeys.TENANT_ID_META_KEY; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.RPCMeter; -import com.baidu.bifromq.baserpc.proto.PipelineMetadata; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.RPCMeter; +import org.apache.bifromq.baserpc.proto.PipelineMetadata; import io.grpc.Context; import io.grpc.Contexts; import io.grpc.ForwardingServerCallListener; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/GlobalProcessId.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/GlobalProcessId.java similarity index 93% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/GlobalProcessId.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/GlobalProcessId.java index 00d023819..812b28cb8 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/GlobalProcessId.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/GlobalProcessId.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; import java.util.UUID; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java similarity index 95% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java index e5f4dbfc6..e5deeb18e 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceLandscape.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; import io.reactivex.rxjava3.core.Observable; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java similarity index 96% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java index 64f50a94a..4ed911e58 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceServerRegister.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; import java.net.InetSocketAddress; import java.util.Collections; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java similarity index 97% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java index 52e81fdf9..f91345df1 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficGovernor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; import java.util.Map; import java.util.Set; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java similarity index 91% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java index 534ed17cf..a47726804 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/IRPCServiceTrafficService.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; -import com.baidu.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basecrdt.service.ICRDTService; import io.reactivex.rxjava3.core.Observable; import java.util.Set; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/NameUtil.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/NameUtil.java similarity index 89% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/NameUtil.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/NameUtil.java index b47a9ca58..5d3d7bf35 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/NameUtil.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/NameUtil.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; public class NameUtil { private static final String PREFIX_RPC = "RPC:"; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java similarity index 91% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java index 382e13d85..8e0492520 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceAnnouncer.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; -import static com.baidu.bifromq.baserpc.trafficgovernor.SharedScheduler.RPC_SHARED_SCHEDULER; +import static org.apache.bifromq.baserpc.trafficgovernor.SharedScheduler.RPC_SHARED_SCHEDULER; import static com.google.protobuf.ByteString.copyFromUtf8; import static java.util.Collections.emptyMap; -import com.baidu.bifromq.basecrdt.core.api.CRDTURI; -import com.baidu.bifromq.basecrdt.core.api.CausalCRDTType; -import com.baidu.bifromq.basecrdt.core.api.IMVReg; -import com.baidu.bifromq.basecrdt.core.api.IORMap; -import com.baidu.bifromq.basecrdt.core.api.MVRegOperation; -import com.baidu.bifromq.basecrdt.core.api.ORMapOperation; -import com.baidu.bifromq.basecrdt.proto.Replica; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.baserpc.proto.LoadAssignment; -import com.baidu.bifromq.baserpc.proto.RPCServer; +import org.apache.bifromq.basecrdt.core.api.CRDTURI; +import org.apache.bifromq.basecrdt.core.api.CausalCRDTType; +import org.apache.bifromq.basecrdt.core.api.IMVReg; +import org.apache.bifromq.basecrdt.core.api.IORMap; +import org.apache.bifromq.basecrdt.core.api.MVRegOperation; +import org.apache.bifromq.basecrdt.core.api.ORMapOperation; +import org.apache.bifromq.basecrdt.proto.Replica; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.baserpc.proto.LoadAssignment; +import org.apache.bifromq.baserpc.proto.RPCServer; import com.google.common.collect.Maps; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java similarity index 96% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java index 1c6f68a42..eba31bc80 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceTrafficManager.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; -import static com.baidu.bifromq.baserpc.trafficgovernor.SharedScheduler.RPC_SHARED_SCHEDULER; +import static org.apache.bifromq.baserpc.trafficgovernor.SharedScheduler.RPC_SHARED_SCHEDULER; import static java.util.Collections.emptySet; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.baserpc.proto.RPCServer; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.baserpc.proto.RPCServer; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java similarity index 95% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java index 669d3a14a..c8c665b18 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/RPCServiceTrafficService.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; -import com.baidu.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basecrdt.service.ICRDTService; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.schedulers.Schedulers; import java.util.Map; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/ServerEndpoint.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/ServerEndpoint.java similarity index 96% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/ServerEndpoint.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/ServerEndpoint.java index f57118dfc..9a76b7268 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/ServerEndpoint.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/ServerEndpoint.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; import com.google.protobuf.ByteString; import java.net.SocketAddress; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/SharedScheduler.java b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/SharedScheduler.java similarity index 93% rename from base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/SharedScheduler.java rename to base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/SharedScheduler.java index b3e6fb6f4..1556a839c 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/java/com/baidu/bifromq/baserpc/trafficgovernor/SharedScheduler.java +++ b/base-rpc/base-rpc-traffic-governor/src/main/java/org/apache/bifromq/baserpc/trafficgovernor/SharedScheduler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.baserpc.trafficgovernor; +package org.apache.bifromq.baserpc.trafficgovernor; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; import io.reactivex.rxjava3.core.Scheduler; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/LoadDirective.proto b/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/LoadDirective.proto index 0a4de4bf4..33d1c35ea 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/LoadDirective.proto +++ b/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/LoadDirective.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package baserpc; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.baserpc.proto"; +option java_package = "org.apache.bifromq.baserpc.proto"; option java_outer_classname = "TrafficDirectiveProtos"; option optimize_for = SPEED; diff --git a/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/RPCServer.proto b/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/RPCServer.proto index 05cc463c2..b573e4b1f 100644 --- a/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/RPCServer.proto +++ b/base-rpc/base-rpc-traffic-governor/src/main/proto/baserpc/RPCServer.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package baserpc; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.baserpc.proto"; +option java_package = "org.apache.bifromq.baserpc.proto"; option java_outer_classname = "RPCServerProtos"; option optimize_for = SPEED; diff --git a/base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java b/base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java similarity index 90% rename from base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java rename to base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java index 67b988a68..0a325e736 100644 --- a/base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java +++ b/base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceAnnouncerTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.trafficgovernor; +package org.apache.bifromq.trafficgovernor; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; import java.net.InetSocketAddress; import java.time.Duration; import java.util.Set; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; diff --git a/base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceLandscapeTest.java b/base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceLandscapeTest.java similarity index 92% rename from base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceLandscapeTest.java rename to base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceLandscapeTest.java index 9c2de6c9d..e1d5f5916 100644 --- a/base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceLandscapeTest.java +++ b/base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceLandscapeTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.trafficgovernor; +package org.apache.bifromq.trafficgovernor; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceServerRegister; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.baserpc.trafficgovernor.ServerEndpoint; import io.grpc.inprocess.InProcessSocketAddress; import java.net.InetSocketAddress; import java.util.Set; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceServerRegister; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.trafficgovernor.ServerEndpoint; import org.testng.annotations.Test; @Slf4j diff --git a/base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java b/base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java similarity index 92% rename from base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java rename to base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java index 0b60dd99a..91e301b03 100644 --- a/base-rpc/base-rpc-traffic-governor/src/test/java/com/baidu/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java +++ b/base-rpc/base-rpc-traffic-governor/src/test/java/org/apache/bifromq/trafficgovernor/RPCServiceTrafficGovernorTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.trafficgovernor; +package org.apache.bifromq.trafficgovernor; import static java.util.Collections.singletonMap; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceServerRegister; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.google.common.collect.Sets; import java.net.InetSocketAddress; import java.util.Map; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceServerRegister; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import org.testng.annotations.Test; public class RPCServiceTrafficGovernorTest extends RPCServiceAnnouncerTest { diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/BatchCallScheduler.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/BatchCallScheduler.java similarity index 94% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/BatchCallScheduler.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/BatchCallScheduler.java index 3c95dda6d..e6aa601c2 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/BatchCallScheduler.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/BatchCallScheduler.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; -import com.baidu.bifromq.basescheduler.exception.AbortException; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.basescheduler.spi.ICallScheduler; -import com.baidu.bifromq.basescheduler.spi.ICapacityEstimator; +import org.apache.bifromq.basescheduler.exception.AbortException; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.basescheduler.spi.ICallScheduler; +import org.apache.bifromq.basescheduler.spi.ICapacityEstimator; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.RemovalListener; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/Batcher.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/Batcher.java similarity index 98% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/Batcher.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/Batcher.java index 2a1741ac3..7f69a1713 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/Batcher.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/Batcher.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.basescheduler.spi.ICapacityEstimator; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.basescheduler.spi.ICapacityEstimator; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; import io.micrometer.core.instrument.Gauge; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CallSchedulerFactory.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CallSchedulerFactory.java similarity index 90% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CallSchedulerFactory.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CallSchedulerFactory.java index 84f40e71d..762d46e9c 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CallSchedulerFactory.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CallSchedulerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; -import com.baidu.bifromq.basehookloader.BaseHookLoader; -import com.baidu.bifromq.basescheduler.spi.ICallScheduler; -import com.baidu.bifromq.basescheduler.spi.ICallSchedulerFactory; +import org.apache.bifromq.basehookloader.BaseHookLoader; +import org.apache.bifromq.basescheduler.spi.ICallScheduler; +import org.apache.bifromq.basescheduler.spi.ICallSchedulerFactory; import java.util.Map; import lombok.extern.slf4j.Slf4j; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CallTask.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CallTask.java similarity index 97% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CallTask.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CallTask.java index bfe0bcae5..59aec742c 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CallTask.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CallTask.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.util.concurrent.CompletableFuture; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CapacityEstimatorFactory.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CapacityEstimatorFactory.java similarity index 91% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CapacityEstimatorFactory.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CapacityEstimatorFactory.java index 7ff3a5355..5f9687bf1 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/CapacityEstimatorFactory.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/CapacityEstimatorFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; -import com.baidu.bifromq.basehookloader.BaseHookLoader; -import com.baidu.bifromq.basescheduler.spi.ICapacityEstimator; -import com.baidu.bifromq.basescheduler.spi.ICapacityEstimatorFactory; +import org.apache.bifromq.basehookloader.BaseHookLoader; +import org.apache.bifromq.basescheduler.spi.ICapacityEstimator; +import org.apache.bifromq.basescheduler.spi.ICapacityEstimatorFactory; import java.util.Map; import lombok.extern.slf4j.Slf4j; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/EMALong.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/EMALong.java similarity index 97% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/EMALong.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/EMALong.java index a489a9ec9..8cfd64c3f 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/EMALong.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/EMALong.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.util.concurrent.atomic.AtomicLong; import java.util.function.Supplier; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCall.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCall.java similarity index 97% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCall.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCall.java index 3413bc715..e5ba8d19a 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCall.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCall.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.util.concurrent.CompletableFuture; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallBuilder.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallBuilder.java similarity index 96% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallBuilder.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallBuilder.java index e26fdf6d8..cf1fc5b34 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallBuilder.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; /** * IBatchCallBuilder is a factory interface for creating new batch calls. diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallBuilderFactory.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallBuilderFactory.java similarity index 96% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallBuilderFactory.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallBuilderFactory.java index 517398d0a..05f9b5dbb 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallBuilderFactory.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallBuilderFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; /** * The factory interface for creating batch call objects. diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallScheduler.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallScheduler.java similarity index 96% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallScheduler.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallScheduler.java index f735058f1..a68a2df5f 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/IBatchCallScheduler.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/IBatchCallScheduler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.util.concurrent.CompletableFuture; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/ICallTask.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/ICallTask.java similarity index 97% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/ICallTask.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/ICallTask.java index 0eed10540..fc1f4eca7 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/ICallTask.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/ICallTask.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.util.concurrent.CompletableFuture; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/MovingAverage.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/MovingAverage.java similarity index 98% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/MovingAverage.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/MovingAverage.java index bb0f22b52..7bd3bb961 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/MovingAverage.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/MovingAverage.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.time.Duration; import java.util.concurrent.atomic.AtomicReference; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/AbortException.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/AbortException.java similarity index 94% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/AbortException.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/AbortException.java index bbd9022a0..7c057d704 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/AbortException.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/AbortException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.exception; +package org.apache.bifromq.basescheduler.exception; public class AbortException extends DropException { public AbortException(String message) { diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/BackPressureException.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/BackPressureException.java similarity index 94% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/BackPressureException.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/BackPressureException.java index f37dadd4b..e98e52338 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/BackPressureException.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/BackPressureException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.exception; +package org.apache.bifromq.basescheduler.exception; public class BackPressureException extends DropException { public BackPressureException(String message) { diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/BatcherUnavailableException.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/BatcherUnavailableException.java similarity index 94% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/BatcherUnavailableException.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/BatcherUnavailableException.java index 04776342f..072694983 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/BatcherUnavailableException.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/BatcherUnavailableException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.exception; +package org.apache.bifromq.basescheduler.exception; public class BatcherUnavailableException extends DropException { public BatcherUnavailableException(String message) { diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/DropException.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/DropException.java similarity index 94% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/DropException.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/DropException.java index 14dad9562..13c7cec79 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/exception/DropException.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/exception/DropException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.exception; +package org.apache.bifromq.basescheduler.exception; public abstract class DropException extends RuntimeException { public DropException(String message) { diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICallScheduler.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICallScheduler.java similarity index 96% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICallScheduler.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICallScheduler.java index 1bae4696a..938258da0 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICallScheduler.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICallScheduler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.spi; +package org.apache.bifromq.basescheduler.spi; import java.util.concurrent.CompletableFuture; diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICallSchedulerFactory.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICallSchedulerFactory.java similarity index 94% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICallSchedulerFactory.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICallSchedulerFactory.java index 106668368..874ab31c7 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICallSchedulerFactory.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICallSchedulerFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.spi; +package org.apache.bifromq.basescheduler.spi; /** * The SPI interface for creating {@link ICallScheduler} instances. diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICapacityEstimator.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICapacityEstimator.java similarity index 96% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICapacityEstimator.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICapacityEstimator.java index b020bd3a7..233cabfce 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICapacityEstimator.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICapacityEstimator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.spi; +package org.apache.bifromq.basescheduler.spi; /** * SPI interface for estimating the capacity of a BatchCall pipeline. diff --git a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java similarity index 95% rename from base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java rename to base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java index e17bb70f7..50f807293 100644 --- a/base-scheduler/src/main/java/com/baidu/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java +++ b/base-scheduler/src/main/java/org/apache/bifromq/basescheduler/spi/ICapacityEstimatorFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.spi; +package org.apache.bifromq.basescheduler.spi; /** * SPI factory for creating {@link ICapacityEstimator} instances. diff --git a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/BatchCallSchedulerTest.java b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/BatchCallSchedulerTest.java similarity index 96% rename from base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/BatchCallSchedulerTest.java rename to base-scheduler/src/test/java/org/apache/bifromq/basescheduler/BatchCallSchedulerTest.java index 9496a4d15..51baa3a3f 100644 --- a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/BatchCallSchedulerTest.java +++ b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/BatchCallSchedulerTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.basescheduler.exception.BackPressureException; import java.time.Duration; import java.util.ArrayList; import java.util.List; diff --git a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/CallTaskTest.java b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/CallTaskTest.java similarity index 97% rename from base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/CallTaskTest.java rename to base-scheduler/src/test/java/org/apache/bifromq/basescheduler/CallTaskTest.java index 88b78522d..67d49c361 100644 --- a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/CallTaskTest.java +++ b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/CallTaskTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import static org.testng.Assert.assertEquals; diff --git a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/EMALongTest.java b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/EMALongTest.java similarity index 98% rename from base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/EMALongTest.java rename to base-scheduler/src/test/java/org/apache/bifromq/basescheduler/EMALongTest.java index fcb629fab..3b5e689fa 100644 --- a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/EMALongTest.java +++ b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/EMALongTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import static org.testng.Assert.assertEquals; diff --git a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/MovingAverageTest.java b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/MovingAverageTest.java similarity index 98% rename from base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/MovingAverageTest.java rename to base-scheduler/src/test/java/org/apache/bifromq/basescheduler/MovingAverageTest.java index f0d389d49..146115cc3 100644 --- a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/MovingAverageTest.java +++ b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/MovingAverageTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; diff --git a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/TestBatchCallScheduler.java b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/TestBatchCallScheduler.java similarity index 98% rename from base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/TestBatchCallScheduler.java rename to base-scheduler/src/test/java/org/apache/bifromq/basescheduler/TestBatchCallScheduler.java index 3be22c648..7a855b257 100644 --- a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/TestBatchCallScheduler.java +++ b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/TestBatchCallScheduler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler; +package org.apache.bifromq.basescheduler; import java.time.Duration; import java.util.Optional; diff --git a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java similarity index 94% rename from base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java rename to base-scheduler/src/test/java/org/apache/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java index 43dcb749d..8851df554 100644 --- a/base-scheduler/src/test/java/com/baidu/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java +++ b/base-scheduler/src/test/java/org/apache/bifromq/basescheduler/benchmark/MovingAverageBenchmark.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.basescheduler.benchmark; +package org.apache.bifromq.basescheduler.benchmark; -import com.baidu.bifromq.basescheduler.MovingAverage; +import org.apache.bifromq.basescheduler.MovingAverage; import java.time.Duration; import java.util.concurrent.ThreadLocalRandom; import lombok.SneakyThrows; diff --git a/base-util/src/main/java/com/baidu/bifromq/base/util/AsyncRetry.java b/base-util/src/main/java/org/apache/bifromq/base/util/AsyncRetry.java similarity index 95% rename from base-util/src/main/java/com/baidu/bifromq/base/util/AsyncRetry.java rename to base-util/src/main/java/org/apache/bifromq/base/util/AsyncRetry.java index df0c77638..e9daf293b 100644 --- a/base-util/src/main/java/com/baidu/bifromq/base/util/AsyncRetry.java +++ b/base-util/src/main/java/org/apache/bifromq/base/util/AsyncRetry.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; -import com.baidu.bifromq.base.util.exception.NeedRetryException; -import com.baidu.bifromq.base.util.exception.RetryTimeoutException; +import org.apache.bifromq.base.util.exception.NeedRetryException; +import org.apache.bifromq.base.util.exception.RetryTimeoutException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; diff --git a/base-util/src/main/java/com/baidu/bifromq/base/util/AsyncRunner.java b/base-util/src/main/java/org/apache/bifromq/base/util/AsyncRunner.java similarity index 99% rename from base-util/src/main/java/com/baidu/bifromq/base/util/AsyncRunner.java rename to base-util/src/main/java/org/apache/bifromq/base/util/AsyncRunner.java index 8690b5cfb..40f0f1f8f 100644 --- a/base-util/src/main/java/com/baidu/bifromq/base/util/AsyncRunner.java +++ b/base-util/src/main/java/org/apache/bifromq/base/util/AsyncRunner.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; diff --git a/base-util/src/main/java/com/baidu/bifromq/base/util/CompletableFutureUtil.java b/base-util/src/main/java/org/apache/bifromq/base/util/CompletableFutureUtil.java similarity index 98% rename from base-util/src/main/java/com/baidu/bifromq/base/util/CompletableFutureUtil.java rename to base-util/src/main/java/org/apache/bifromq/base/util/CompletableFutureUtil.java index 4dc034253..a32ed1c69 100644 --- a/base-util/src/main/java/com/baidu/bifromq/base/util/CompletableFutureUtil.java +++ b/base-util/src/main/java/org/apache/bifromq/base/util/CompletableFutureUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import java.util.concurrent.CompletionException; import java.util.function.BiConsumer; diff --git a/base-util/src/main/java/com/baidu/bifromq/base/util/FutureTracker.java b/base-util/src/main/java/org/apache/bifromq/base/util/FutureTracker.java similarity index 98% rename from base-util/src/main/java/com/baidu/bifromq/base/util/FutureTracker.java rename to base-util/src/main/java/org/apache/bifromq/base/util/FutureTracker.java index bca3e72f8..d76f57b32 100644 --- a/base-util/src/main/java/com/baidu/bifromq/base/util/FutureTracker.java +++ b/base-util/src/main/java/org/apache/bifromq/base/util/FutureTracker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import java.util.Set; import java.util.concurrent.CompletableFuture; diff --git a/base-util/src/main/java/com/baidu/bifromq/base/util/exception/NeedRetryException.java b/base-util/src/main/java/org/apache/bifromq/base/util/exception/NeedRetryException.java similarity index 95% rename from base-util/src/main/java/com/baidu/bifromq/base/util/exception/NeedRetryException.java rename to base-util/src/main/java/org/apache/bifromq/base/util/exception/NeedRetryException.java index e0865913d..025d9b7f1 100644 --- a/base-util/src/main/java/com/baidu/bifromq/base/util/exception/NeedRetryException.java +++ b/base-util/src/main/java/org/apache/bifromq/base/util/exception/NeedRetryException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util.exception; +package org.apache.bifromq.base.util.exception; public class NeedRetryException extends RuntimeException { public NeedRetryException() { diff --git a/base-util/src/main/java/com/baidu/bifromq/base/util/exception/RetryTimeoutException.java b/base-util/src/main/java/org/apache/bifromq/base/util/exception/RetryTimeoutException.java similarity index 95% rename from base-util/src/main/java/com/baidu/bifromq/base/util/exception/RetryTimeoutException.java rename to base-util/src/main/java/org/apache/bifromq/base/util/exception/RetryTimeoutException.java index 1aea346ec..6630e6e31 100644 --- a/base-util/src/main/java/com/baidu/bifromq/base/util/exception/RetryTimeoutException.java +++ b/base-util/src/main/java/org/apache/bifromq/base/util/exception/RetryTimeoutException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util.exception; +package org.apache.bifromq.base.util.exception; public class RetryTimeoutException extends RuntimeException { public RetryTimeoutException() { diff --git a/base-util/src/test/java/com/baidu/bifromq/base/util/AsyncRetryTest.java b/base-util/src/test/java/org/apache/bifromq/base/util/AsyncRetryTest.java similarity index 96% rename from base-util/src/test/java/com/baidu/bifromq/base/util/AsyncRetryTest.java rename to base-util/src/test/java/org/apache/bifromq/base/util/AsyncRetryTest.java index df88f1996..879ab6d98 100644 --- a/base-util/src/test/java/com/baidu/bifromq/base/util/AsyncRetryTest.java +++ b/base-util/src/test/java/org/apache/bifromq/base/util/AsyncRetryTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; import static org.testng.Assert.fail; import static org.testng.AssertJUnit.assertTrue; -import com.baidu.bifromq.base.util.exception.RetryTimeoutException; +import org.apache.bifromq.base.util.exception.RetryTimeoutException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/base-util/src/test/java/com/baidu/bifromq/base/util/AsyncRunnerTest.java b/base-util/src/test/java/org/apache/bifromq/base/util/AsyncRunnerTest.java similarity index 99% rename from base-util/src/test/java/com/baidu/bifromq/base/util/AsyncRunnerTest.java rename to base-util/src/test/java/org/apache/bifromq/base/util/AsyncRunnerTest.java index 9344839f2..5361f252c 100644 --- a/base-util/src/test/java/com/baidu/bifromq/base/util/AsyncRunnerTest.java +++ b/base-util/src/test/java/org/apache/bifromq/base/util/AsyncRunnerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/base-util/src/test/java/com/baidu/bifromq/base/util/CompletableFutureUtilTest.java b/base-util/src/test/java/org/apache/bifromq/base/util/CompletableFutureUtilTest.java similarity index 98% rename from base-util/src/test/java/com/baidu/bifromq/base/util/CompletableFutureUtilTest.java rename to base-util/src/test/java/org/apache/bifromq/base/util/CompletableFutureUtilTest.java index c6196f2a4..fe9422d39 100644 --- a/base-util/src/test/java/com/baidu/bifromq/base/util/CompletableFutureUtilTest.java +++ b/base-util/src/test/java/org/apache/bifromq/base/util/CompletableFutureUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; diff --git a/base-util/src/test/java/com/baidu/bifromq/base/util/FutureTrackerTest.java b/base-util/src/test/java/org/apache/bifromq/base/util/FutureTrackerTest.java similarity index 98% rename from base-util/src/test/java/com/baidu/bifromq/base/util/FutureTrackerTest.java rename to base-util/src/test/java/org/apache/bifromq/base/util/FutureTrackerTest.java index 209c7ca7f..1ddbf93cb 100644 --- a/base-util/src/test/java/com/baidu/bifromq/base/util/FutureTrackerTest.java +++ b/base-util/src/test/java/org/apache/bifromq/base/util/FutureTrackerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.base.util; +package org.apache.bifromq.base.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/bifromq-apiserver/pom.xml b/bifromq-apiserver/pom.xml index 962f23b9b..5313827d9 100644 --- a/bifromq-apiserver/pom.xml +++ b/bifromq-apiserver/pom.xml @@ -118,7 +118,7 @@ BifroMQ-API YAML - com.baidu.bifromq.apiserver.http.handler + org.apache.bifromq.apiserver.http.handler diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/APIServer.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/APIServer.java similarity index 86% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/APIServer.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/APIServer.java index 2582ba526..de1bc5a38 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/APIServer.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/APIServer.java @@ -11,22 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; -import com.baidu.bifromq.apiserver.http.HTTPRouteMap; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandlersFactory; -import com.baidu.bifromq.apiserver.http.IHTTPRouteMap; -import com.baidu.bifromq.apiserver.http.handler.RequestHandlersFactory; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; import com.google.common.base.Preconditions; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; @@ -43,6 +32,17 @@ import java.util.concurrent.atomic.AtomicReference; import lombok.Builder; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.apiserver.http.HTTPRouteMap; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandlersFactory; +import org.apache.bifromq.apiserver.http.IHTTPRouteMap; +import org.apache.bifromq.apiserver.http.handler.RequestHandlersFactory; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; @Slf4j public class APIServer implements IAPIServer { diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/AbstractServerInitializer.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/AbstractServerInitializer.java similarity index 88% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/AbstractServerInitializer.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/AbstractServerInitializer.java index 9d5a028d8..ed84899e8 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/AbstractServerInitializer.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/AbstractServerInitializer.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; -import com.baidu.bifromq.apiserver.http.IHTTPRouteMap; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.apiserver.http.IHTTPRouteMap; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.channel.ChannelInitializer; import io.netty.channel.socket.SocketChannel; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/ExceptionHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/ExceptionHandler.java similarity index 97% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/ExceptionHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/ExceptionHandler.java index f88555677..8442e8f81 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/ExceptionHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/ExceptionHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/Headers.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/Headers.java similarity index 97% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/Headers.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/Headers.java index 39578ddda..cf4375535 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/Headers.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/Headers.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; public enum Headers { HEADER_REQ_ID("req_id"), diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/IAPIServer.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/IAPIServer.java similarity index 95% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/IAPIServer.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/IAPIServer.java index 5f942f4c1..1acd3a087 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/IAPIServer.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/IAPIServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; import java.util.Optional; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/NonTLSServerInitializer.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/NonTLSServerInitializer.java similarity index 86% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/NonTLSServerInitializer.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/NonTLSServerInitializer.java index 5225400a9..7ee0fbbae 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/NonTLSServerInitializer.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/NonTLSServerInitializer.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; -import com.baidu.bifromq.apiserver.http.HTTPRequestRouter; -import com.baidu.bifromq.apiserver.http.IHTTPRouteMap; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.apiserver.http.HTTPRequestRouter; +import org.apache.bifromq.apiserver.http.IHTTPRouteMap; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/TLSServerInitializer.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/TLSServerInitializer.java similarity index 87% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/TLSServerInitializer.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/TLSServerInitializer.java index 1eb91e15d..681bbea7a 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/TLSServerInitializer.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/TLSServerInitializer.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; -import com.baidu.bifromq.apiserver.http.HTTPRequestRouter; -import com.baidu.bifromq.apiserver.http.IHTTPRouteMap; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.apiserver.http.HTTPRequestRouter; +import org.apache.bifromq.apiserver.http.IHTTPRouteMap; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.http.HttpObjectAggregator; import io.netty.handler.codec.http.HttpServerCodec; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/AnnotationUtil.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/AnnotationUtil.java similarity index 98% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/AnnotationUtil.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/AnnotationUtil.java index a9fc92d19..158fce3f0 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/AnnotationUtil.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/AnnotationUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; import io.netty.handler.codec.http.HttpMethod; import jakarta.ws.rs.DELETE; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/HTTPRequestRouter.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/HTTPRequestRouter.java similarity index 95% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/HTTPRequestRouter.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/HTTPRequestRouter.java index abc22eb5f..7b35b5956 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/HTTPRequestRouter.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/HTTPRequestRouter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; -import static com.baidu.bifromq.apiserver.Headers.HEADER_REQ_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_REQ_ID; import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE; @@ -22,8 +22,8 @@ import static io.netty.handler.codec.http.HttpVersion.HTTP_1_0; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; -import com.baidu.bifromq.apiserver.http.handler.HeaderUtils; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.apiserver.http.handler.HeaderUtils; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/HTTPRouteMap.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/HTTPRouteMap.java similarity index 95% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/HTTPRouteMap.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/HTTPRouteMap.java index baee58f87..b86425f0e 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/HTTPRouteMap.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/HTTPRouteMap.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; -import static com.baidu.bifromq.apiserver.http.AnnotationUtil.getHTTPMethod; +import static org.apache.bifromq.apiserver.http.AnnotationUtil.getHTTPMethod; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRequestHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRequestHandler.java similarity index 96% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRequestHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRequestHandler.java index 9e07dff71..e97b3912a 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRequestHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRequestHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java similarity index 94% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java index 652c2af07..377d0ccf3 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRequestHandlersFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; import java.util.Collection; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRouteMap.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRouteMap.java similarity index 94% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRouteMap.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRouteMap.java index 92f6b641d..a866ff7af 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/IHTTPRouteMap.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/IHTTPRouteMap.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; import io.netty.handler.codec.http.HttpRequest; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java similarity index 86% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java index 83635d239..ef3e1691c 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/AbstractLoadRulesHandler.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; import io.reactivex.rxjava3.disposables.CompositeDisposable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; abstract class AbstractLoadRulesHandler implements IHTTPRequestHandler { + protected final Map metadataManagers = new ConcurrentHashMap<>(); private final IBaseKVMetaService metaService; private final CompositeDisposable disposable = new CompositeDisposable(); - protected final Map metadataManagers = new ConcurrentHashMap<>(); protected AbstractLoadRulesHandler(IBaseKVMetaService metaService) { diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java similarity index 91% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java index 2954bdfd7..25812ed73 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/AbstractTrafficRulesHandler.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import io.reactivex.rxjava3.disposables.CompositeDisposable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; abstract class AbstractTrafficRulesHandler implements IHTTPRequestHandler { + protected final Map governorMap = new ConcurrentHashMap<>(); private final IRPCServiceTrafficService trafficService; private final CompositeDisposable disposable = new CompositeDisposable(); - protected final Map governorMap = new ConcurrentHashMap<>(); public AbstractTrafficRulesHandler(IRPCServiceTrafficService trafficService) { this.trafficService = trafficService; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ExpireRetainHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ExpireRetainHandler.java similarity index 88% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ExpireRetainHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ExpireRetainHandler.java index b5249a947..91f83a543 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ExpireRetainHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ExpireRetainHandler.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.ExpireAllReply; +import org.apache.bifromq.retain.rpc.proto.ExpireAllRequest; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.FullHttpRequest; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ExpireSessionHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ExpireSessionHandler.java similarity index 88% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ExpireSessionHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ExpireSessionHandler.java index 235f2a3ce..732dbd3fe 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ExpireSessionHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ExpireSessionHandler.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.FullHttpRequest; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetClusterHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetClusterHandler.java similarity index 94% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetClusterHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetClusterHandler.java index 27ece75d2..bd3790bdc 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetClusterHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetClusterHandler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecluster.membership.proto.HostEndpoint; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecluster.membership.proto.HostEndpoint; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetLoadRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetLoadRulesHandler.java similarity index 95% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetLoadRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetLoadRulesHandler.java index 0bacbfcb1..7d7e9ed0f 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetLoadRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetLoadRulesHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; import com.google.protobuf.Struct; import com.google.protobuf.util.JsonFormat; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java similarity index 93% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java index 3b99b777d..118103e85 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetServiceLandscapeHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.baserpc.trafficgovernor.ServerEndpoint; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.trafficgovernor.ServerEndpoint; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetSessionInfoHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetSessionInfoHandler.java similarity index 90% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetSessionInfoHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetSessionInfoHandler.java index 0652fe1a0..2452e5e77 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetSessionInfoHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetSessionInfoHandler.java @@ -11,19 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.GetRequest; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import com.google.protobuf.util.JsonFormat; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; @@ -43,6 +40,9 @@ import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.GetRequest; +import org.apache.bifromq.type.ClientInfo; @Slf4j @Path("/session") diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java similarity index 90% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java index 5f2071b93..19ce85f8c 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetStoreLandscapeHandler.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.http.handler.JSONUtils.toJSON; +import static org.apache.bifromq.apiserver.http.handler.JSONUtils.toJSON; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.baserpc.trafficgovernor.ServerEndpoint; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.trafficgovernor.ServerEndpoint; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.FullHttpRequest; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetStoreRangesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetStoreRangesHandler.java similarity index 93% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetStoreRangesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetStoreRangesHandler.java index 074739eb0..fc84d1bb4 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetStoreRangesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetStoreRangesHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java similarity index 93% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java index 18d39e43f..fc79e5778 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/GetTrafficRulesHandler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/HeaderUtils.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/HeaderUtils.java similarity index 85% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/HeaderUtils.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/HeaderUtils.java index 61cccc49b..9ea79f1a4 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/HeaderUtils.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/HeaderUtils.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; -import static com.baidu.bifromq.apiserver.Headers.HEADER_REQ_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SUB_QOS; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; +import static org.apache.bifromq.apiserver.Headers.HEADER_REQ_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_SUB_QOS; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.type.QoS; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.HttpRequest; import java.util.HashMap; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/JSONUtils.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/JSONUtils.java similarity index 92% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/JSONUtils.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/JSONUtils.java index 3db459878..51033203e 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/JSONUtils.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/JSONUtils.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.raft.proto.ClusterConfig; -import com.baidu.bifromq.baserpc.trafficgovernor.ServerEndpoint; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.raft.proto.ClusterConfig; +import org.apache.bifromq.baserpc.trafficgovernor.ServerEndpoint; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/KillHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/KillHandler.java similarity index 90% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/KillHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/KillHandler.java index a0ca37a43..8f53c01aa 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/KillHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/KillHandler.java @@ -11,25 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SERVER_REDIRECT; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SERVER_REFERENCE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getClientMeta; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; +import static org.apache.bifromq.apiserver.Headers.HEADER_SERVER_REDIRECT; +import static org.apache.bifromq.apiserver.Headers.HEADER_SERVER_REFERENCE; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getClientMeta; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import com.google.common.base.Strings; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; @@ -51,6 +46,11 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; @Slf4j @Path("/kill") diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ListAllServicesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ListAllServicesHandler.java similarity index 96% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ListAllServicesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ListAllServicesHandler.java index 92f713519..a3a95e95e 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ListAllServicesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ListAllServicesHandler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ListAllStoreHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ListAllStoreHandler.java similarity index 96% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ListAllStoreHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ListAllStoreHandler.java index ed6f3dcd2..68e071c2b 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/ListAllStoreHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/ListAllStoreHandler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/PubHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/PubHandler.java similarity index 89% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/PubHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/PubHandler.java index 67d99adc8..668c61a59 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/PubHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/PubHandler.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_QOS; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getClientMeta; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.Headers.HEADER_QOS; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getClientMeta; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.utils.TopicUtil; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.utils.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/RequestHandlersFactory.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/RequestHandlersFactory.java similarity index 81% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/RequestHandlersFactory.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/RequestHandlersFactory.java index 742b15d6c..357270f87 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/RequestHandlersFactory.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/RequestHandlersFactory.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandlersFactory; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandlersFactory; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; public final class RequestHandlersFactory implements IHTTPRequestHandlersFactory { private final Map, IHTTPRequestHandler> handlers = new HashMap<>(); diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/RetainHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/RetainHandler.java similarity index 90% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/RetainHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/RetainHandler.java index 1674e482f..65e8b8704 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/RetainHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/RetainHandler.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_QOS; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getClientMeta; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.Headers.HEADER_QOS; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getClientMeta; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.utils.TopicUtil; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.utils.TopicUtil; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetLoadRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetLoadRulesHandler.java similarity index 94% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetLoadRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetLoadRulesHandler.java index 37faf1a55..3ced43b4b 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetLoadRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetLoadRulesHandler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; import static io.netty.buffer.Unpooled.EMPTY_BUFFER; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.CONFLICT; @@ -22,10 +22,10 @@ import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.REQUEST_TIMEOUT; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; import com.google.protobuf.Struct; import com.google.protobuf.util.JsonFormat; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java similarity index 91% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java index 890c2d07a..4f1b4cc6e 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetServerGroupTagsHandler.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SERVER_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.Headers.HEADER_SERVER_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java similarity index 94% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java index 7e37effad..0673b1b5f 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SetTrafficRulesHandler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SubHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SubHandler.java similarity index 89% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SubHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SubHandler.java index 03f4f90ee..0270e254b 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/SubHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/SubHandler.java @@ -11,23 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getRequiredSubQoS; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getRequiredSubQoS; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.SubRequest; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.FullHttpRequest; @@ -44,6 +41,9 @@ import jakarta.ws.rs.Path; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.SubRequest; +import org.apache.bifromq.type.QoS; @Slf4j @Path("/sub") diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/TenantAwareHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java similarity index 87% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/TenantAwareHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java index ecbff6a13..762f842ce 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/TenantAwareHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/TenantAwareHandler.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TENANT_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.Headers.HEADER_TENANT_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.buffer.Unpooled.EMPTY_BUFFER; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; import com.google.common.base.Strings; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java similarity index 93% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java index 3d01974a6..b65c75db5 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/UnsetTrafficRulesHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.util.CharsetUtil.UTF_8; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.http.IHTTPRequestHandler; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.http.IHTTPRequestHandler; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/UnsubHandler.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/UnsubHandler.java similarity index 89% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/UnsubHandler.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/UnsubHandler.java index 68bb979dd..82df12490 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/http/handler/UnsubHandler.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/http/handler/UnsubHandler.java @@ -11,20 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.FullHttpRequest; @@ -41,6 +40,8 @@ import jakarta.ws.rs.Path; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubRequest; @Slf4j @Path("/unsub") @@ -81,7 +82,7 @@ public CompletableFuture handle(@Parameter(hidden = true) long String userId = getHeader(HEADER_USER_ID, req, true); String clientId = getHeader(HEADER_CLIENT_ID, req, true); log.trace("Handling http unsub request: {}", req); - return sessionDictClient.unsub(com.baidu.bifromq.sessiondict.rpc.proto.UnsubRequest.newBuilder() + return sessionDictClient.unsub(UnsubRequest.newBuilder() .setReqId(reqId) .setTenantId(tenantId) .setUserId(userId) diff --git a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/utils/TopicUtil.java b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/utils/TopicUtil.java similarity index 69% rename from bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/utils/TopicUtil.java rename to bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/utils/TopicUtil.java index f778b4883..f8e916815 100644 --- a/bifromq-apiserver/src/main/java/com/baidu/bifromq/apiserver/utils/TopicUtil.java +++ b/bifromq-apiserver/src/main/java/org/apache/bifromq/apiserver/utils/TopicUtil.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.utils; +package org.apache.bifromq.apiserver.utils; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; -import static com.baidu.bifromq.util.TopicUtil.isValidTopicFilter; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; +import static org.apache.bifromq.util.TopicUtil.isValidTopicFilter; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sysprops.props.SanityCheckMqttUtf8String; -import com.baidu.bifromq.util.UTF8Util; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.sysprops.props.SanityCheckMqttUtf8String; +import org.apache.bifromq.util.UTF8Util; public class TopicUtil { public static boolean checkTopicFilter(String topic, String tenantId, ISettingProvider settingProvider) { diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/APIServerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/APIServerTest.java similarity index 83% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/APIServerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/APIServerTest.java index 0ef251c11..eb8512e0a 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/APIServerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/APIServerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -20,19 +20,13 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceLandscape; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.RetainReply; import io.reactivex.rxjava3.core.Observable; import java.net.URI; import java.net.http.HttpClient; @@ -41,6 +35,12 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; import org.mockito.Mock; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -67,7 +67,7 @@ public class APIServerTest extends MockableTest { private ISessionDictClient sessionDictClient; @Mock private IRetainClient retainClient; - private ISettingProvider settingProvider = Setting::current; + private final ISettingProvider settingProvider = Setting::current; @BeforeMethod(alwaysRun = true) public void setup() { diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/MockableTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/MockableTest.java similarity index 96% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/MockableTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/MockableTest.java index 71419cde2..08d80f66f 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/MockableTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/MockableTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; import lombok.SneakyThrows; import org.mockito.MockitoAnnotations; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/NonTLSServerInitializerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/NonTLSServerInitializerTest.java similarity index 91% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/NonTLSServerInitializerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/NonTLSServerInitializerTest.java index 0767b7e98..c4f82a278 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/NonTLSServerInitializerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/NonTLSServerInitializerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -19,9 +19,9 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.apiserver.http.HTTPRequestRouter; -import com.baidu.bifromq.apiserver.http.IHTTPRouteMap; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.apiserver.http.HTTPRequestRouter; +import org.apache.bifromq.apiserver.http.IHTTPRouteMap; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/TLSServerInitializerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/TLSServerInitializerTest.java similarity index 92% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/TLSServerInitializerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/TLSServerInitializerTest.java index 5e009e868..81047b766 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/TLSServerInitializerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/TLSServerInitializerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver; +package org.apache.bifromq.apiserver; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -19,9 +19,9 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.apiserver.http.HTTPRequestRouter; -import com.baidu.bifromq.apiserver.http.IHTTPRouteMap; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.apiserver.http.HTTPRequestRouter; +import org.apache.bifromq.apiserver.http.IHTTPRouteMap; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.netty.buffer.ByteBufAllocator; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelPipeline; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/HTTPRequestRouterTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/HTTPRequestRouterTest.java similarity index 95% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/HTTPRequestRouterTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/HTTPRequestRouterTest.java index 274b01b27..7a9325057 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/HTTPRequestRouterTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/HTTPRequestRouterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; @@ -26,10 +26,10 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.apiserver.MockableTest; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.apiserver.MockableTest; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; import io.netty.channel.ChannelInitializer; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.http.DefaultFullHttpRequest; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/HTTPRouteMapTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/HTTPRouteMapTest.java similarity index 85% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/HTTPRouteMapTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/HTTPRouteMapTest.java index d0828535c..3ae16ba77 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/HTTPRouteMapTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/HTTPRouteMapTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http; +package org.apache.bifromq.apiserver.http; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.apiserver.MockableTest; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.apiserver.MockableTest; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java similarity index 83% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java index f7dd12812..67e216940 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/AbstractHTTPRequestHandlerTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import static org.testng.Assert.assertNotNull; -import com.baidu.bifromq.apiserver.MockableTest; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.apiserver.MockableTest; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpRequest; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java similarity index 94% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java index b51744027..bd7c018ba 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/AbstractTrafficRulesHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.never; @@ -21,8 +21,8 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficGovernor; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import io.netty.handler.codec.http.FullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.reactivex.rxjava3.core.Observable; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java similarity index 90% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java index 7c722768e..19003fec3 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ExpireRetainHandlerTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TENANT_ID; -import static com.baidu.bifromq.retain.rpc.proto.ExpireAllReply.Result.ERROR; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.Headers.HEADER_TENANT_ID; +import static org.apache.bifromq.retain.rpc.proto.ExpireAllReply.Result.ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS; import static org.mockito.ArgumentMatchers.any; @@ -25,8 +25,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllReply; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.ExpireAllReply; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java similarity index 90% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java index 2817b694b..aa570d18a 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ExpireSessionHandlerTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TENANT_ID; -import static com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply.Code.ERROR; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.Headers.HEADER_TENANT_ID; +import static org.apache.bifromq.inbox.rpc.proto.ExpireAllReply.Code.ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.OK; import static io.netty.handler.codec.http.HttpResponseStatus.TOO_MANY_REQUESTS; import static org.mockito.ArgumentMatchers.any; @@ -25,8 +25,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java similarity index 94% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java index 410d1a1cb..c7e2c882a 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetLoadRulesHandlerTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_BALANCER_FACTORY_CLASS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_STORE_NAME; +import static org.apache.bifromq.apiserver.Headers.HEADER_BALANCER_FACTORY_CLASS; +import static org.apache.bifromq.apiserver.Headers.HEADER_STORE_NAME; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; import com.google.protobuf.Struct; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java similarity index 96% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java index 63ffc680c..3fc105761 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetServiceLandscapeHandlerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.baserpc.trafficgovernor.ServerEndpoint; +import org.apache.bifromq.baserpc.trafficgovernor.ServerEndpoint; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java similarity index 91% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java index 52688e454..19b7680b7 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/GetSessionInfoHandlerTest.java @@ -11,20 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.GetReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MQTTClientInfoConstants; import com.google.protobuf.UnsafeByteOperations; import com.google.protobuf.util.JsonFormat; import io.netty.handler.codec.http.DefaultFullHttpRequest; @@ -33,6 +29,10 @@ import io.netty.handler.codec.http.HttpResponseStatus; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.GetReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MQTTClientInfoConstants; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/HeaderUtilsTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/HeaderUtilsTest.java similarity index 93% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/HeaderUtilsTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/HeaderUtilsTest.java index 1dcf9b811..308db6073 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/HeaderUtilsTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/HeaderUtilsTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getHeader; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getHeader; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.type.QoS; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpVersion; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/KillHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/KillHandlerTest.java similarity index 94% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/KillHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/KillHandlerTest.java index ff8632a19..758838737 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/KillHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/KillHandlerTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SERVER_REDIRECT; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SERVER_REFERENCE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; +import static org.apache.bifromq.apiserver.Headers.HEADER_SERVER_REDIRECT; +import static org.apache.bifromq.apiserver.Headers.HEADER_SERVER_REFERENCE; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -31,15 +31,15 @@ import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpResponseStatus; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java similarity index 97% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java index 2178f28ac..f6f8b270f 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ListAllServicesHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java similarity index 97% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java index 7f0d4f503..02d14452c 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/ListAllStoresHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/PubHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/PubHandlerTest.java similarity index 91% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/PubHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/PubHandlerTest.java index 244f1acf6..2fd24c8f6 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/PubHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/PubHandlerTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_QOS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TOPIC; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; +import static org.apache.bifromq.apiserver.Headers.HEADER_EXPIRY_SECONDS; +import static org.apache.bifromq.apiserver.Headers.HEADER_QOS; +import static org.apache.bifromq.apiserver.Headers.HEADER_TOPIC; import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static org.mockito.ArgumentMatchers.any; @@ -31,12 +31,12 @@ import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.apiserver.Headers; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.apiserver.Headers; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/RetainHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/RetainHandlerTest.java similarity index 83% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/RetainHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/RetainHandlerTest.java index 039537aa3..32efdc74c 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/RetainHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/RetainHandlerTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; -import static com.baidu.bifromq.apiserver.Headers.HEADER_QOS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_RETAIN; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TOPIC; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_META_PREFIX; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_TYPE; +import static org.apache.bifromq.apiserver.Headers.HEADER_QOS; +import static org.apache.bifromq.apiserver.Headers.HEADER_RETAIN; +import static org.apache.bifromq.apiserver.Headers.HEADER_TOPIC; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -26,10 +26,10 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.RetainReply; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java similarity index 96% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java index 64d488e14..996fdde70 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/SetLoadRulesHandlerTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_BALANCER_FACTORY_CLASS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_STORE_NAME; +import static org.apache.bifromq.apiserver.Headers.HEADER_BALANCER_FACTORY_CLASS; +import static org.apache.bifromq.apiserver.Headers.HEADER_STORE_NAME; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; +import org.apache.bifromq.basekv.metaservice.IBaseKVClusterMetadataManager; import com.google.protobuf.Struct; import io.netty.buffer.Unpooled; import io.netty.handler.codec.http.DefaultFullHttpRequest; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/SubHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/SubHandlerTest.java similarity index 87% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/SubHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/SubHandlerTest.java index 44c4b1d65..ee805c509 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/SubHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/SubHandlerTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_SUB_QOS; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; -import static com.baidu.bifromq.apiserver.http.handler.HeaderUtils.getRequiredSubQoS; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_SUB_QOS; +import static org.apache.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.http.handler.HeaderUtils.getRequiredSubQoS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.verify; @@ -25,13 +25,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.SubReply; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpResponseStatus; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.SubReply; import org.mockito.Mock; import org.mockito.Mockito; import org.testng.annotations.Test; diff --git a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/UnsubHandlerTest.java b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/UnsubHandlerTest.java similarity index 90% rename from bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/UnsubHandlerTest.java rename to bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/UnsubHandlerTest.java index 68b0084b5..f6dc571cd 100644 --- a/bifromq-apiserver/src/test/java/com/baidu/bifromq/apiserver/http/handler/UnsubHandlerTest.java +++ b/bifromq-apiserver/src/test/java/org/apache/bifromq/apiserver/http/handler/UnsubHandlerTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.apiserver.http.handler; +package org.apache.bifromq.apiserver.http.handler; -import static com.baidu.bifromq.apiserver.Headers.HEADER_CLIENT_ID; -import static com.baidu.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; -import static com.baidu.bifromq.apiserver.Headers.HEADER_USER_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_CLIENT_ID; +import static org.apache.bifromq.apiserver.Headers.HEADER_TOPIC_FILTER; +import static org.apache.bifromq.apiserver.Headers.HEADER_USER_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.verify; @@ -23,13 +23,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertThrows; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubReply; import io.netty.handler.codec.http.DefaultFullHttpRequest; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpResponseStatus; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubReply; import org.mockito.Mock; import org.mockito.Mockito; import org.testng.annotations.Test; diff --git a/bifromq-common-type/src/main/java/com/baidu/bifromq/type/MQTTClientInfoConstants.java b/bifromq-common-type/src/main/java/org/apache/bifromq/type/MQTTClientInfoConstants.java similarity index 97% rename from bifromq-common-type/src/main/java/com/baidu/bifromq/type/MQTTClientInfoConstants.java rename to bifromq-common-type/src/main/java/org/apache/bifromq/type/MQTTClientInfoConstants.java index b56724f40..d738b2845 100644 --- a/bifromq-common-type/src/main/java/com/baidu/bifromq/type/MQTTClientInfoConstants.java +++ b/bifromq-common-type/src/main/java/org/apache/bifromq/type/MQTTClientInfoConstants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.type; +package org.apache.bifromq.type; public class MQTTClientInfoConstants { public static final String MQTT_TYPE_VALUE = "MQTT"; diff --git a/bifromq-common-type/src/main/proto/commontype/ClientInfo.proto b/bifromq-common-type/src/main/proto/commontype/ClientInfo.proto index 65ba65730..691e0f399 100644 --- a/bifromq-common-type/src/main/proto/commontype/ClientInfo.proto +++ b/bifromq-common-type/src/main/proto/commontype/ClientInfo.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package commontype; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.type"; +option java_package = "org.apache.bifromq.type"; option java_outer_classname = "ClientInfoProto"; option optimize_for = SPEED; diff --git a/bifromq-common-type/src/main/proto/commontype/MatchInfo.proto b/bifromq-common-type/src/main/proto/commontype/MatchInfo.proto index 3e4b72900..2aedf51ea 100644 --- a/bifromq-common-type/src/main/proto/commontype/MatchInfo.proto +++ b/bifromq-common-type/src/main/proto/commontype/MatchInfo.proto @@ -4,7 +4,7 @@ import "commontype/RouteMatcher.proto"; package commontype; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.type"; +option java_package = "org.apache.bifromq.type"; option java_outer_classname = "MatchInfoProtos"; message MatchInfo { diff --git a/bifromq-common-type/src/main/proto/commontype/QoS.proto b/bifromq-common-type/src/main/proto/commontype/QoS.proto index 52f71e9fb..6d62eaaaf 100644 --- a/bifromq-common-type/src/main/proto/commontype/QoS.proto +++ b/bifromq-common-type/src/main/proto/commontype/QoS.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package commontype; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.type"; +option java_package = "org.apache.bifromq.type"; option java_outer_classname = "QoSProto"; option optimize_for = SPEED; diff --git a/bifromq-common-type/src/main/proto/commontype/RouteMatcher.proto b/bifromq-common-type/src/main/proto/commontype/RouteMatcher.proto index 8d64a2a72..6348b9b00 100644 --- a/bifromq-common-type/src/main/proto/commontype/RouteMatcher.proto +++ b/bifromq-common-type/src/main/proto/commontype/RouteMatcher.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package commontype; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.type"; +option java_package = "org.apache.bifromq.type"; option java_outer_classname = "RouteMatcherProtos"; message RouteMatcher{ diff --git a/bifromq-common-type/src/main/proto/commontype/TopicMessage.proto b/bifromq-common-type/src/main/proto/commontype/TopicMessage.proto index aacd58611..f4795261c 100644 --- a/bifromq-common-type/src/main/proto/commontype/TopicMessage.proto +++ b/bifromq-common-type/src/main/proto/commontype/TopicMessage.proto @@ -6,7 +6,7 @@ import "commontype/UserProperties.proto"; package commontype; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.type"; +option java_package = "org.apache.bifromq.type"; option java_outer_classname = "TopicMessageProtos"; message Message{ diff --git a/bifromq-common-type/src/main/proto/commontype/UserProperties.proto b/bifromq-common-type/src/main/proto/commontype/UserProperties.proto index 6badafce4..509a79ae8 100644 --- a/bifromq-common-type/src/main/proto/commontype/UserProperties.proto +++ b/bifromq-common-type/src/main/proto/commontype/UserProperties.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package commontype; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.type"; +option java_package = "org.apache.bifromq.type"; option java_outer_classname = "UserPropertiesProtos"; message StringPair{ diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/BatchDeliveryCall.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/BatchDeliveryCall.java similarity index 87% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/BatchDeliveryCall.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/BatchDeliveryCall.java index d9b03c2f4..2d627377a 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/BatchDeliveryCall.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/BatchDeliveryCall.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.BACK_PRESSURE_REJECTED; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.ERROR; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.NO_RECEIVER; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.NO_SUB; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.OK; -import static com.baidu.bifromq.plugin.subbroker.TypeUtil.toMap; +import static org.apache.bifromq.deliverer.DeliveryCallResult.BACK_PRESSURE_REJECTED; +import static org.apache.bifromq.deliverer.DeliveryCallResult.ERROR; +import static org.apache.bifromq.deliverer.DeliveryCallResult.NO_RECEIVER; +import static org.apache.bifromq.deliverer.DeliveryCallResult.NO_SUB; +import static org.apache.bifromq.deliverer.DeliveryCallResult.OK; +import static org.apache.bifromq.plugin.subbroker.TypeUtil.toMap; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.type.MatchInfo; import java.util.ArrayDeque; import java.util.Collections; import java.util.HashMap; diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java similarity index 82% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java index 7feb401ae..a88005efb 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/BatchDeliveryCallBuilderFactory.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.IBatchCallBuilder; -import com.baidu.bifromq.basescheduler.IBatchCallBuilderFactory; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.IBatchCallBuilder; +import org.apache.bifromq.basescheduler.IBatchCallBuilderFactory; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; public class BatchDeliveryCallBuilderFactory implements IBatchCallBuilderFactory { diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DelivererKey.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DelivererKey.java similarity index 94% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DelivererKey.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DelivererKey.java index 8388aff0d..f8a3fdf81 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DelivererKey.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DelivererKey.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; public record DelivererKey(int subBrokerId, String delivererKey) { } diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DeliveryCall.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DeliveryCall.java similarity index 94% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DeliveryCall.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DeliveryCall.java index 508e66852..c9a7bdc96 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DeliveryCall.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DeliveryCall.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.type.MatchInfo; public class DeliveryCall { public final String tenantId; diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DeliveryCallResult.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DeliveryCallResult.java similarity index 95% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DeliveryCallResult.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DeliveryCallResult.java index 3f08442fd..9109e4b99 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/DeliveryCallResult.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/DeliveryCallResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; public enum DeliveryCallResult { OK, diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/IMessageDeliverer.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/IMessageDeliverer.java similarity index 87% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/IMessageDeliverer.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/IMessageDeliverer.java index d8bf04972..d9c6d09f5 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/IMessageDeliverer.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/IMessageDeliverer.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; public interface IMessageDeliverer extends IBatchCallScheduler { } diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/MessageDeliverer.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/MessageDeliverer.java similarity index 84% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/MessageDeliverer.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/MessageDeliverer.java index da815182b..8d39d1423 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/MessageDeliverer.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/MessageDeliverer.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import java.time.Duration; import java.util.Optional; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/TopicMessagePackHolder.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/TopicMessagePackHolder.java similarity index 92% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/TopicMessagePackHolder.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/TopicMessagePackHolder.java index c9602991f..98d73e9a3 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/TopicMessagePackHolder.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/TopicMessagePackHolder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.type.TopicMessagePack; /** * Using the wrapper as the map key instead of using TopicMessagePack directly to prevent heavy hashcode calculation. diff --git a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/exception/DeliveryException.java b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/exception/DeliveryException.java similarity index 94% rename from bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/exception/DeliveryException.java rename to bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/exception/DeliveryException.java index ade4e7fe9..891729631 100644 --- a/bifromq-deliverer/src/main/java/com/baidu/bifromq/deliverer/exception/DeliveryException.java +++ b/bifromq-deliverer/src/main/java/org/apache/bifromq/deliverer/exception/DeliveryException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer.exception; +package org.apache.bifromq.deliverer.exception; public class DeliveryException extends RuntimeException { public DeliveryException(String message) { diff --git a/bifromq-deliverer/src/test/java/com/baidu/bifromq/deliverer/DeliverySchedulerTest.java b/bifromq-deliverer/src/test/java/org/apache/bifromq/deliverer/DeliverySchedulerTest.java similarity index 88% rename from bifromq-deliverer/src/test/java/com/baidu/bifromq/deliverer/DeliverySchedulerTest.java rename to bifromq-deliverer/src/test/java/org/apache/bifromq/deliverer/DeliverySchedulerTest.java index 89e841123..4f27ea987 100644 --- a/bifromq-deliverer/src/test/java/com/baidu/bifromq/deliverer/DeliverySchedulerTest.java +++ b/bifromq-deliverer/src/test/java/org/apache/bifromq/deliverer/DeliverySchedulerTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.deliverer; +package org.apache.bifromq.deliverer; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.BACK_PRESSURE_REJECTED; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.ERROR; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.NO_RECEIVER; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.NO_SUB; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.OK; +import static org.apache.bifromq.deliverer.DeliveryCallResult.BACK_PRESSURE_REJECTED; +import static org.apache.bifromq.deliverer.DeliveryCallResult.ERROR; +import static org.apache.bifromq.deliverer.DeliveryCallResult.NO_RECEIVER; +import static org.apache.bifromq.deliverer.DeliveryCallResult.NO_SUB; +import static org.apache.bifromq.deliverer.DeliveryCallResult.OK; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -26,16 +26,16 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.plugin.subbroker.ISubBroker; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.plugin.subbroker.ISubBroker; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; import org.mockito.Mock; diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClient.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/DistClient.java similarity index 86% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClient.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/DistClient.java index 4d79a6ea1..49c46e118 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClient.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/DistClient.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client; +package org.apache.bifromq.dist.client; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; -import com.baidu.bifromq.base.util.exception.RetryTimeoutException; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.dist.client.scheduler.BatchPubCallBuilderFactory; -import com.baidu.bifromq.dist.client.scheduler.IPubCallScheduler; -import com.baidu.bifromq.dist.client.scheduler.PubCallScheduler; -import com.baidu.bifromq.dist.client.scheduler.PubRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceGrpc; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.base.util.exception.RetryTimeoutException; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.dist.client.scheduler.BatchPubCallBuilderFactory; +import org.apache.bifromq.dist.client.scheduler.IPubCallScheduler; +import org.apache.bifromq.dist.client.scheduler.PubCallScheduler; +import org.apache.bifromq.dist.client.scheduler.PubRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceGrpc; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.RouteMatcher; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClientBuilder.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/DistClientBuilder.java similarity index 87% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClientBuilder.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/DistClientBuilder.java index e90a1c33b..ea3c507cd 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/DistClientBuilder.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/DistClientBuilder.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client; +package org.apache.bifromq.dist.client; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.RPCBluePrint; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.dist.RPCBluePrint; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; import lombok.AccessLevel; diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/IDistClient.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/IDistClient.java similarity index 94% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/IDistClient.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/IDistClient.java index 898eb04fb..4f0f0ff32 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/IDistClient.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/IDistClient.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client; +package org.apache.bifromq.dist.client; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.RouteMatcher; import java.util.concurrent.CompletableFuture; /** diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/MatchResult.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/MatchResult.java similarity index 94% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/MatchResult.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/MatchResult.java index 8e20c2788..99e54cd28 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/MatchResult.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/MatchResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client; +package org.apache.bifromq.dist.client; public enum MatchResult { OK, EXCEED_LIMIT, BACK_PRESSURE_REJECTED, TRY_LATER, ERROR diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/PubResult.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/PubResult.java similarity index 94% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/PubResult.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/PubResult.java index af8d21324..d8f3714fb 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/PubResult.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/PubResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client; +package org.apache.bifromq.dist.client; public enum PubResult { OK, NO_MATCH, BACK_PRESSURE_REJECTED, TRY_LATER, ERROR diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/UnmatchResult.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/UnmatchResult.java similarity index 94% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/UnmatchResult.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/UnmatchResult.java index be4ed9aec..c56036097 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/UnmatchResult.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/UnmatchResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client; +package org.apache.bifromq.dist.client; public enum UnmatchResult { OK, NOT_EXISTED, BACK_PRESSURE_REJECTED, TRY_LATER, ERROR diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/BatchPubCall.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/BatchPubCall.java similarity index 90% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/BatchPubCall.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/BatchPubCall.java index 9b6fe0669..9687684fd 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/BatchPubCall.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/BatchPubCall.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client.scheduler; +package org.apache.bifromq.dist.client.scheduler; -import com.baidu.bifromq.base.util.AsyncRetry; -import com.baidu.bifromq.base.util.exception.NeedRetryException; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.dist.rpc.proto.DistReply; -import com.baidu.bifromq.dist.rpc.proto.DistRequest; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.PublisherMessagePack; +import org.apache.bifromq.base.util.AsyncRetry; +import org.apache.bifromq.base.util.exception.NeedRetryException; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.dist.rpc.proto.DistReply; +import org.apache.bifromq.dist.rpc.proto.DistRequest; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.PublisherMessagePack; import java.util.ArrayDeque; import java.util.HashMap; import java.util.Map; diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java similarity index 77% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java index 59c040ab7..7245c81d0 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/BatchPubCallBuilderFactory.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client.scheduler; +package org.apache.bifromq.dist.client.scheduler; import static java.util.Collections.emptyMap; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.IBatchCallBuilder; -import com.baidu.bifromq.basescheduler.IBatchCallBuilderFactory; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.dist.rpc.proto.DistReply; -import com.baidu.bifromq.dist.rpc.proto.DistRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceGrpc; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.IBatchCallBuilder; +import org.apache.bifromq.basescheduler.IBatchCallBuilderFactory; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.dist.rpc.proto.DistReply; +import org.apache.bifromq.dist.rpc.proto.DistRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceGrpc; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import java.time.Duration; public class BatchPubCallBuilderFactory implements IBatchCallBuilderFactory { diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/IPubCallScheduler.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/IPubCallScheduler.java similarity index 81% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/IPubCallScheduler.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/IPubCallScheduler.java index 76e2b4e29..a461be44f 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/IPubCallScheduler.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/IPubCallScheduler.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client.scheduler; +package org.apache.bifromq.dist.client.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.dist.client.PubResult; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.dist.client.PubResult; public interface IPubCallScheduler extends IBatchCallScheduler { } diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubCallBatcherKey.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubCallBatcherKey.java similarity index 93% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubCallBatcherKey.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubCallBatcherKey.java index ebc5c0f4c..239aa2952 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubCallBatcherKey.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubCallBatcherKey.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client.scheduler; +package org.apache.bifromq.dist.client.scheduler; public record PubCallBatcherKey(String tenantId, long threadId) { } diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubCallScheduler.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubCallScheduler.java similarity index 84% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubCallScheduler.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubCallScheduler.java index 2fbc28fbf..92bfe3feb 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubCallScheduler.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubCallScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client.scheduler; +package org.apache.bifromq.dist.client.scheduler; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import java.time.Duration; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubRequest.java b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubRequest.java similarity index 85% rename from bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubRequest.java rename to bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubRequest.java index 1187daa89..5ebbfe73e 100644 --- a/bifromq-dist/bifromq-dist-client/src/main/java/com/baidu/bifromq/dist/client/scheduler/PubRequest.java +++ b/bifromq-dist/bifromq-dist-client/src/main/java/org/apache/bifromq/dist/client/scheduler/PubRequest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.client.scheduler; +package org.apache.bifromq.dist.client.scheduler; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; import lombok.AllArgsConstructor; @AllArgsConstructor diff --git a/bifromq-dist/bifromq-dist-client/src/test/resources/logback.xml b/bifromq-dist/bifromq-dist-client/src/test/resources/logback.xml index 98bef92a2..1d9f3920c 100644 --- a/bifromq-dist/bifromq-dist-client/src/test/resources/logback.xml +++ b/bifromq-dist/bifromq-dist-client/src/test/resources/logback.xml @@ -20,7 +20,7 @@ - + diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/ITopicFilterIterator.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/ITopicFilterIterator.java similarity index 98% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/ITopicFilterIterator.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/ITopicFilterIterator.java index 43c4bce92..c9ca6f69e 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/ITopicFilterIterator.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/ITopicFilterIterator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; import java.util.List; import java.util.Map; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/MTopicFilterTrieNode.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/MTopicFilterTrieNode.java similarity index 95% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/MTopicFilterTrieNode.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/MTopicFilterTrieNode.java index 8e99edd7a..b5f94b70c 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/MTopicFilterTrieNode.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/MTopicFilterTrieNode.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; import static java.util.Collections.emptySet; import static java.util.Collections.singleton; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/NTopicFilterTrieNode.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/NTopicFilterTrieNode.java similarity index 96% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/NTopicFilterTrieNode.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/NTopicFilterTrieNode.java index 706fd7f50..752bfb0fb 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/NTopicFilterTrieNode.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/NTopicFilterTrieNode.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/STopicFilterTrieNode.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/STopicFilterTrieNode.java similarity index 96% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/STopicFilterTrieNode.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/STopicFilterTrieNode.java index 1bc366afe..ff3477ed2 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/STopicFilterTrieNode.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/STopicFilterTrieNode.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicFilterIterator.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicFilterIterator.java similarity index 99% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicFilterIterator.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicFilterIterator.java index b2822ba03..e97b9dd11 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicFilterIterator.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicFilterIterator.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.NUL; import java.util.Collections; import java.util.HashMap; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicFilterTrieNode.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicFilterTrieNode.java similarity index 97% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicFilterTrieNode.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicFilterTrieNode.java index 616fcd51c..71fa4b12a 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicFilterTrieNode.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicFilterTrieNode.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.NUL; import com.google.common.collect.Lists; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicTrieNode.java b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicTrieNode.java similarity index 96% rename from bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicTrieNode.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicTrieNode.java index 8c59c4243..b4211a413 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/com/baidu/bifromq/dist/trie/TopicTrieNode.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/java/org/apache/bifromq/dist/trie/TopicTrieNode.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.NUL; -import static com.baidu.bifromq.util.TopicConst.SYS_PREFIX; +import static org.apache.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.SYS_PREFIX; import java.util.Collections; import java.util.HashSet; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/DistWorkerCoProc.proto b/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/DistWorkerCoProc.proto index a779f812f..ca68b6340 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/DistWorkerCoProc.proto +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/DistWorkerCoProc.proto @@ -4,7 +4,7 @@ import "distservice/TopicFanout.proto"; import "distservice/MatchRoute.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.dist.rpc.proto"; +option java_package = "org.apache.bifromq.dist.rpc.proto"; option java_outer_classname = "DistCoProcProtos"; package distservice; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/Fact.proto b/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/Fact.proto index 4bbc8f057..ac2aff7e8 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/Fact.proto +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/Fact.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.dist.rpc.proto"; +option java_package = "org.apache.bifromq.dist.rpc.proto"; option java_outer_classname = "FactProtos"; package distservice; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/TopicFanout.proto b/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/TopicFanout.proto index bdb9f4f77..37c0bc6ec 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/TopicFanout.proto +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/main/proto/distservice/TopicFanout.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.dist.rpc.proto"; +option java_package = "org.apache.bifromq.dist.rpc.proto"; option java_outer_classname = "TopicFanoutProtos"; package distservice; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TestUtil.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TestUtil.java similarity index 95% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TestUtil.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TestUtil.java index 3bd37999e..cff926eaf 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TestUtil.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TestUtil.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist; - -import static com.baidu.bifromq.util.TopicConst.DELIMITER; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.NUL; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SYS_PREFIX; -import static com.baidu.bifromq.util.TopicUtil.fastJoin; -import static com.baidu.bifromq.util.TopicUtil.parse; +package org.apache.bifromq.dist; + +import static org.apache.bifromq.util.TopicConst.DELIMITER; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SYS_PREFIX; +import static org.apache.bifromq.util.TopicUtil.fastJoin; +import static org.apache.bifromq.util.TopicUtil.parse; import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Lists.newLinkedList; import static java.util.Collections.singleton; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TestUtilTest.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TestUtilTest.java similarity index 97% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TestUtilTest.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TestUtilTest.java index 84c5fcf9a..1cda513ef 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TestUtilTest.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TestUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist; +package org.apache.bifromq.dist; import static org.testng.Assert.assertEquals; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TopicMatcher.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TopicMatcher.java similarity index 92% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TopicMatcher.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TopicMatcher.java index ba1a68a34..a624a2da6 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TopicMatcher.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TopicMatcher.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist; +package org.apache.bifromq.dist; -import static com.baidu.bifromq.dist.TestUtil.findNext; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SYS_PREFIX; +import static org.apache.bifromq.dist.TestUtil.findNext; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SYS_PREFIX; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.util.TopicUtil; import java.util.List; import java.util.Optional; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TopicMatcherTest.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TopicMatcherTest.java similarity index 95% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TopicMatcherTest.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TopicMatcherTest.java index 335049516..cef5e48c0 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/TopicMatcherTest.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/TopicMatcherTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist; +package org.apache.bifromq.dist; -import static com.baidu.bifromq.util.TopicUtil.escape; +import static org.apache.bifromq.util.TopicUtil.escape; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -47,7 +47,7 @@ public void testMatch() { @Test public void testMatchSysTopic() { - String topic = "$sys/baidu/user/event/abc"; + String topic = "$sys/bifromq/user/event/abc"; TopicMatcher matcher = new TopicMatcher(topic); List topicFilters = TestUtil.expand(topic); for (int i = topicFilters.size() - 1; i >= 0; i--) { diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/Fixtures.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/Fixtures.java similarity index 98% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/Fixtures.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/Fixtures.java index 0c5a6cdf6..2c369a13b 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/Fixtures.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/Fixtures.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; import java.util.HashMap; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/TopicFilterIteratorTest.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/TopicFilterIteratorTest.java similarity index 96% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/TopicFilterIteratorTest.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/TopicFilterIteratorTest.java index f30960e7d..558cbab39 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/TopicFilterIteratorTest.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/TopicFilterIteratorTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.dist.TestUtil.randomTopic; -import static com.baidu.bifromq.dist.TestUtil.randomTopicFilter; -import static com.baidu.bifromq.util.TopicConst.NUL; -import static com.baidu.bifromq.util.TopicUtil.escape; -import static com.baidu.bifromq.util.TopicUtil.fastJoin; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.dist.TestUtil.randomTopic; +import static org.apache.bifromq.dist.TestUtil.randomTopicFilter; +import static org.apache.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicUtil.escape; +import static org.apache.bifromq.util.TopicUtil.fastJoin; +import static org.apache.bifromq.util.TopicUtil.parse; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.dist.TestUtil; -import com.baidu.bifromq.util.TopicConst; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.TestUtil; +import org.apache.bifromq.util.TopicConst; +import org.apache.bifromq.util.TopicUtil; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/TopicTrieNodeTest.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/TopicTrieNodeTest.java similarity index 97% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/TopicTrieNodeTest.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/TopicTrieNodeTest.java index 9ac0602fb..749a098f3 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/TopicTrieNodeTest.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/TopicTrieNodeTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie; +package org.apache.bifromq.dist.trie; -import static com.baidu.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.NUL; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java similarity index 97% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java index 6629ff3cd..97b85320c 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmark.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie.benchmark; +package org.apache.bifromq.dist.trie.benchmark; import lombok.SneakyThrows; import org.openjdk.jmh.annotations.Benchmark; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java similarity index 88% rename from bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java rename to bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java index 55ed088c9..2e4bc0c8d 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/com/baidu/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/java/org/apache/bifromq/dist/trie/benchmark/TopicTrieBuilderBenchmarkState.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.trie.benchmark; +package org.apache.bifromq.dist.trie.benchmark; -import com.baidu.bifromq.dist.TestUtil; -import com.baidu.bifromq.dist.trie.TopicTrieNode; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.TestUtil; +import org.apache.bifromq.dist.trie.TopicTrieNode; +import org.apache.bifromq.util.TopicUtil; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.openjdk.jmh.annotations.Level; diff --git a/bifromq-dist/bifromq-dist-coproc-proto/src/test/resources/logback.xml b/bifromq-dist/bifromq-dist-coproc-proto/src/test/resources/logback.xml index 4b7c7e9bb..fd62f5207 100644 --- a/bifromq-dist/bifromq-dist-coproc-proto/src/test/resources/logback.xml +++ b/bifromq-dist/bifromq-dist-coproc-proto/src/test/resources/logback.xml @@ -19,7 +19,7 @@ - + diff --git a/bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/RPCBluePrint.java b/bifromq-dist/bifromq-dist-rpc-definition/src/main/java/org/apache/bifromq/dist/RPCBluePrint.java similarity index 89% rename from bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/RPCBluePrint.java rename to bifromq-dist/bifromq-dist-rpc-definition/src/main/java/org/apache/bifromq/dist/RPCBluePrint.java index b95446d2c..5a6b727c5 100644 --- a/bifromq-dist/bifromq-dist-rpc-definition/src/main/java/com/baidu/bifromq/dist/RPCBluePrint.java +++ b/bifromq-dist/bifromq-dist-rpc-definition/src/main/java/org/apache/bifromq/dist/RPCBluePrint.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist; +package org.apache.bifromq.dist; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.dist.rpc.proto.DistServiceGrpc; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.dist.rpc.proto.DistServiceGrpc; public class RPCBluePrint { public static final BluePrint INSTANCE = BluePrint.builder() diff --git a/bifromq-dist/bifromq-dist-rpc-definition/src/main/proto/distservice/DistService.proto b/bifromq-dist/bifromq-dist-rpc-definition/src/main/proto/distservice/DistService.proto index b86d9f1e2..eaf7421eb 100644 --- a/bifromq-dist/bifromq-dist-rpc-definition/src/main/proto/distservice/DistService.proto +++ b/bifromq-dist/bifromq-dist-rpc-definition/src/main/proto/distservice/DistService.proto @@ -3,7 +3,7 @@ import "commontype/RouteMatcher.proto"; import "commontype/TopicMessage.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.dist.rpc.proto"; +option java_package = "org.apache.bifromq.dist.rpc.proto"; option java_outer_classname = "DistServiceProtos"; package distservice; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistResponsePipeline.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistResponsePipeline.java similarity index 78% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistResponsePipeline.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistResponsePipeline.java index f6e4559e3..047c69468 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistResponsePipeline.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistResponsePipeline.java @@ -11,29 +11,29 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.plugin.eventcollector.distservice.DistError.DistErrorCode.DROP_EXCEED_LIMIT; -import static com.baidu.bifromq.plugin.eventcollector.distservice.DistError.DistErrorCode.RPC_FAILURE; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.eventcollector.distservice.DistError.DistErrorCode.DROP_EXCEED_LIMIT; +import static org.apache.bifromq.plugin.eventcollector.distservice.DistError.DistErrorCode.RPC_FAILURE; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.baserpc.server.ResponsePipeline; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.dist.rpc.proto.DistReply; -import com.baidu.bifromq.dist.rpc.proto.DistRequest; -import com.baidu.bifromq.dist.server.scheduler.DistServerCallResult; -import com.baidu.bifromq.dist.server.scheduler.IDistWorkerCallScheduler; -import com.baidu.bifromq.dist.server.scheduler.TenantPubRequest; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.distservice.DistError; -import com.baidu.bifromq.plugin.eventcollector.distservice.Disted; -import com.baidu.bifromq.sysprops.props.DistWorkerCallQueueNum; -import com.baidu.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; -import com.baidu.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; -import com.baidu.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; -import com.baidu.bifromq.type.PublisherMessagePack; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.baserpc.server.ResponsePipeline; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.dist.rpc.proto.DistReply; +import org.apache.bifromq.dist.rpc.proto.DistRequest; +import org.apache.bifromq.dist.server.scheduler.DistServerCallResult; +import org.apache.bifromq.dist.server.scheduler.IDistWorkerCallScheduler; +import org.apache.bifromq.dist.server.scheduler.TenantPubRequest; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.distservice.DistError; +import org.apache.bifromq.plugin.eventcollector.distservice.Disted; +import org.apache.bifromq.sysprops.props.DistWorkerCallQueueNum; +import org.apache.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; +import org.apache.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; +import org.apache.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; +import org.apache.bifromq.type.PublisherMessagePack; import io.grpc.stub.StreamObserver; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServer.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistServer.java similarity index 94% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServer.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistServer.java index e6672992e..dde0c06ce 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServer.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistServer.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.dist.RPCBluePrint; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.dist.RPCBluePrint; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServerBuilder.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistServerBuilder.java similarity index 83% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServerBuilder.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistServerBuilder.java index f6b79de65..9adbe19c3 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistServerBuilder.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistServerBuilder.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.HashSet; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistService.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistService.java similarity index 67% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistService.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistService.java index 91a7eebea..dfbd80600 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/DistService.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/DistService.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; -import static com.baidu.bifromq.baserpc.server.UnaryResponse.response; +import static org.apache.bifromq.baserpc.server.UnaryResponse.response; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.dist.rpc.proto.DistReply; -import com.baidu.bifromq.dist.rpc.proto.DistRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceGrpc; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; -import com.baidu.bifromq.dist.server.handler.MatchReqHandler; -import com.baidu.bifromq.dist.server.handler.UnmatchReqHandler; -import com.baidu.bifromq.dist.server.scheduler.DistWorkerCallScheduler; -import com.baidu.bifromq.dist.server.scheduler.IDistWorkerCallScheduler; -import com.baidu.bifromq.dist.server.scheduler.IMatchCallScheduler; -import com.baidu.bifromq.dist.server.scheduler.IUnmatchCallScheduler; -import com.baidu.bifromq.dist.server.scheduler.MatchCallScheduler; -import com.baidu.bifromq.dist.server.scheduler.UnmatchCallScheduler; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.dist.rpc.proto.DistReply; +import org.apache.bifromq.dist.rpc.proto.DistRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceGrpc; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.dist.server.handler.MatchReqHandler; +import org.apache.bifromq.dist.server.handler.UnmatchReqHandler; +import org.apache.bifromq.dist.server.scheduler.DistWorkerCallScheduler; +import org.apache.bifromq.dist.server.scheduler.IDistWorkerCallScheduler; +import org.apache.bifromq.dist.server.scheduler.IMatchCallScheduler; +import org.apache.bifromq.dist.server.scheduler.IUnmatchCallScheduler; +import org.apache.bifromq.dist.server.scheduler.MatchCallScheduler; +import org.apache.bifromq.dist.server.scheduler.UnmatchCallScheduler; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/IDistServer.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/IDistServer.java similarity index 95% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/IDistServer.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/IDistServer.java index 57572e572..5407ee295 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/IDistServer.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/IDistServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; public interface IDistServer { static DistServerBuilder builder() { diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/IDistServiceReqHandler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/IDistServiceReqHandler.java similarity index 94% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/IDistServiceReqHandler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/IDistServiceReqHandler.java index 5fda887e3..4923601a9 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/IDistServiceReqHandler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/IDistServiceReqHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.handler; +package org.apache.bifromq.dist.server.handler; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/MatchReqHandler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/MatchReqHandler.java similarity index 86% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/MatchReqHandler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/MatchReqHandler.java index 50a9ea1fd..a7172afba 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/MatchReqHandler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/MatchReqHandler.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.handler; +package org.apache.bifromq.dist.server.handler; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.dist.server.scheduler.IMatchCallScheduler; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.distservice.MatchError; -import com.baidu.bifromq.plugin.eventcollector.distservice.Matched; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.dist.server.scheduler.IMatchCallScheduler; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.distservice.MatchError; +import org.apache.bifromq.plugin.eventcollector.distservice.Matched; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/UnmatchReqHandler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/UnmatchReqHandler.java similarity index 84% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/UnmatchReqHandler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/UnmatchReqHandler.java index 0c43ae56f..019c07313 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/handler/UnmatchReqHandler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/handler/UnmatchReqHandler.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.handler; +package org.apache.bifromq.dist.server.handler; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; -import com.baidu.bifromq.dist.server.scheduler.IUnmatchCallScheduler; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.distservice.UnmatchError; -import com.baidu.bifromq.plugin.eventcollector.distservice.Unmatched; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.dist.server.scheduler.IUnmatchCallScheduler; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.distservice.UnmatchError; +import org.apache.bifromq.plugin.eventcollector.distservice.Unmatched; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchDistServerCall.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchDistServerCall.java similarity index 88% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchDistServerCall.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchDistServerCall.java index f7be2d54e..54fb97f44 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchDistServerCall.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchDistServerCall.java @@ -11,40 +11,40 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.util.TopicConst.NUL; -import static com.baidu.bifromq.util.TopicUtil.fastJoin; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicUtil.fastJoin; import static java.util.Collections.emptyMap; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.dist.rpc.proto.BatchDistRequest; -import com.baidu.bifromq.dist.rpc.proto.DistPack; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.Fact; -import com.baidu.bifromq.dist.trie.TopicFilterIterator; -import com.baidu.bifromq.dist.trie.TopicTrieNode; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.PublisherMessagePack; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.dist.rpc.proto.BatchDistRequest; +import org.apache.bifromq.dist.rpc.proto.DistPack; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcInput; +import org.apache.bifromq.dist.rpc.proto.Fact; +import org.apache.bifromq.dist.trie.TopicFilterIterator; +import org.apache.bifromq.dist.trie.TopicTrieNode; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.PublisherMessagePack; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; import com.google.common.collect.Iterables; import com.google.protobuf.ByteString; import java.util.ArrayDeque; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchMatchCall.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchMatchCall.java similarity index 82% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchMatchCall.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchMatchCall.java index bb22ca909..684ccb756 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchMatchCall.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchMatchCall.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.TenantOption; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.rpc.proto.BatchMatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.TenantOption; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.HashMap; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchUnmatchCall.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchUnmatchCall.java similarity index 84% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchUnmatchCall.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchUnmatchCall.java index 1c8ec59a2..513b08c8f 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/BatchUnmatchCall.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/BatchUnmatchCall.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.HashMap; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java similarity index 93% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java index 49bfa78e8..182417c4a 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistServerCallBatcherKey.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; public record DistServerCallBatcherKey(String tenantId, int batcherId) { diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistServerCallResult.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistServerCallResult.java similarity index 94% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistServerCallResult.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistServerCallResult.java index dd57d42f0..f0faa4264 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistServerCallResult.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistServerCallResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; import java.util.Map; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java similarity index 89% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java index bb115f6dc..f9f013af1 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/DistWorkerCallScheduler.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basescheduler.BatchCallScheduler; import java.util.Optional; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java similarity index 86% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java index 67bb2ab24..af108f62e 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IDistWorkerCallScheduler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; public interface IDistWorkerCallScheduler extends IBatchCallScheduler { } diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IMatchCallScheduler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IMatchCallScheduler.java similarity index 76% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IMatchCallScheduler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IMatchCallScheduler.java index 1dec07a2d..3d71fe344 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IMatchCallScheduler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IMatchCallScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; public interface IMatchCallScheduler extends IBatchCallScheduler { } diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java similarity index 76% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java index 2656e5f27..8ee95f314 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/IUnmatchCallScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; public interface IUnmatchCallScheduler extends IBatchCallScheduler { } diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/MatchCallScheduler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/MatchCallScheduler.java similarity index 69% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/MatchCallScheduler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/MatchCallScheduler.java index fe8d9c344..5215eabb2 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/MatchCallScheduler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/MatchCallScheduler.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.type.RouteMatcher; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/TenantPubRequest.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/TenantPubRequest.java similarity index 88% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/TenantPubRequest.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/TenantPubRequest.java index 78cb43c8f..cc6503d7c 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/TenantPubRequest.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/TenantPubRequest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import com.baidu.bifromq.type.PublisherMessagePack; +import org.apache.bifromq.type.PublisherMessagePack; import java.util.List; public record TenantPubRequest(String tenantId, List publisherMessagePacks, int callQueueIdx) { diff --git a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/UnmatchCallScheduler.java b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/UnmatchCallScheduler.java similarity index 69% rename from bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/UnmatchCallScheduler.java rename to bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/UnmatchCallScheduler.java index 23cdad3dd..aeb3d8c11 100644 --- a/bifromq-dist/bifromq-dist-server/src/main/java/com/baidu/bifromq/dist/server/scheduler/UnmatchCallScheduler.java +++ b/bifromq-dist/bifromq-dist-server/src/main/java/org/apache/bifromq/dist/server/scheduler/UnmatchCallScheduler.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.type.RouteMatcher; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/DistServiceTest.java b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/DistServiceTest.java similarity index 79% rename from bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/DistServiceTest.java rename to bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/DistServiceTest.java index c1200ddeb..a398a0470 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/DistServiceTest.java +++ b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/DistServiceTest.java @@ -11,36 +11,36 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.worker.IDistWorker; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.plugin.subbroker.ISubBroker; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.worker.IDistWorker; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.plugin.subbroker.ISubBroker; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import java.time.Duration; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/DistTest.java b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/DistTest.java similarity index 91% rename from bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/DistTest.java rename to bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/DistTest.java index 437cb6158..58278bfe8 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/DistTest.java +++ b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/DistTest.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server; +package org.apache.bifromq.dist.server; -import static com.baidu.bifromq.plugin.subbroker.TypeUtil.to; -import static com.baidu.bifromq.plugin.subbroker.TypeUtil.toResult; +import static org.apache.bifromq.plugin.subbroker.TypeUtil.to; +import static org.apache.bifromq.plugin.subbroker.TypeUtil.toResult; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.fail; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.util.HashMap; diff --git a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/handler/MatchReqHandlerTest.java b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/handler/MatchReqHandlerTest.java similarity index 89% rename from bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/handler/MatchReqHandlerTest.java rename to bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/handler/MatchReqHandlerTest.java index 902828d2d..a3d368d5a 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/handler/MatchReqHandlerTest.java +++ b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/handler/MatchReqHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.handler; +package org.apache.bifromq.dist.server.handler; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.any; @@ -22,14 +22,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.dist.server.scheduler.IMatchCallScheduler; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.distservice.MatchError; -import com.baidu.bifromq.plugin.eventcollector.distservice.Matched; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.dist.server.scheduler.IMatchCallScheduler; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.distservice.MatchError; +import org.apache.bifromq.plugin.eventcollector.distservice.Matched; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import org.testng.annotations.BeforeMethod; diff --git a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/handler/UnmatchReqHandlerTest.java b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/handler/UnmatchReqHandlerTest.java similarity index 88% rename from bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/handler/UnmatchReqHandlerTest.java rename to bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/handler/UnmatchReqHandlerTest.java index b7dc9a3b0..5c1e79691 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/handler/UnmatchReqHandlerTest.java +++ b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/handler/UnmatchReqHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.handler; +package org.apache.bifromq.dist.server.handler; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.any; @@ -22,15 +22,15 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; -import com.baidu.bifromq.dist.server.scheduler.IUnmatchCallScheduler; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.distservice.UnmatchError; -import com.baidu.bifromq.plugin.eventcollector.distservice.Unmatched; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.dist.server.scheduler.IUnmatchCallScheduler; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.distservice.UnmatchError; +import org.apache.bifromq.plugin.eventcollector.distservice.Unmatched; +import org.apache.bifromq.util.TopicUtil; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import org.testng.annotations.BeforeMethod; diff --git a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/scheduler/BatchMatchCallTest.java b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/scheduler/BatchMatchCallTest.java similarity index 88% rename from bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/scheduler/BatchMatchCallTest.java rename to bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/scheduler/BatchMatchCallTest.java index 5cae8afb9..80b083b0a 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/scheduler/BatchMatchCallTest.java +++ b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/scheduler/BatchMatchCallTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; import static org.mockito.Mockito.mock; @@ -20,20 +20,20 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcOutput; -import com.baidu.bifromq.dist.rpc.proto.MatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRequest; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.rpc.proto.BatchMatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcOutput; +import org.apache.bifromq.dist.rpc.proto.MatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRequest; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.util.TopicUtil; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java similarity index 88% rename from bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java rename to bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java index 51b895214..576d5d372 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/java/com/baidu/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java +++ b/bifromq-dist/bifromq-dist-server/src/test/java/org/apache/bifromq/dist/server/scheduler/BatchUnmatchCallTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.server.scheduler; +package org.apache.bifromq.dist.server.scheduler; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -19,18 +19,18 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcOutput; -import com.baidu.bifromq.dist.rpc.proto.UnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.UnmatchRequest; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcOutput; +import org.apache.bifromq.dist.rpc.proto.UnmatchReply; +import org.apache.bifromq.dist.rpc.proto.UnmatchRequest; +import org.apache.bifromq.util.TopicUtil; import java.util.LinkedList; import java.util.List; import java.util.Queue; diff --git a/bifromq-dist/bifromq-dist-server/src/test/resources/logback.xml b/bifromq-dist/bifromq-dist-server/src/test/resources/logback.xml index 3ebedbcf7..07250d08d 100644 --- a/bifromq-dist/bifromq-dist-server/src/test/resources/logback.xml +++ b/bifromq-dist/bifromq-dist-server/src/test/resources/logback.xml @@ -19,7 +19,6 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/GroupMatching.java b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/GroupMatching.java similarity index 94% rename from bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/GroupMatching.java rename to bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/GroupMatching.java index 8dbc6b914..85d6aeddd 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/GroupMatching.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/GroupMatching.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/KVSchemaUtil.java b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/KVSchemaUtil.java similarity index 91% rename from bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/KVSchemaUtil.java rename to bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/KVSchemaUtil.java index 5a3b4cf8c..30c46c38a 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/KVSchemaUtil.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/KVSchemaUtil.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; - -import static com.baidu.bifromq.util.BSUtil.toByteString; -import static com.baidu.bifromq.util.BSUtil.toShort; -import static com.baidu.bifromq.util.TopicConst.DELIMITER; -import static com.baidu.bifromq.util.TopicConst.NUL; -import static com.baidu.bifromq.util.TopicConst.ORDERED_SHARE; -import static com.baidu.bifromq.util.TopicConst.UNORDERED_SHARE; -import static com.baidu.bifromq.util.TopicUtil.parse; -import static com.baidu.bifromq.util.TopicUtil.unescape; +package org.apache.bifromq.dist.worker.schema; + +import static org.apache.bifromq.util.BSUtil.toByteString; +import static org.apache.bifromq.util.BSUtil.toShort; +import static org.apache.bifromq.util.TopicConst.DELIMITER; +import static org.apache.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.ORDERED_SHARE; +import static org.apache.bifromq.util.TopicConst.UNORDERED_SHARE; +import static org.apache.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.util.TopicUtil.unescape; import static com.google.protobuf.ByteString.copyFromUtf8; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.RouteGroup; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.util.BSUtil; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.RouteGroup; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.util.BSUtil; import com.google.protobuf.ByteString; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/Matching.java b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/Matching.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/Matching.java rename to bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/Matching.java index c95a07962..f8eeb515f 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/Matching.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/Matching.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/NormalMatching.java b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/NormalMatching.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/NormalMatching.java rename to bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/NormalMatching.java index f4c00f2cb..47a339a2e 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/NormalMatching.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/NormalMatching.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.RouteMatcher; import lombok.EqualsAndHashCode; import lombok.ToString; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/RouteDetail.java b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/RouteDetail.java similarity index 90% rename from bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/RouteDetail.java rename to bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/RouteDetail.java index e67b24217..476b14d53 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/java/com/baidu/bifromq/dist/worker/schema/RouteDetail.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/java/org/apache/bifromq/dist/worker/schema/RouteDetail.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; /** * RouteDetail parsed from a match record key. diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/MatchRoute.proto b/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/MatchRoute.proto index 35d0123b3..c4d843aea 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/MatchRoute.proto +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/MatchRoute.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "commontype/RouteMatcher.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.dist.rpc.proto"; +option java_package = "org.apache.bifromq.dist.rpc.proto"; option java_outer_classname = "MatchRouteProtos"; package distservice; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/RouteGroup.proto b/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/RouteGroup.proto index 45b2e0204..09f2d9985 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/RouteGroup.proto +++ b/bifromq-dist/bifromq-dist-worker-schema/src/main/proto/distservice/RouteGroup.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.dist.rpc.proto"; +option java_package = "org.apache.bifromq.dist.rpc.proto"; option java_outer_classname = "GroupMembersProtos"; package distservice; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/GroupMatchingTest.java b/bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/GroupMatchingTest.java similarity index 91% rename from bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/GroupMatchingTest.java rename to bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/GroupMatchingTest.java index a9019b9ab..f0d515245 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/GroupMatchingTest.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/GroupMatchingTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotEquals; -import com.baidu.bifromq.dist.rpc.proto.RouteGroup; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.rpc.proto.RouteGroup; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import org.testng.annotations.Test; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/KVSchemaUtilTest.java b/bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/KVSchemaUtilTest.java similarity index 86% rename from bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/KVSchemaUtilTest.java rename to bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/KVSchemaUtilTest.java index 80c4d26ab..b94c65fdf 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/KVSchemaUtilTest.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/KVSchemaUtilTest.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.buildMatchRoute; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.buildMatchRoute; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.RouteGroup; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.util.BSUtil; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.RouteGroup; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.util.BSUtil; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import org.testng.annotations.Test; diff --git a/bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/NormalMatchingTest.java b/bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/NormalMatchingTest.java similarity index 81% rename from bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/NormalMatchingTest.java rename to bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/NormalMatchingTest.java index 23dbc899d..4592bc666 100644 --- a/bifromq-dist/bifromq-dist-worker-schema/src/test/java/com/baidu/bifromq/dist/worker/schema/NormalMatchingTest.java +++ b/bifromq-dist/bifromq-dist-worker-schema/src/test/java/org/apache/bifromq/dist/worker/schema/NormalMatchingTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.schema; +package org.apache.bifromq.dist.worker.schema; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; -import static com.baidu.bifromq.util.BSUtil.toByteString; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.util.BSUtil.toByteString; import static org.testng.Assert.assertNotEquals; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import org.testng.annotations.Test; diff --git a/bifromq-dist/bifromq-dist-worker-spi/src/main/java/com/baidu/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java b/bifromq-dist/bifromq-dist-worker-spi/src/main/java/org/apache/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java similarity index 89% rename from bifromq-dist/bifromq-dist-worker-spi/src/main/java/com/baidu/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java rename to bifromq-dist/bifromq-dist-worker-spi/src/main/java/org/apache/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java index 2744b466f..0f69fa6bb 100644 --- a/bifromq-dist/bifromq-dist-worker-spi/src/main/java/com/baidu/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java +++ b/bifromq-dist/bifromq-dist-worker-spi/src/main/java/org/apache/bifromq/dist/worker/spi/IDistWorkerBalancerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.spi; +package org.apache.bifromq.dist.worker.spi; -import com.baidu.bifromq.basekv.balance.IStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.IStoreBalancerFactory; import com.google.protobuf.Struct; /** diff --git a/bifromq-dist/bifromq-dist-worker-spi/src/main/java/com/baidu/bifromq/dist/worker/spi/SplitKey.java b/bifromq-dist/bifromq-dist-worker-spi/src/main/java/org/apache/bifromq/dist/worker/spi/SplitKey.java similarity index 77% rename from bifromq-dist/bifromq-dist-worker-spi/src/main/java/com/baidu/bifromq/dist/worker/spi/SplitKey.java rename to bifromq-dist/bifromq-dist-worker-spi/src/main/java/org/apache/bifromq/dist/worker/spi/SplitKey.java index cdf628adf..a1332013f 100644 --- a/bifromq-dist/bifromq-dist-worker-spi/src/main/java/com/baidu/bifromq/dist/worker/spi/SplitKey.java +++ b/bifromq-dist/bifromq-dist-worker-spi/src/main/java/org/apache/bifromq/dist/worker/spi/SplitKey.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.spi; +package org.apache.bifromq.dist.worker.spi; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantRouteStartKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantRouteStartKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; /** diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/Comparators.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/Comparators.java similarity index 94% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/Comparators.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/Comparators.java index f5450209f..261d1b161 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/Comparators.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/Comparators.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; import java.util.Comparator; import java.util.Iterator; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DeliverExecutor.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DeliverExecutor.java similarity index 86% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DeliverExecutor.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DeliverExecutor.java index d60778aae..dd0afb527 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DeliverExecutor.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DeliverExecutor.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.deliverer.DeliveryCall; -import com.baidu.bifromq.deliverer.IMessageDeliverer; -import com.baidu.bifromq.deliverer.TopicMessagePackHolder; -import com.baidu.bifromq.dist.worker.schema.NormalMatching; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.distservice.DeliverError; -import com.baidu.bifromq.plugin.eventcollector.distservice.Delivered; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.deliverer.DeliveryCall; +import org.apache.bifromq.deliverer.IMessageDeliverer; +import org.apache.bifromq.deliverer.TopicMessagePackHolder; +import org.apache.bifromq.dist.worker.schema.NormalMatching; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.distservice.DeliverError; +import org.apache.bifromq.plugin.eventcollector.distservice.Delivered; +import org.apache.bifromq.type.MatchInfo; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DeliverExecutorGroup.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DeliverExecutorGroup.java similarity index 88% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DeliverExecutorGroup.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DeliverExecutorGroup.java index ecd459348..e7782d4da 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DeliverExecutorGroup.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DeliverExecutorGroup.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentFanOutBytes; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentFanOutBytesPerSeconds; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentFanOutBytes; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentFanOutBytesPerSeconds; -import com.baidu.bifromq.deliverer.IMessageDeliverer; -import com.baidu.bifromq.deliverer.TopicMessagePackHolder; -import com.baidu.bifromq.dist.worker.schema.GroupMatching; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.dist.worker.schema.NormalMatching; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.sysprops.props.DistInlineFanOutThreshold; -import com.baidu.bifromq.sysprops.props.DistTopicMatchExpirySeconds; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.SizeUtil; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.deliverer.IMessageDeliverer; +import org.apache.bifromq.deliverer.TopicMessagePackHolder; +import org.apache.bifromq.dist.worker.schema.GroupMatching; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.dist.worker.schema.NormalMatching; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.sysprops.props.DistInlineFanOutThreshold; +import org.apache.bifromq.sysprops.props.DistTopicMatchExpirySeconds; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.SizeUtil; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorker.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorker.java similarity index 92% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorker.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorker.java index ed0dd244e..a22fbd82f 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorker.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorker.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basehookloader.BaseHookLoader; -import com.baidu.bifromq.basekv.balance.KVStoreBalanceController; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.server.IBaseKVStoreServer; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.deliverer.BatchDeliveryCallBuilderFactory; -import com.baidu.bifromq.deliverer.IMessageDeliverer; -import com.baidu.bifromq.deliverer.MessageDeliverer; -import com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basehookloader.BaseHookLoader; +import org.apache.bifromq.basekv.balance.KVStoreBalanceController; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.server.IBaseKVStoreServer; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.deliverer.BatchDeliveryCallBuilderFactory; +import org.apache.bifromq.deliverer.IMessageDeliverer; +import org.apache.bifromq.deliverer.MessageDeliverer; +import org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerBuilder.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerBuilder.java similarity index 77% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerBuilder.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerBuilder.java index 412f0669b..eb3dd72aa 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerBuilder.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerBuilder.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.Struct; import java.time.Duration; import java.util.HashMap; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCleaner.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCleaner.java similarity index 81% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCleaner.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCleaner.java index d54912d3c..33a2ea68c 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCleaner.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCleaner.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.GCReply; -import com.baidu.bifromq.dist.rpc.proto.GCRequest; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcInput; +import org.apache.bifromq.dist.rpc.proto.GCReply; +import org.apache.bifromq.dist.rpc.proto.GCRequest; import java.time.Duration; import java.util.Collection; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCoProc.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCoProc.java similarity index 89% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCoProc.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCoProc.java index 9ac9c88ff..579e6d1bf 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCoProc.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCoProc.java @@ -11,60 +11,60 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isNULLRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.Comparators.FilterLevelsComparator; -import static com.baidu.bifromq.dist.worker.Comparators.RouteMatcherComparator; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.buildMatchRoute; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isNULLRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.Comparators.FilterLevelsComparator; +import static org.apache.bifromq.dist.worker.Comparators.RouteMatcherComparator; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.buildMatchRoute; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; import static java.util.Collections.singletonList; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.dist.rpc.proto.BatchDistRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistPack; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcOutput; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcOutput; -import com.baidu.bifromq.dist.rpc.proto.Fact; -import com.baidu.bifromq.dist.rpc.proto.GCReply; -import com.baidu.bifromq.dist.rpc.proto.GCRequest; -import com.baidu.bifromq.dist.rpc.proto.GlobalFilterLevels; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.RouteGroup; -import com.baidu.bifromq.dist.rpc.proto.TopicFanout; -import com.baidu.bifromq.dist.worker.cache.ISubscriptionCache; -import com.baidu.bifromq.dist.worker.schema.GroupMatching; -import com.baidu.bifromq.dist.worker.schema.KVSchemaUtil; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.dist.worker.schema.NormalMatching; -import com.baidu.bifromq.dist.worker.schema.RouteDetail; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.BSUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.dist.rpc.proto.BatchDistRequest; +import org.apache.bifromq.dist.rpc.proto.BatchMatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistPack; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcInput; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcOutput; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcOutput; +import org.apache.bifromq.dist.rpc.proto.Fact; +import org.apache.bifromq.dist.rpc.proto.GCReply; +import org.apache.bifromq.dist.rpc.proto.GCRequest; +import org.apache.bifromq.dist.rpc.proto.GlobalFilterLevels; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.RouteGroup; +import org.apache.bifromq.dist.rpc.proto.TopicFanout; +import org.apache.bifromq.dist.worker.cache.ISubscriptionCache; +import org.apache.bifromq.dist.worker.schema.GroupMatching; +import org.apache.bifromq.dist.worker.schema.KVSchemaUtil; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.dist.worker.schema.NormalMatching; +import org.apache.bifromq.dist.worker.schema.RouteDetail; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.BSUtil; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.protobuf.Any; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCoProcFactory.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCoProcFactory.java similarity index 79% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCoProcFactory.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCoProcFactory.java index 09d28c5da..4140f5b51 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/DistWorkerCoProcFactory.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/DistWorkerCoProcFactory.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; -import com.baidu.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.deliverer.IMessageDeliverer; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.worker.cache.ISubscriptionCache; -import com.baidu.bifromq.dist.worker.cache.SubscriptionCache; -import com.baidu.bifromq.dist.worker.hinter.FanoutSplitHinter; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.sysprops.props.DistFanOutParallelism; -import com.baidu.bifromq.sysprops.props.DistMatchParallelism; -import com.baidu.bifromq.sysprops.props.DistWorkerFanOutSplitThreshold; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.deliverer.IMessageDeliverer; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.worker.cache.ISubscriptionCache; +import org.apache.bifromq.dist.worker.cache.SubscriptionCache; +import org.apache.bifromq.dist.worker.hinter.FanoutSplitHinter; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.sysprops.props.DistFanOutParallelism; +import org.apache.bifromq.sysprops.props.DistMatchParallelism; +import org.apache.bifromq.sysprops.props.DistWorkerFanOutSplitThreshold; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDeliverExecutorGroup.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/IDeliverExecutorGroup.java similarity index 82% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDeliverExecutorGroup.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/IDeliverExecutorGroup.java index 2c611cbec..9d741edbc 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDeliverExecutorGroup.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/IDeliverExecutorGroup.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.TopicMessagePack; import java.util.Set; public interface IDeliverExecutorGroup { diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDistWorker.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/IDistWorker.java similarity index 95% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDistWorker.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/IDistWorker.java index 96f2dc1d6..4952248be 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/IDistWorker.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/IDistWorker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; /** * Dist worker interface. diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/ISubscriptionCleaner.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/ISubscriptionCleaner.java similarity index 89% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/ISubscriptionCleaner.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/ISubscriptionCleaner.java index 67feb3bf0..48e3d73d2 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/ISubscriptionCleaner.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/ISubscriptionCleaner.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.plugin.subbroker.CheckRequest; import java.util.concurrent.CompletableFuture; /** diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/ITenantsState.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/ITenantsState.java similarity index 96% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/ITenantsState.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/ITenantsState.java index 8bdaacbbe..08c32931b 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/ITenantsState.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/ITenantsState.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; public interface ITenantsState { void incNormalRoutes(String tenantId); diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/RendezvousHash.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/RendezvousHash.java similarity index 97% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/RendezvousHash.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/RendezvousHash.java index cc2797ed9..093bf7965 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/RendezvousHash.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/RendezvousHash.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static com.google.common.hash.Hashing.murmur3_128; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/SubscriptionCleaner.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/SubscriptionCleaner.java similarity index 90% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/SubscriptionCleaner.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/SubscriptionCleaner.java index 8b80a8d0f..80f2f03db 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/SubscriptionCleaner.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/SubscriptionCleaner.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.type.MatchInfo; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TenantRouteState.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TenantRouteState.java similarity index 87% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TenantRouteState.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TenantRouteState.java index 790a35214..e5ff45e6f 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TenantRouteState.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TenantRouteState.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttSharedSubNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttSharedSubNumGauge; -import com.baidu.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.ITenantMeter; import java.util.concurrent.atomic.LongAdder; import java.util.function.Supplier; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TenantsState.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TenantsState.java similarity index 88% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TenantsState.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TenantsState.java index 5289e1ee3..c594233e7 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TenantsState.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TenantsState.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isNULLRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isNULLRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; import com.google.protobuf.ByteString; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TopicIndex.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TopicIndex.java similarity index 94% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TopicIndex.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TopicIndex.java index d6a35b72a..a95e388a3 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/TopicIndex.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/TopicIndex.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SYS_PREFIX; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SYS_PREFIX; -import com.baidu.bifromq.util.TopicUtil; -import com.baidu.bifromq.util.index.Branch; -import com.baidu.bifromq.util.index.TopicLevelTrie; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.util.index.Branch; +import org.apache.bifromq.util.index.TopicLevelTrie; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java similarity index 86% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java index 7cf0bc6ba..78efc6b08 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancer.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.balance; +package org.apache.bifromq.dist.worker.balance; -import static com.baidu.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_DENSITY; -import static com.baidu.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_LATENCY_NANOS; -import static com.baidu.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; +import static org.apache.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_DENSITY; +import static org.apache.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_LATENCY_NANOS; +import static org.apache.bifromq.basekv.utils.DescriptorUtil.getEffectiveEpoch; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResult; -import com.baidu.bifromq.basekv.balance.NoNeedBalance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; -import com.baidu.bifromq.basekv.utils.EffectiveEpoch; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.dist.worker.hinter.FanoutSplitHinter; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResult; +import org.apache.bifromq.basekv.balance.NoNeedBalance; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; +import org.apache.bifromq.basekv.utils.EffectiveEpoch; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.dist.worker.hinter.FanoutSplitHinter; import com.google.common.base.Preconditions; import java.util.Collections; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java similarity index 94% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java index 5a5f3115a..0539975a9 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancerFactory.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.balance; +package org.apache.bifromq.dist.worker.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; import com.google.protobuf.Struct; import com.google.protobuf.Value; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java similarity index 78% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java index 2608389ed..d131a907c 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/RangeLeaderBalancerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.balance; +package org.apache.bifromq.dist.worker.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.RangeLeaderBalancer; -import com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.RangeLeaderBalancer; +import org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; public class RangeLeaderBalancerFactory implements IDistWorkerBalancerFactory { @Override diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java similarity index 90% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java index 32e14ab38..782fd26a2 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/balance/ReplicaCntBalancerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.balance; +package org.apache.bifromq.dist.worker.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.ReplicaCntBalancer; -import com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.ReplicaCntBalancer; +import org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory; import com.google.protobuf.Struct; import com.google.protobuf.Value; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ISubscriptionCache.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ISubscriptionCache.java similarity index 84% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ISubscriptionCache.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ISubscriptionCache.java index 48dfe457d..2b33f8819 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ISubscriptionCache.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ISubscriptionCache.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.type.RouteMatcher; import java.util.List; import java.util.Map; import java.util.NavigableSet; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteCache.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteCache.java similarity index 84% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteCache.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteCache.java index d67893c00..9b0fb40f0 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteCache.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteCache.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.type.RouteMatcher; import java.util.List; import java.util.NavigableSet; import java.util.Set; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java similarity index 94% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java index f551c7bd9..a774ee38d 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteCacheFactory.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; import java.time.Duration; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteMatcher.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteMatcher.java similarity index 90% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteMatcher.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteMatcher.java index 27f40e72c..117bf248c 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ITenantRouteMatcher.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ITenantRouteMatcher.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import com.baidu.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.dist.worker.schema.Matching; import java.util.Map; import java.util.Set; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/SubscriptionCache.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/SubscriptionCache.java similarity index 85% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/SubscriptionCache.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/SubscriptionCache.java index 272d85415..8c4cafef8 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/SubscriptionCache.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/SubscriptionCache.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; - -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.cache.SubscriptionCache.TenantKey.noRefreshExpiry; -import static com.baidu.bifromq.dist.worker.cache.SubscriptionCache.TenantKey.refreshExpiry; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; - -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.sysprops.props.DistTopicMatchExpirySeconds; -import com.baidu.bifromq.type.RouteMatcher; +package org.apache.bifromq.dist.worker.cache; + +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.cache.SubscriptionCache.TenantKey.noRefreshExpiry; +import static org.apache.bifromq.dist.worker.cache.SubscriptionCache.TenantKey.refreshExpiry; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; + +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.sysprops.props.DistTopicMatchExpirySeconds; +import org.apache.bifromq.type.RouteMatcher; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.Expiry; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCache.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteCache.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCache.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteCache.java index 4d7c6d36e..74e2bddd6 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCache.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteCache.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.dist.worker.TopicIndex; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.sysprops.props.DistMaxCachedRoutesPerTenant; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.dist.worker.TopicIndex; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.sysprops.props.DistMaxCachedRoutesPerTenant; +import org.apache.bifromq.type.RouteMatcher; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCacheFactory.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteCacheFactory.java similarity index 94% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCacheFactory.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteCacheFactory.java index bddbcd6d1..ef225e670 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCacheFactory.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteCacheFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Timer; import java.time.Duration; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteMatcher.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteMatcher.java similarity index 82% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteMatcher.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteMatcher.java index e8c6371ca..49fcd3511 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/TenantRouteMatcher.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/TenantRouteMatcher.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compare; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isNULLRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.buildMatchRoute; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantRouteStartKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compare; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isNULLRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.buildMatchRoute; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantRouteStartKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.dist.trie.TopicFilterIterator; -import com.baidu.bifromq.dist.trie.TopicTrieNode; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.dist.trie.TopicFilterIterator; +import org.apache.bifromq.dist.trie.TopicTrieNode; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Timer; import java.util.HashMap; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ThreadLocalKVReader.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ThreadLocalKVReader.java similarity index 89% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ThreadLocalKVReader.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ThreadLocalKVReader.java index 5e56a89be..1db74dba5 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/cache/ThreadLocalKVReader.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/cache/ThreadLocalKVReader.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVReader; import com.google.common.collect.Sets; import java.util.Set; import java.util.function.Supplier; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/hinter/FanoutSplitHinter.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/hinter/FanoutSplitHinter.java similarity index 90% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/hinter/FanoutSplitHinter.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/hinter/FanoutSplitHinter.java index 989b2a960..2290875be 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/hinter/FanoutSplitHinter.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/hinter/FanoutSplitHinter.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.hinter; +package org.apache.bifromq.dist.worker.hinter; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVLoadRecord; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchRequest; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVLoadRecord; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.dist.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchRequest; +import org.apache.bifromq.type.RouteMatcher; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Gauge; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/hinter/RecordEstimation.java b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/hinter/RecordEstimation.java similarity index 96% rename from bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/hinter/RecordEstimation.java rename to bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/hinter/RecordEstimation.java index 7bfc47bc2..cc42ebf80 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/hinter/RecordEstimation.java +++ b/bifromq-dist/bifromq-dist-worker/src/main/java/org/apache/bifromq/dist/worker/hinter/RecordEstimation.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.hinter; +package org.apache.bifromq.dist.worker.hinter; import java.util.concurrent.atomic.AtomicInteger; diff --git a/bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory b/bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory similarity index 75% rename from bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory rename to bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory index de9992e0c..bce23fc43 100644 --- a/bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/com.baidu.bifromq.dist.worker.spi.IDistWorkerBalancerFactory +++ b/bifromq-dist/bifromq-dist-worker/src/main/resources/META-INF/services/org.apache.bifromq.dist.worker.spi.IDistWorkerBalancerFactory @@ -11,6 +11,6 @@ # See the License for the specific language governing permissions and limitations under the License. # -com.baidu.bifromq.dist.worker.balance.ReplicaCntBalancerFactory -com.baidu.bifromq.dist.worker.balance.RangeLeaderBalancerFactory -com.baidu.bifromq.dist.worker.balance.DistWorkerSplitBalancerFactory +org.apache.bifromq.dist.worker.balance.ReplicaCntBalancerFactory +org.apache.bifromq.dist.worker.balance.RangeLeaderBalancerFactory +org.apache.bifromq.dist.worker.balance.DistWorkerSplitBalancerFactory diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/BatchDistTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/BatchDistTest.java similarity index 85% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/BatchDistTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/BatchDistTest.java index 843f0b6eb..6433e2bbe 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/BatchDistTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/BatchDistTest.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import static com.baidu.bifromq.type.QoS.AT_MOST_ONCE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.QoS.AT_MOST_ONCE; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; import com.google.protobuf.ByteString; import java.util.List; import java.util.concurrent.ThreadLocalRandom; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/ComparatorsTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/ComparatorsTest.java similarity index 97% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/ComparatorsTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/ComparatorsTest.java index a07a36144..d3d266b20 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/ComparatorsTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/ComparatorsTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertTrue; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; import java.util.Arrays; import org.testng.annotations.Test; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS0Test.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS0Test.java similarity index 97% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS0Test.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS0Test.java index fca432fc0..0f44e2af9 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS0Test.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS0Test.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.type.QoS.AT_MOST_ONCE; +import static org.apache.bifromq.type.QoS.AT_MOST_ONCE; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -26,14 +26,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessagePack; import com.google.common.collect.Sets; import com.google.protobuf.ByteString; import java.util.HashSet; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS1Test.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS1Test.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS1Test.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS1Test.java index 096236b25..ff5b45b62 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS1Test.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS1Test.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -25,13 +25,13 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessagePack; import com.google.protobuf.ByteString; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS2Test.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS2Test.java similarity index 91% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS2Test.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS2Test.java index 15cc94df1..a172dec68 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistQoS2Test.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistQoS2Test.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.type.QoS.EXACTLY_ONCE; +import static org.apache.bifromq.type.QoS.EXACTLY_ONCE; import static com.google.protobuf.ByteString.copyFromUtf8; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.timeout; @@ -21,13 +21,13 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessagePack; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; import org.mockito.ArgumentCaptor; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerCleanerTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerCleanerTest.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerCleanerTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerCleanerTest.java index 1eb78335f..a6970d525 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerCleanerTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerCleanerTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; @@ -24,14 +24,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import java.time.Duration; import java.util.NavigableMap; import java.util.TreeMap; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerCoProcTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerCoProcTest.java similarity index 92% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerCoProcTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerCoProcTest.java index 0df276a79..0da5f5b2b 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerCoProcTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerCoProcTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.parseRouteDetail; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; -import static com.baidu.bifromq.util.BSUtil.toByteString; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.parseRouteDetail; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.util.BSUtil.toByteString; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -30,37 +30,37 @@ import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.dist.rpc.proto.BatchDistRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistPack; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.Fact; -import com.baidu.bifromq.dist.rpc.proto.GCReply; -import com.baidu.bifromq.dist.rpc.proto.GCRequest; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.RouteGroup; -import com.baidu.bifromq.dist.rpc.proto.TenantOption; -import com.baidu.bifromq.dist.worker.cache.ISubscriptionCache; -import com.baidu.bifromq.dist.worker.schema.KVSchemaUtil; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.BSUtil; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.dist.rpc.proto.BatchDistRequest; +import org.apache.bifromq.dist.rpc.proto.BatchMatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistPack; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcInput; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; +import org.apache.bifromq.dist.rpc.proto.Fact; +import org.apache.bifromq.dist.rpc.proto.GCReply; +import org.apache.bifromq.dist.rpc.proto.GCRequest; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.RouteGroup; +import org.apache.bifromq.dist.rpc.proto.TenantOption; +import org.apache.bifromq.dist.worker.cache.ISubscriptionCache; +import org.apache.bifromq.dist.worker.schema.KVSchemaUtil; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.BSUtil; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import java.util.List; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerTest.java similarity index 81% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerTest.java index 5de9d8357..adceda16b 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/DistWorkerTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/DistWorkerTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; -import static com.baidu.bifromq.plugin.subbroker.TypeUtil.to; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toGroupRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toNormalRouteKey; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.toReceiverUrl; +import static org.apache.bifromq.plugin.subbroker.TypeUtil.to; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -32,60 +32,60 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.rpc.proto.BatchDistReply; -import com.baidu.bifromq.dist.rpc.proto.BatchDistRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchRequest; -import com.baidu.bifromq.dist.rpc.proto.DistPack; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.DistServiceROCoProcOutput; -import com.baidu.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.rpc.proto.TenantOption; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.plugin.subbroker.ISubBroker; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.rpc.proto.BatchDistReply; +import org.apache.bifromq.dist.rpc.proto.BatchDistRequest; +import org.apache.bifromq.dist.rpc.proto.BatchMatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchRequest; +import org.apache.bifromq.dist.rpc.proto.DistPack; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcInput; +import org.apache.bifromq.dist.rpc.proto.DistServiceROCoProcOutput; +import org.apache.bifromq.dist.rpc.proto.DistServiceRWCoProcInput; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.rpc.proto.TenantOption; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.plugin.subbroker.ISubBroker; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/KeyLayoutTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/KeyLayoutTest.java similarity index 85% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/KeyLayoutTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/KeyLayoutTest.java index 3ef7887d0..409cc0e01 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/KeyLayoutTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/KeyLayoutTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.util.TopicUtil.fastJoin; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.util.TopicUtil.fastJoin; +import static org.apache.bifromq.util.TopicUtil.parse; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.dist.trie.TopicFilterIterator; -import com.baidu.bifromq.dist.trie.TopicTrieNode; -import com.baidu.bifromq.dist.worker.schema.KVSchemaUtil; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.dist.trie.TopicFilterIterator; +import org.apache.bifromq.dist.trie.TopicTrieNode; +import org.apache.bifromq.dist.worker.schema.KVSchemaUtil; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/MeterTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/MeterTest.java similarity index 95% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/MeterTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/MeterTest.java index 89dbc2b13..99ea1c37a 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/MeterTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/MeterTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/RendezvousHashTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/RendezvousHashTest.java similarity index 98% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/RendezvousHashTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/RendezvousHashTest.java index 4c363b6e4..78e27687c 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/RendezvousHashTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/RendezvousHashTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/StatsTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/StatsTest.java similarity index 92% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/StatsTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/StatsTest.java index f05a5e330..7e3f75d3c 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/StatsTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/StatsTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; import static org.awaitility.Awaitility.await; import io.micrometer.core.instrument.Meter; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/SubUnsubTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/SubUnsubTest.java similarity index 96% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/SubUnsubTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/SubUnsubTest.java index 106acc510..4c22bc1ee 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/SubUnsubTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/SubUnsubTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.dist.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.dist.rpc.proto.BatchUnmatchReply; -import com.baidu.bifromq.dist.rpc.proto.MatchRoute; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.rpc.proto.BatchMatchReply; +import org.apache.bifromq.dist.rpc.proto.BatchUnmatchReply; +import org.apache.bifromq.dist.rpc.proto.MatchRoute; +import org.apache.bifromq.util.TopicUtil; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/SubscriptionCleanerTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/SubscriptionCleanerTest.java similarity index 92% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/SubscriptionCleanerTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/SubscriptionCleanerTest.java index 229728533..00133d4f0 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/SubscriptionCleanerTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/SubscriptionCleanerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -23,15 +23,15 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.openMocks; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.plugin.subbroker.ISubBroker; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.plugin.subbroker.ISubBroker; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.util.TopicUtil; import java.util.concurrent.CompletableFuture; import org.mockito.Mock; import org.testng.annotations.AfterMethod; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TenantRouteStateTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TenantRouteStateTest.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TenantRouteStateTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TenantRouteStateTest.java index 7b191aab2..7aea8a4a1 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TenantRouteStateTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TenantRouteStateTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttSharedSubNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttSharedSubNumGauge; import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TenantsStatesTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TenantsStatesTest.java similarity index 91% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TenantsStatesTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TenantsStatesTest.java index f2a52cf1d..e16abd201 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TenantsStatesTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TenantsStatesTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttSharedSubNumGauge; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.metrics.TenantMetric.MqttRouteSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttSharedSubNumGauge; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; import lombok.SneakyThrows; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TopicIndexTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TopicIndexTest.java similarity index 99% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TopicIndexTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TopicIndexTest.java index 58fc7b37e..596b77afc 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/TopicIndexTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/TopicIndexTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker; +package org.apache.bifromq.dist.worker; import static org.testng.Assert.assertEquals; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java similarity index 81% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java index 192a1ee3f..baac4e8f0 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/balance/DistWorkerSplitBalancerTest.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.balance; +package org.apache.bifromq.dist.worker.balance; -import static com.baidu.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_AVG_LATENCY_NANOS; -import static com.baidu.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_DENSITY; -import static com.baidu.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_LATENCY_NANOS; -import static com.baidu.bifromq.dist.worker.hinter.FanoutSplitHinter.LOAD_TYPE_FANOUT_SCALE; -import static com.baidu.bifromq.dist.worker.hinter.FanoutSplitHinter.LOAD_TYPE_FANOUT_TOPIC_FILTERS; +import static org.apache.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_AVG_LATENCY_NANOS; +import static org.apache.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_DENSITY; +import static org.apache.bifromq.basekv.store.range.hinter.KVLoadBasedSplitHinter.LOAD_TYPE_IO_LATENCY_NANOS; +import static org.apache.bifromq.dist.worker.hinter.FanoutSplitHinter.LOAD_TYPE_FANOUT_SCALE; +import static org.apache.bifromq.dist.worker.hinter.FanoutSplitHinter.LOAD_TYPE_FANOUT_TOPIC_FILTERS; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.balance.BalanceNow; -import com.baidu.bifromq.basekv.balance.BalanceResultType; -import com.baidu.bifromq.basekv.balance.command.SplitCommand; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.proto.KVRangeStoreDescriptor; -import com.baidu.bifromq.basekv.proto.SplitHint; -import com.baidu.bifromq.basekv.proto.State; -import com.baidu.bifromq.basekv.raft.proto.RaftNodeStatus; -import com.baidu.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.dist.worker.hinter.FanoutSplitHinter; +import org.apache.bifromq.basekv.balance.BalanceNow; +import org.apache.bifromq.basekv.balance.BalanceResultType; +import org.apache.bifromq.basekv.balance.command.SplitCommand; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeStoreDescriptor; +import org.apache.bifromq.basekv.proto.SplitHint; +import org.apache.bifromq.basekv.proto.State; +import org.apache.bifromq.basekv.raft.proto.RaftNodeStatus; +import org.apache.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.dist.worker.hinter.FanoutSplitHinter; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.Set; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/SubscriptionCacheTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/SubscriptionCacheTest.java similarity index 93% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/SubscriptionCacheTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/SubscriptionCacheTest.java index 78ec7cc77..11e67e002 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/SubscriptionCacheTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/SubscriptionCacheTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.eq; @@ -27,13 +27,13 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.dist.worker.Comparators; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.dist.worker.Comparators; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.util.TopicUtil; import com.github.benmanes.caffeine.cache.Ticker; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCacheTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/TenantRouteCacheTest.java similarity index 92% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCacheTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/TenantRouteCacheTest.java index 1ff01a064..d068062b9 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/TenantRouteCacheTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/TenantRouteCacheTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.eq; @@ -22,12 +22,12 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.dist.worker.Comparators; -import com.baidu.bifromq.dist.worker.MeterTest; -import com.baidu.bifromq.dist.worker.schema.Matching; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.type.RouteMatcher; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.worker.Comparators; +import org.apache.bifromq.dist.worker.MeterTest; +import org.apache.bifromq.dist.worker.schema.Matching; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.type.RouteMatcher; +import org.apache.bifromq.util.TopicUtil; import com.github.benmanes.caffeine.cache.Ticker; import com.google.common.collect.Sets; import java.time.Duration; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java similarity index 95% rename from bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java rename to bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java index 636f288f1..0cc133890 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/java/com/baidu/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java +++ b/bifromq-dist/bifromq-dist-worker/src/test/java/org/apache/bifromq/dist/worker/cache/ThreadLocalKVReaderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.dist.worker.cache; +package org.apache.bifromq.dist.worker.cache; import static org.mockito.Mockito.mock; @@ -22,8 +22,8 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVReader; import java.util.HashSet; import java.util.Set; import java.util.concurrent.CountDownLatch; diff --git a/bifromq-dist/bifromq-dist-worker/src/test/resources/logback.xml b/bifromq-dist/bifromq-dist-worker/src/test/resources/logback.xml index 1eafead4c..be5540bba 100644 --- a/bifromq-dist/bifromq-dist-worker/src/test/resources/logback.xml +++ b/bifromq-dist/bifromq-dist-worker/src/test/resources/logback.xml @@ -20,7 +20,7 @@ - + diff --git a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/IInboxClient.java b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/IInboxClient.java similarity index 59% rename from bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/IInboxClient.java rename to bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/IInboxClient.java index a0f14ff17..5a42735d2 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/IInboxClient.java +++ b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/IInboxClient.java @@ -11,29 +11,29 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; - -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.plugin.subbroker.ISubBroker; +package org.apache.bifromq.inbox.client; + +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.plugin.subbroker.ISubBroker; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; diff --git a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClient.java b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxClient.java similarity index 83% rename from bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClient.java rename to bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxClient.java index f2c35ea66..34465d04e 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClient.java +++ b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxClient.java @@ -11,34 +11,34 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; - -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; - -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.inbox.rpc.proto.InboxServiceGrpc; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.type.MatchInfo; +package org.apache.bifromq.inbox.client; + +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; + +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.inbox.rpc.proto.InboxServiceGrpc; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.type.MatchInfo; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.base.Preconditions; diff --git a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClientBuilder.java b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxClientBuilder.java similarity index 87% rename from bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClientBuilder.java rename to bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxClientBuilder.java index 17d607441..83188d1c4 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxClientBuilder.java +++ b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxClientBuilder.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; +package org.apache.bifromq.inbox.client; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.inbox.RPCBluePrint; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.inbox.RPCBluePrint; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; import lombok.AccessLevel; diff --git a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxDeliverPipeline.java b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxDeliverPipeline.java similarity index 74% rename from bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxDeliverPipeline.java rename to bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxDeliverPipeline.java index df8f4674c..14905b499 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxDeliverPipeline.java +++ b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxDeliverPipeline.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; +package org.apache.bifromq.inbox.client; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.parseTenantId; -import static com.baidu.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.parseTenantId; +import static org.apache.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.inbox.rpc.proto.InboxServiceGrpc; -import com.baidu.bifromq.inbox.rpc.proto.SendReply; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.inbox.rpc.proto.InboxServiceGrpc; +import org.apache.bifromq.inbox.rpc.proto.SendReply; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.IDeliverer; import java.util.Map; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxFetchPipeline.java b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxFetchPipeline.java similarity index 89% rename from bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxFetchPipeline.java rename to bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxFetchPipeline.java index 4952f78b5..a1574ac1c 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxFetchPipeline.java +++ b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxFetchPipeline.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; +package org.apache.bifromq.inbox.client; -import static com.baidu.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; -import static com.baidu.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_ID; +import static org.apache.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; +import static org.apache.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_ID; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.client.IRPCClient.IMessageStream; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetchHint; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetched; -import com.baidu.bifromq.inbox.rpc.proto.InboxServiceGrpc; -import com.baidu.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.client.IRPCClient.IMessageStream; +import org.apache.bifromq.inbox.rpc.proto.InboxFetchHint; +import org.apache.bifromq.inbox.rpc.proto.InboxFetched; +import org.apache.bifromq.inbox.rpc.proto.InboxServiceGrpc; +import org.apache.bifromq.inbox.storage.proto.Fetched; import java.lang.ref.Cleaner; import java.lang.ref.Cleaner.Cleanable; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxReader.java b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxReader.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxReader.java rename to bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxReader.java index baf10643d..ad350b638 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/main/java/com/baidu/bifromq/inbox/client/InboxReader.java +++ b/bifromq-inbox/bifromq-inbox-client/src/main/java/org/apache/bifromq/inbox/client/InboxReader.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; +package org.apache.bifromq.inbox.client; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.Fetched; import java.util.function.Consumer; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-client/src/test/java/com.baidu.bifromq.inbox.client/InboxClientTest.java b/bifromq-inbox/bifromq-inbox-client/src/test/java/org/apache/bifromq/inbox/client/InboxClientTest.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-client/src/test/java/com.baidu.bifromq.inbox.client/InboxClientTest.java rename to bifromq-inbox/bifromq-inbox-client/src/test/java/org/apache/bifromq/inbox/client/InboxClientTest.java index 1952073d1..30c8dfb76 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/test/java/com.baidu.bifromq.inbox.client/InboxClientTest.java +++ b/bifromq-inbox/bifromq-inbox-client/src/test/java/org/apache/bifromq/inbox/client/InboxClientTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; +package org.apache.bifromq.inbox.client; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -21,25 +21,25 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; import org.mockito.Mock; diff --git a/bifromq-inbox/bifromq-inbox-client/src/test/java/com.baidu.bifromq.inbox.client/InboxReaderTest.java b/bifromq-inbox/bifromq-inbox-client/src/test/java/org/apache/bifromq/inbox/client/InboxReaderTest.java similarity index 89% rename from bifromq-inbox/bifromq-inbox-client/src/test/java/com.baidu.bifromq.inbox.client/InboxReaderTest.java rename to bifromq-inbox/bifromq-inbox-client/src/test/java/org/apache/bifromq/inbox/client/InboxReaderTest.java index 152060ca6..35c0fa0cd 100644 --- a/bifromq-inbox/bifromq-inbox-client/src/test/java/com.baidu.bifromq.inbox.client/InboxReaderTest.java +++ b/bifromq-inbox/bifromq-inbox-client/src/test/java/org/apache/bifromq/inbox/client/InboxReaderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.client; +package org.apache.bifromq.inbox.client; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -22,15 +22,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetchHint; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetched; -import com.baidu.bifromq.inbox.rpc.proto.InboxServiceGrpc; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.Fetched.Result; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.InboxFetchHint; +import org.apache.bifromq.inbox.rpc.proto.InboxFetched; +import org.apache.bifromq.inbox.rpc.proto.InboxServiceGrpc; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.Fetched.Result; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; import lombok.SneakyThrows; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxFetched.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxFetched.proto index 5715ec430..e8115a34b 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxFetched.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxFetched.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "inboxservice/InboxMessages.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "InboxFetchedProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMessages.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMessages.proto index f1914ece4..c7f0ab0bd 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMessages.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMessages.proto @@ -3,7 +3,7 @@ import "commontype/TopicMessage.proto"; import "inboxservice/TopicFilterOption.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "InboxMessageProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMetadata.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMetadata.proto index 2cfa6bcf6..1514b4ff8 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMetadata.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxMetadata.proto @@ -4,7 +4,7 @@ import "inboxservice/TopicFilterOption.proto"; import "inboxservice/LWT.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "InboxMetadataProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxStoreCoProc.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxStoreCoProc.proto index cb71e7314..bade74e2e 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxStoreCoProc.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/InboxStoreCoProc.proto @@ -7,7 +7,7 @@ import "inboxservice/LWT.proto"; import "inboxservice/InboxFetched.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "InboxCoProcProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/LWT.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/LWT.proto index 65a1c7b87..4c234613b 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/LWT.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/LWT.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "commontype/TopicMessage.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "LWTProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/Replica.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/Replica.proto index cd148218f..0c40a167d 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/Replica.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/Replica.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "basekv/Type.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "RunnerIdProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/TopicFilterOption.proto b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/TopicFilterOption.proto index 6a4e37d69..dd89cece6 100644 --- a/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/TopicFilterOption.proto +++ b/bifromq-inbox/bifromq-inbox-coproc-proto/src/main/proto/inboxservice/TopicFilterOption.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "commontype/QoS.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.storage.proto"; +option java_package = "org.apache.bifromq.inbox.storage.proto"; option java_outer_classname = "TopicFilterOptionProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/RPCBluePrint.java b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/RPCBluePrint.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/RPCBluePrint.java rename to bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/RPCBluePrint.java index e0a5f8ca2..6dedaa7a2 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/RPCBluePrint.java +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/RPCBluePrint.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox; +package org.apache.bifromq.inbox; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.rpc.proto.InboxServiceGrpc; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.rpc.proto.InboxServiceGrpc; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.plugin.subbroker.CheckRequest; public class RPCBluePrint { public static final BluePrint INSTANCE = BluePrint.builder() diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/record/InboxInstance.java b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/record/InboxInstance.java similarity index 90% rename from bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/record/InboxInstance.java rename to bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/record/InboxInstance.java index d6c7a58db..908e3c209 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/record/InboxInstance.java +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/record/InboxInstance.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.record; +package org.apache.bifromq.inbox.record; -import com.baidu.bifromq.inbox.util.InboxServiceUtil; +import org.apache.bifromq.inbox.util.InboxServiceUtil; /** * Inbox instance. diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/record/TenantInboxInstance.java b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/record/TenantInboxInstance.java similarity index 89% rename from bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/record/TenantInboxInstance.java rename to bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/record/TenantInboxInstance.java index 5b9dfe7cc..b773497f9 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/record/TenantInboxInstance.java +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/record/TenantInboxInstance.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.record; +package org.apache.bifromq.inbox.record; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.parseReceiverId; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.parseReceiverId; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.type.MatchInfo; import java.util.Comparator; public record TenantInboxInstance(String tenantId, InboxInstance instance) implements Comparable { diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/util/InboxServiceUtil.java b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/util/InboxServiceUtil.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/util/InboxServiceUtil.java rename to bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/util/InboxServiceUtil.java index ea35c3db2..ab814fa38 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/util/InboxServiceUtil.java +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/util/InboxServiceUtil.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.util; +package org.apache.bifromq.inbox.util; -import com.baidu.bifromq.inbox.record.InboxInstance; -import com.baidu.bifromq.sysprops.props.InboxDelivererNum; +import org.apache.bifromq.inbox.record.InboxInstance; +import org.apache.bifromq.sysprops.props.InboxDelivererNum; public class InboxServiceUtil { private static final int MAX_INBOX_DELIVERER = InboxDelivererNum.INSTANCE.get(); diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/util/PipelineUtil.java b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/util/PipelineUtil.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/util/PipelineUtil.java rename to bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/util/PipelineUtil.java index bd9000cdc..e5cd60e5d 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/com/baidu/bifromq/inbox/util/PipelineUtil.java +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/java/org/apache/bifromq/inbox/util/PipelineUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.util; +package org.apache.bifromq.inbox.util; public class PipelineUtil { public static final String PIPELINE_ATTR_KEY_ID = "0"; diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/proto/inboxservice/InboxService.proto b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/proto/inboxservice/InboxService.proto index b75d64695..1fd847f49 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/proto/inboxservice/InboxService.proto +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/main/proto/inboxservice/InboxService.proto @@ -8,7 +8,7 @@ import "inboxservice/TopicFilterOption.proto"; import "inboxservice/InboxStoreCoProc.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.inbox.rpc.proto"; +option java_package = "org.apache.bifromq.inbox.rpc.proto"; option java_outer_classname = "InboxServiceProtos"; package inboxservice; diff --git a/bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/com/baidu/bifromq/inbox/util/InboxServiceUtilTest.java b/bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/org/apache/bifromq/inbox/util/InboxServiceUtilTest.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/com/baidu/bifromq/inbox/util/InboxServiceUtilTest.java rename to bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/org/apache/bifromq/inbox/util/InboxServiceUtilTest.java index 530fb038e..7362aa45f 100644 --- a/bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/com/baidu/bifromq/inbox/util/InboxServiceUtilTest.java +++ b/bifromq-inbox/bifromq-inbox-rpc-definition/src/test/java/org/apache/bifromq/inbox/util/InboxServiceUtilTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.util; +package org.apache.bifromq.inbox.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.record.InboxInstance; -import com.baidu.bifromq.sysprops.props.InboxDelivererNum; +import org.apache.bifromq.inbox.record.InboxInstance; +import org.apache.bifromq.sysprops.props.InboxDelivererNum; import org.testng.annotations.Test; public class InboxServiceUtilTest { diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/FetcherSignaler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/FetcherSignaler.java similarity index 92% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/FetcherSignaler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/FetcherSignaler.java index 6d9773ff9..bbff29b9a 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/FetcherSignaler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/FetcherSignaler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.record.TenantInboxInstance; public class FetcherSignaler implements InboxWriterPipeline.IWriteCallback { private final IInboxFetcherRegistry registry; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxFetcher.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxFetcher.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxFetcher.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxFetcher.java index cf72801cc..766a51c53 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxFetcher.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxFetcher.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; public interface IInboxFetcher { String id(); diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxFetcherRegistry.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxFetcherRegistry.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxFetcherRegistry.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxFetcherRegistry.java index ba43a86c7..5d6ee8bf2 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxFetcherRegistry.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxFetcherRegistry.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import java.util.Collection; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxServer.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxServer.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxServer.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxServer.java index 7af052e53..f13a61bb7 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/IInboxServer.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/IInboxServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; public interface IInboxServer { static InboxServerBuilder builder() { diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/ITenantGCRunner.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/ITenantGCRunner.java similarity index 83% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/ITenantGCRunner.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/ITenantGCRunner.java index c4a83a91f..110bf1952 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/ITenantGCRunner.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/ITenantGCRunner.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; import java.util.concurrent.CompletableFuture; public interface ITenantGCRunner { diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxFetchPipeline.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxFetchPipeline.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxFetchPipeline.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxFetchPipeline.java index dd2471677..a0b7d6887 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxFetchPipeline.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxFetchPipeline.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; -import static com.baidu.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_ID; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; +import static org.apache.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_ID; -import com.baidu.bifromq.baserpc.server.AckStream; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetchHint; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetched; -import com.baidu.bifromq.inbox.server.scheduler.FetchRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.baserpc.server.AckStream; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.inbox.rpc.proto.InboxFetchHint; +import org.apache.bifromq.inbox.rpc.proto.InboxFetched; +import org.apache.bifromq.inbox.server.scheduler.FetchRequest; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; import io.grpc.stub.StreamObserver; import io.reactivex.rxjava3.disposables.Disposable; import java.util.Collections; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxFetcherRegistry.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxFetcherRegistry.java similarity index 98% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxFetcherRegistry.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxFetcherRegistry.java index 9a5aef877..d104981a9 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxFetcherRegistry.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxFetcherRegistry.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static java.util.Collections.emptyMap; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServer.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxServer.java similarity index 79% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServer.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxServer.java index 5487c100f..0c2dfccde 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServer.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxServer.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.inbox.RPCBluePrint; -import com.baidu.bifromq.inbox.server.scheduler.InboxAttachScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxCheckSubScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxCommitScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxDeleteScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxDetachScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxExistScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxFetchScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxInsertScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxSendLWTScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxSubScheduler; -import com.baidu.bifromq.inbox.server.scheduler.InboxUnSubScheduler; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.inbox.RPCBluePrint; +import org.apache.bifromq.inbox.server.scheduler.InboxAttachScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxCheckSubScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxCommitScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxDeleteScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxDetachScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxExistScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxFetchScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxInsertScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxSendLWTScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxSubScheduler; +import org.apache.bifromq.inbox.server.scheduler.InboxUnSubScheduler; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServerBuilder.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxServerBuilder.java similarity index 84% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServerBuilder.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxServerBuilder.java index e78b0c58b..061b8ecd2 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxServerBuilder.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxServerBuilder.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.HashSet; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxService.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxService.java similarity index 87% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxService.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxService.java index d8f00a886..862167d17 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxService.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxService.java @@ -11,57 +11,57 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.baserpc.server.UnaryResponse.response; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.baserpc.server.UnaryResponse.response; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetchHint; -import com.baidu.bifromq.inbox.rpc.proto.InboxFetched; -import com.baidu.bifromq.inbox.rpc.proto.InboxServiceGrpc; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.inbox.rpc.proto.SendReply; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.inbox.server.scheduler.CheckMatchInfo; -import com.baidu.bifromq.inbox.server.scheduler.IInboxAttachScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxCheckSubScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxCommitScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxDeleteScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxDetachScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxExistScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxFetchScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxInsertScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxSendLWTScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxSubScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxUnsubScheduler; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.inbox.rpc.proto.InboxFetchHint; +import org.apache.bifromq.inbox.rpc.proto.InboxFetched; +import org.apache.bifromq.inbox.rpc.proto.InboxServiceGrpc; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.inbox.rpc.proto.SendReply; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.inbox.server.scheduler.CheckMatchInfo; +import org.apache.bifromq.inbox.server.scheduler.IInboxAttachScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxCheckSubScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxCommitScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxDeleteScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxDetachScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxExistScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxFetchScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxInsertScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxSendLWTScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxSubScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxUnsubScheduler; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.util.TopicUtil; import io.grpc.stub.StreamObserver; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxWriter.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxWriter.java similarity index 83% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxWriter.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxWriter.java index 1702b7713..172aa9660 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxWriter.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxWriter.java @@ -11,31 +11,31 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.plugin.subbroker.TypeUtil.toResult; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.plugin.subbroker.TypeUtil.toResult; -import com.baidu.bifromq.base.util.AsyncRetry; -import com.baidu.bifromq.base.util.exception.RetryTimeoutException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.rpc.proto.SendReply; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.inbox.server.scheduler.IInboxInsertScheduler; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; -import com.baidu.bifromq.inbox.storage.proto.SubMessagePack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.base.util.AsyncRetry; +import org.apache.bifromq.base.util.exception.RetryTimeoutException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.rpc.proto.SendReply; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.inbox.server.scheduler.IInboxInsertScheduler; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.inbox.storage.proto.SubMessagePack; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; import java.time.Duration; import java.util.HashMap; import java.util.LinkedList; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxWriterPipeline.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxWriterPipeline.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxWriterPipeline.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxWriterPipeline.java index 4adec4063..386a103e0 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/InboxWriterPipeline.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/InboxWriterPipeline.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; +import static org.apache.bifromq.inbox.util.PipelineUtil.PIPELINE_ATTR_KEY_DELIVERERKEY; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.baserpc.server.ResponsePipeline; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.rpc.proto.SendReply; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; -import com.baidu.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; -import com.baidu.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.baserpc.server.ResponsePipeline; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.rpc.proto.SendReply; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; +import org.apache.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; +import org.apache.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; import io.grpc.stub.StreamObserver; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/TenantGCRunner.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/TenantGCRunner.java similarity index 77% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/TenantGCRunner.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/TenantGCRunner.java index 0f32975a6..f331aeb27 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/TenantGCRunner.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/TenantGCRunner.java @@ -11,29 +11,29 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.tenantBeginKeyPrefix; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.tenantBeginKeyPrefix; import static org.reflections.Reflections.log; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.inbox.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.inbox.storage.proto.ExpireTenantReply; -import com.baidu.bifromq.inbox.storage.proto.ExpireTenantRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllReply; +import org.apache.bifromq.inbox.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.inbox.storage.proto.ExpireTenantReply; +import org.apache.bifromq.inbox.storage.proto.ExpireTenantRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; import com.google.protobuf.ByteString; import java.util.Collection; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchAttachCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchAttachCall.java similarity index 84% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchAttachCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchAttachCall.java index 8d1aa9c2a..9b13aadda 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchAttachCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchAttachCall.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.Replica; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.Replica; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchCheckSubCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchCheckSubCall.java similarity index 78% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchCheckSubCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchCheckSubCall.java index 1b327c3a9..dacbba521 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchCheckSubCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchCheckSubCall.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchQueryCall; -import com.baidu.bifromq.basekv.client.scheduler.QueryCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.storage.proto.BatchCheckSubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchCheckSubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; -import com.baidu.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchQueryCall; +import org.apache.bifromq.basekv.client.scheduler.QueryCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.storage.proto.BatchCheckSubReply; +import org.apache.bifromq.inbox.storage.proto.BatchCheckSubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.plugin.subbroker.CheckReply; import java.util.Iterator; import java.util.Queue; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchCommitCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchCommitCall.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchCommitCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchCommitCall.java index cba882d36..a89bef5b4 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchCommitCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchCommitCall.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; import static java.util.Collections.emptySet; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.storage.proto.BatchCommitRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchDeleteCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchDeleteCall.java similarity index 84% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchDeleteCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchDeleteCall.java index 7b008712d..09ad68200 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchDeleteCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchDeleteCall.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; import static java.util.Collections.emptySet; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteReply; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchDetachCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchDetachCall.java similarity index 83% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchDetachCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchDetachCall.java index f88b2c84c..a7275cd3e 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchDetachCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchDetachCall.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; import static java.util.Collections.emptySet; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.Replica; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.Replica; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchExistCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchExistCall.java similarity index 80% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchExistCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchExistCall.java index d5120c5a6..abbed490c 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchExistCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchExistCall.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchQueryCall; -import com.baidu.bifromq.basekv.client.scheduler.QueryCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchExistRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchQueryCall; +import org.apache.bifromq.basekv.client.scheduler.QueryCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.storage.proto.BatchExistRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; import java.util.Iterator; import java.util.Queue; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchFetchCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchFetchCall.java similarity index 80% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchFetchCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchFetchCall.java index 833214c1f..258eff654 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchFetchCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchFetchCall.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchQueryCall; -import com.baidu.bifromq.basekv.client.scheduler.QueryCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchQueryCall; +import org.apache.bifromq.basekv.client.scheduler.QueryCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; import java.util.Iterator; import java.util.Queue; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchInsertCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchInsertCall.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchInsertCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchInsertCall.java index 5c0a44bf0..46d48f7a4 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchInsertCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchInsertCall.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.record.InboxInstance; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.storage.proto.BatchInsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.record.InboxInstance; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.storage.proto.BatchInsertRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; import java.util.HashSet; import java.util.Queue; import java.util.Set; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchSendLWTCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchSendLWTCall.java similarity index 82% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchSendLWTCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchSendLWTCall.java index 75444167d..66045ca41 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchSendLWTCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchSendLWTCall.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basekv.client.IQueryPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchQueryCall; -import com.baidu.bifromq.basekv.client.scheduler.QueryCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.basekv.client.IQueryPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchQueryCall; +import org.apache.bifromq.basekv.client.scheduler.QueryCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTReply; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; import java.util.Iterator; import java.util.Queue; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchSubCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchSubCall.java similarity index 84% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchSubCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchSubCall.java index f55cb7c9d..c213e4c61 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchSubCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchSubCall.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; import static java.util.Collections.emptySet; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubReply; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchUnsubCall.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchUnsubCall.java similarity index 84% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchUnsubCall.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchUnsubCall.java index 910221003..44644e7e5 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/BatchUnsubCall.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/BatchUnsubCall.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; import static java.util.Collections.emptySet; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubReply; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/CheckMatchInfo.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/CheckMatchInfo.java similarity index 88% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/CheckMatchInfo.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/CheckMatchInfo.java index 2526b0ca1..f79406e7e 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/CheckMatchInfo.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/CheckMatchInfo.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.type.MatchInfo; public record CheckMatchInfo(String tenantId, MatchInfo matchInfo) { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/FetchRequest.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/FetchRequest.java similarity index 86% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/FetchRequest.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/FetchRequest.java index 674a50e41..a0e186ce0 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/FetchRequest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/FetchRequest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; public record FetchRequest(String tenantId, String inboxId, long incarnation, BatchFetchRequest.Params params) { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java index 9e8773e61..c2b6fcf30 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxAttachScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; public interface IInboxAttachScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java index 993d0f3e6..c4a3f9b82 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxCheckSubScheduler.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.plugin.subbroker.CheckReply; public interface IInboxCheckSubScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java index 7a776a164..fb0ee8350 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxCommitScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; public interface IInboxCommitScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java index 495f389b3..1e1c5f7a1 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxDeleteScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; public interface IInboxDeleteScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java index 0085dd686..2b44f1984 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxDetachScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; public interface IInboxDetachScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxExistScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxExistScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxExistScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxExistScheduler.java index c3f3063eb..5e91c688c 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxExistScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxExistScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; public interface IInboxExistScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java index 325186ba9..db63d53a4 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxFetchScheduler.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.storage.proto.Fetched; public interface IInboxFetchScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java similarity index 75% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java index 11d13fb5d..f53b2035e 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxInsertScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; public interface IInboxInsertScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java index de2a725ab..6e946a13f 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxSendLWTScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; public interface IInboxSendLWTScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxSubScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxSubScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxSubScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxSubScheduler.java index 285bf8aec..73f3e50c5 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxSubScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxSubScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; public interface IInboxSubScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java index 653d2e7f8..8a0536859 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/IInboxUnsubScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; public interface IInboxUnsubScheduler extends IBatchCallScheduler { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxAttachScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxAttachScheduler.java similarity index 73% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxAttachScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxAttachScheduler.java index 76db33765..7d3357c44 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxAttachScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxAttachScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java similarity index 80% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java index 3054f8371..7c0be6a52 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxCheckSubScheduler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.sysprops.props.InboxCheckQueuesPerRange; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.sysprops.props.InboxCheckQueuesPerRange; import com.google.protobuf.ByteString; public class InboxCheckSubScheduler extends InboxReadScheduler diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxCommitScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxCommitScheduler.java similarity index 73% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxCommitScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxCommitScheduler.java index e7bdbe500..37fd6994e 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxCommitScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxCommitScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java similarity index 73% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java index 5d877ed95..765f6fbeb 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxDeleteScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxDetachScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxDetachScheduler.java similarity index 73% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxDetachScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxDetachScheduler.java index 8357e49b0..a49a5f7cf 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxDetachScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxDetachScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxExistScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxExistScheduler.java similarity index 77% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxExistScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxExistScheduler.java index caf323723..67c6cfa40 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxExistScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxExistScheduler.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.sysprops.props.InboxCheckQueuesPerRange; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.sysprops.props.InboxCheckQueuesPerRange; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxFetchScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxFetchScheduler.java similarity index 83% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxFetchScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxFetchScheduler.java index 7fede83d5..c487fbaa9 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxFetchScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxFetchScheduler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxInstanceStartKey; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxInstanceStartKey; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.sysprops.props.InboxFetchQueuesPerRange; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.sysprops.props.InboxFetchQueuesPerRange; import com.google.protobuf.ByteString; import java.util.Objects; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxInsertScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxInsertScheduler.java similarity index 74% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxInsertScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxInsertScheduler.java index e254e6d3f..1027e9b1a 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxInsertScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxInsertScheduler.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java similarity index 89% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java index e5fd6f306..4d2e048cd 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxReadBatcherKey.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.proto.KVRangeId; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxReadScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxReadScheduler.java similarity index 80% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxReadScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxReadScheduler.java index 86c35916b..dd57c73f9 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxReadScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxReadScheduler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.BatchQueryCall; -import com.baidu.bifromq.basekv.client.scheduler.IBatchQueryCallBuilder; -import com.baidu.bifromq.basekv.client.scheduler.QueryCallScheduler; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.BatchQueryCall; +import org.apache.bifromq.basekv.client.scheduler.IBatchQueryCallBuilder; +import org.apache.bifromq.basekv.client.scheduler.QueryCallScheduler; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import com.google.common.base.Preconditions; import java.time.Duration; import java.util.concurrent.ThreadLocalRandom; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java similarity index 77% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java index df12706f2..2437348dc 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxSendLWTScheduler.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.sysprops.props.InboxCheckQueuesPerRange; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.sysprops.props.InboxCheckQueuesPerRange; import com.google.protobuf.ByteString; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxSubScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxSubScheduler.java similarity index 73% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxSubScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxSubScheduler.java index a2f2aef48..ecafff642 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxSubScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxSubScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java similarity index 73% rename from bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java rename to bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java index 875b94373..6743eae97 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/main/java/com/baidu/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java +++ b/bifromq-inbox/bifromq-inbox-server/src/main/java/org/apache/bifromq/inbox/server/scheduler/InboxUnSubScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server.scheduler; +package org.apache.bifromq.inbox.server.scheduler; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/Fixtures.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/Fixtures.java similarity index 77% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/Fixtures.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/Fixtures.java index 3c57ca7a1..cf173cf49 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/Fixtures.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/Fixtures.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.StringPair; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.type.UserProperties; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.StringPair; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; public class Fixtures { diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxAdminRPCTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxAdminRPCTest.java similarity index 96% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxAdminRPCTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxAdminRPCTest.java index e3f13929e..9f180dbfd 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxAdminRPCTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxAdminRPCTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.Test; public class InboxAdminRPCTest extends InboxServiceTest { diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxExpiryTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxExpiryTest.java similarity index 91% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxExpiryTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxExpiryTest.java index dfd218aaf..e0787779a 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxExpiryTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxExpiryTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -27,24 +27,24 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import java.util.List; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxFetcherRegistryTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxFetcherRegistryTest.java similarity index 98% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxFetcherRegistryTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxFetcherRegistryTest.java index b34e60903..b594ff920 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxFetcherRegistryTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxFetcherRegistryTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxInsertTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxInsertTest.java similarity index 87% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxInsertTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxInsertTest.java index 21fc61fd0..705f0ce7c 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxInsertTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxInsertTest.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.IDeliverer; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxServiceTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxServiceTest.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxServiceTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxServiceTest.java index 916b79295..678c71b44 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxServiceTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxServiceTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -20,30 +20,15 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.store.IInboxStore; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import java.lang.reflect.Method; import java.time.Duration; import java.util.concurrent.CompletableFuture; @@ -51,6 +36,21 @@ import java.util.concurrent.ScheduledExecutorService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.store.IInboxStore; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.AfterClass; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxSubRPCTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxSubRPCTest.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxSubRPCTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxSubRPCTest.java index 20afe27b8..1e5a06880 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxSubRPCTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxSubRPCTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -26,21 +26,21 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.util.TopicUtil; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxUnsubRPCTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxUnsubRPCTest.java similarity index 92% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxUnsubRPCTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxUnsubRPCTest.java index e0790718c..fe64694c0 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxUnsubRPCTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxUnsubRPCTest.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -27,23 +27,23 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.util.TopicUtil; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxWriterPipelineTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxWriterPipelineTest.java similarity index 88% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxWriterPipelineTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxWriterPipelineTest.java index 977d8e8da..74f835318 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxWriterPipelineTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxWriterPipelineTest.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.server.Fixtures.matchInfo; -import static com.baidu.bifromq.inbox.server.Fixtures.sendRequest; +import static org.apache.bifromq.inbox.server.Fixtures.matchInfo; +import static org.apache.bifromq.inbox.server.Fixtures.sendRequest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; -import com.baidu.bifromq.inbox.rpc.proto.SendReply; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.inbox.util.PipelineUtil; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; -import com.baidu.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; -import com.baidu.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.inbox.rpc.proto.SendReply; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.inbox.util.PipelineUtil; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; +import org.apache.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; +import org.apache.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; import io.grpc.Context; import io.grpc.stub.ServerCallStreamObserver; import io.micrometer.core.instrument.Timer; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxWriterTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxWriterTest.java similarity index 87% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxWriterTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxWriterTest.java index 4d20288b6..bf3231b23 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/InboxWriterTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/InboxWriterTest.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.server.Fixtures.matchInfo; -import static com.baidu.bifromq.inbox.server.Fixtures.sendRequest; +import static org.apache.bifromq.inbox.server.Fixtures.matchInfo; +import static org.apache.bifromq.inbox.server.Fixtures.sendRequest; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.inbox.rpc.proto.SendReply; -import com.baidu.bifromq.inbox.rpc.proto.SendRequest; -import com.baidu.bifromq.inbox.server.scheduler.IInboxInsertScheduler; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; +import org.apache.bifromq.inbox.rpc.proto.SendReply; +import org.apache.bifromq.inbox.rpc.proto.SendRequest; +import org.apache.bifromq.inbox.server.scheduler.IInboxInsertScheduler; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; import org.mockito.Mock; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedFetchTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedFetchTest.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedFetchTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedFetchTest.java index b88ee5358..d1d084926 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedFetchTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedFetchTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; public class MockedFetchTest extends MockedInboxService { } diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxAdminTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxAdminTest.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxAdminTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxAdminTest.java index eae4a4b10..11e706f0e 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxAdminTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxAdminTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -19,14 +19,14 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxCommitTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxCommitTest.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxCommitTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxCommitTest.java index cc6c37d08..e69d58b08 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxCommitTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxCommitTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -19,10 +19,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxService.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxService.java similarity index 76% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxService.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxService.java index 36f33d40f..e205bafb8 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxService.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxService.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.server.scheduler.IInboxAttachScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxCheckSubScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxCommitScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxDeleteScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxDetachScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxExistScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxFetchScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxInsertScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxSubScheduler; -import com.baidu.bifromq.inbox.server.scheduler.IInboxUnsubScheduler; -import com.baidu.bifromq.inbox.util.PipelineUtil; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.server.scheduler.IInboxAttachScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxCheckSubScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxCommitScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxDeleteScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxDetachScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxExistScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxFetchScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxInsertScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxSubScheduler; +import org.apache.bifromq.inbox.server.scheduler.IInboxUnsubScheduler; +import org.apache.bifromq.inbox.util.PipelineUtil; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; import io.grpc.Context; import io.micrometer.core.instrument.Timer; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxSubTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxSubTest.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxSubTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxSubTest.java index b9163c2fb..6b25eb871 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxSubTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxSubTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -25,18 +25,18 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.RetainHandling; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.RetainHandling; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.util.TopicUtil; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxUnsubTest.java b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxUnsubTest.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxUnsubTest.java rename to bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxUnsubTest.java index d981b0917..daa68e223 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/java/com/baidu/bifromq/inbox/server/MockedInboxUnsubTest.java +++ b/bifromq-inbox/bifromq-inbox-server/src/test/java/org/apache/bifromq/inbox/server/MockedInboxUnsubTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.server; +package org.apache.bifromq.inbox.server; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -22,11 +22,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-server/src/test/resources/logback.xml b/bifromq-inbox/bifromq-inbox-server/src/test/resources/logback.xml index 4b7c7e9bb..fd62f5207 100644 --- a/bifromq-inbox/bifromq-inbox-server/src/test/resources/logback.xml +++ b/bifromq-inbox/bifromq-inbox-server/src/test/resources/logback.xml @@ -19,7 +19,7 @@ - + diff --git a/bifromq-inbox/bifromq-inbox-store-schema/src/main/java/com/baidu/bifromq/inbox/store/schema/KVSchemaUtil.java b/bifromq-inbox/bifromq-inbox-store-schema/src/main/java/org/apache/bifromq/inbox/store/schema/KVSchemaUtil.java similarity index 97% rename from bifromq-inbox/bifromq-inbox-store-schema/src/main/java/com/baidu/bifromq/inbox/store/schema/KVSchemaUtil.java rename to bifromq-inbox/bifromq-inbox-store-schema/src/main/java/org/apache/bifromq/inbox/store/schema/KVSchemaUtil.java index 8a20d35f2..b2bf12f5a 100644 --- a/bifromq-inbox/bifromq-inbox-store-schema/src/main/java/com/baidu/bifromq/inbox/store/schema/KVSchemaUtil.java +++ b/bifromq-inbox/bifromq-inbox-store-schema/src/main/java/org/apache/bifromq/inbox/store/schema/KVSchemaUtil.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.schema; +package org.apache.bifromq.inbox.store.schema; -import static com.baidu.bifromq.util.BSUtil.toByteString; -import static com.baidu.bifromq.util.BSUtil.toShort; +import static org.apache.bifromq.util.BSUtil.toByteString; +import static org.apache.bifromq.util.BSUtil.toShort; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; import com.google.protobuf.ByteString; diff --git a/bifromq-inbox/bifromq-inbox-store-schema/src/test/java/com/baidu/bifromq/inbox/store/schema/KVSchemaUtilTest.java b/bifromq-inbox/bifromq-inbox-store-schema/src/test/java/org/apache/bifromq/inbox/store/schema/KVSchemaUtilTest.java similarity index 98% rename from bifromq-inbox/bifromq-inbox-store-schema/src/test/java/com/baidu/bifromq/inbox/store/schema/KVSchemaUtilTest.java rename to bifromq-inbox/bifromq-inbox-store-schema/src/test/java/org/apache/bifromq/inbox/store/schema/KVSchemaUtilTest.java index e07023122..6d2ad524c 100644 --- a/bifromq-inbox/bifromq-inbox-store-schema/src/test/java/com/baidu/bifromq/inbox/store/schema/KVSchemaUtilTest.java +++ b/bifromq-inbox/bifromq-inbox-store-schema/src/test/java/org/apache/bifromq/inbox/store/schema/KVSchemaUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.schema; +package org.apache.bifromq.inbox.store.schema; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/com/baidu/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java b/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/org/apache/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java similarity index 90% rename from bifromq-inbox/bifromq-inbox-store-spi/src/main/java/com/baidu/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java rename to bifromq-inbox/bifromq-inbox-store-spi/src/main/java/org/apache/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java index 601b9e0e0..9134164b4 100644 --- a/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/com/baidu/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java +++ b/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/org/apache/bifromq/inbox/store/spi/IInboxStoreBalancerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.spi; +package org.apache.bifromq.inbox.store.spi; -import com.baidu.bifromq.basekv.balance.IStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.IStoreBalancerFactory; import com.google.protobuf.Struct; /** diff --git a/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/com/baidu/bifromq/inbox/store/spi/SplitKey.java b/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/org/apache/bifromq/inbox/store/spi/SplitKey.java similarity index 79% rename from bifromq-inbox/bifromq-inbox-store-spi/src/main/java/com/baidu/bifromq/inbox/store/spi/SplitKey.java rename to bifromq-inbox/bifromq-inbox-store-spi/src/main/java/org/apache/bifromq/inbox/store/spi/SplitKey.java index 3a0cc3020..29f696734 100644 --- a/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/com/baidu/bifromq/inbox/store/spi/SplitKey.java +++ b/bifromq-inbox/bifromq-inbox-store-spi/src/main/java/org/apache/bifromq/inbox/store/spi/SplitKey.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.spi; +package org.apache.bifromq.inbox.store.spi; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxBucketStartKeyPrefix; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.tenantBeginKeyPrefix; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxBucketStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.tenantBeginKeyPrefix; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; /** diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStore.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/IInboxStore.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStore.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/IInboxStore.java index d0ec73a5c..3e18a4e1d 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStore.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/IInboxStore.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; public interface IInboxStore { String CLUSTER_NAME = "inbox.store"; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStoreGCProcessor.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/IInboxStoreGCProcessor.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStoreGCProcessor.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/IInboxStoreGCProcessor.java index c1400c088..9e765b474 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/IInboxStoreGCProcessor.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/IInboxStoreGCProcessor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStore.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStore.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStore.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStore.java index 9d4944054..01d5c042a 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStore.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStore.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import com.baidu.bifromq.base.util.AsyncRunner; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basehookloader.BaseHookLoader; -import com.baidu.bifromq.basekv.balance.KVStoreBalanceController; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.server.IBaseKVStoreServer; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; +import org.apache.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basehookloader.BaseHookLoader; +import org.apache.bifromq.basekv.balance.KVStoreBalanceController; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.server.IBaseKVStoreServer; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreBuilder.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreBuilder.java similarity index 72% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreBuilder.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreBuilder.java index 3d767123e..cc3bed93c 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreBuilder.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreBuilder.java @@ -11,21 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sysprops.props.PersistentSessionDetachTimeoutSecond; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.Struct; import java.time.Duration; import java.util.HashMap; @@ -35,6 +27,14 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sysprops.props.PersistentSessionDetachTimeoutSecond; /** * The builder for building Inbox Store. diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreCoProc.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreCoProc.java similarity index 91% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreCoProc.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreCoProc.java index a00e0662d..d21b1d4c6 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreCoProc.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreCoProc.java @@ -11,110 +11,38 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.bufferedMsgKey; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxInstanceStartKey; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.isInboxInstanceKey; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.isInboxInstanceStartKey; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.parseInboxInstanceStartKeyPrefix; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.parseSeq; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.parseTenantId; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.qos0MsgKey; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.qos0QueuePrefix; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.sendBufferPrefix; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMessageSpaceBytes; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainTopics; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMessageSpaceBytes; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainTopics; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.bufferedMsgKey; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxInstanceStartKey; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.isInboxInstanceKey; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.isInboxInstanceStartKey; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.parseInboxInstanceStartKeyPrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.parseSeq; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.parseTenantId; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.qos0MsgKey; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.qos0QueuePrefix; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.sendBufferPrefix; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import com.baidu.bifromq.baseenv.ZeroCopyParser; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.record.InboxInstance; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchCheckSubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchCheckSubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitReply; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchExistReply; -import com.baidu.bifromq.inbox.storage.proto.BatchExistRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchReply; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchInsertReply; -import com.baidu.bifromq.inbox.storage.proto.BatchInsertRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.ExpireTenantReply; -import com.baidu.bifromq.inbox.storage.proto.ExpireTenantRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.GCReply; -import com.baidu.bifromq.inbox.storage.proto.GCRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; -import com.baidu.bifromq.inbox.storage.proto.InboxMessageList; -import com.baidu.bifromq.inbox.storage.proto.InboxMetadata; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcOutput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcOutput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.inbox.storage.proto.SubMessagePack; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.inbox.store.delay.DelayTaskRunner; -import com.baidu.bifromq.inbox.store.delay.ExpireInboxTask; -import com.baidu.bifromq.inbox.store.delay.IDelayTaskRunner; -import com.baidu.bifromq.inbox.store.delay.SendLWTTask; -import com.baidu.bifromq.inbox.store.schema.KVSchemaUtil; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.inboxservice.Overflowed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDistError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDisted; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetained; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetainedError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.RetainMsgCleared; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckRequest; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessage; -import com.baidu.bifromq.type.TopicMessagePack; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.inboxservice.Overflowed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDistError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDisted; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetained; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetainedError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.RetainMsgCleared; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; @@ -137,6 +65,78 @@ import java.util.function.Supplier; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.baseenv.ZeroCopyParser; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.record.InboxInstance; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.storage.proto.BatchAttachReply; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchCheckSubReply; +import org.apache.bifromq.inbox.storage.proto.BatchCheckSubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchCommitReply; +import org.apache.bifromq.inbox.storage.proto.BatchCommitRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteReply; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchExistReply; +import org.apache.bifromq.inbox.storage.proto.BatchExistRequest; +import org.apache.bifromq.inbox.storage.proto.BatchFetchReply; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.BatchInsertReply; +import org.apache.bifromq.inbox.storage.proto.BatchInsertRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTReply; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubReply; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubReply; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubRequest; +import org.apache.bifromq.inbox.storage.proto.ExpireTenantReply; +import org.apache.bifromq.inbox.storage.proto.ExpireTenantRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.GCReply; +import org.apache.bifromq.inbox.storage.proto.GCRequest; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.inbox.storage.proto.InboxMessageList; +import org.apache.bifromq.inbox.storage.proto.InboxMetadata; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcOutput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcOutput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.inbox.storage.proto.SubMessagePack; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.inbox.store.delay.DelayTaskRunner; +import org.apache.bifromq.inbox.store.delay.ExpireInboxTask; +import org.apache.bifromq.inbox.store.delay.IDelayTaskRunner; +import org.apache.bifromq.inbox.store.delay.SendLWTTask; +import org.apache.bifromq.inbox.store.schema.KVSchemaUtil; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckRequest; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessage; +import org.apache.bifromq.type.TopicMessagePack; @Slf4j final class InboxStoreCoProc implements IKVRangeCoProc { diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreCoProcFactory.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreCoProcFactory.java similarity index 74% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreCoProcFactory.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreCoProcFactory.java index 29d01a9c4..c003b4bf4 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreCoProcFactory.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreCoProcFactory.java @@ -11,36 +11,36 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareStartKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.parseInboxBucketPrefix; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareStartKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.parseInboxBucketPrefix; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; -import com.baidu.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.ByteString; import java.time.Duration; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.function.Supplier; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; public class InboxStoreCoProcFactory implements IKVRangeCoProcFactory { private final IDistClient distClient; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreGCProcessor.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreGCProcessor.java similarity index 78% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreGCProcessor.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreGCProcessor.java index 5969793d1..00867f7b0 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/InboxStoreGCProcessor.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/InboxStoreGCProcessor.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.GCReply; -import com.baidu.bifromq.inbox.storage.proto.GCRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.inbox.storage.proto.GCReply; +import org.apache.bifromq.inbox.storage.proto.GCRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; import java.util.Collection; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/TenantInboxSet.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/TenantInboxSet.java similarity index 88% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/TenantInboxSet.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/TenantInboxSet.java index e10831d1a..f353ea252 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/TenantInboxSet.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/TenantInboxSet.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.inbox.storage.proto.InboxMetadata; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.session.MQTTSessionStart; -import com.baidu.bifromq.plugin.eventcollector.session.MQTTSessionStop; +import org.apache.bifromq.inbox.storage.proto.InboxMetadata; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.session.MQTTSessionStart; +import org.apache.bifromq.plugin.eventcollector.session.MQTTSessionStop; import com.google.common.collect.Sets; import java.util.Collections; import java.util.Map; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/TenantsState.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/TenantsState.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/TenantsState.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/TenantsState.java index 80e1e10ab..7cd23ece0 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/TenantsState.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/TenantsState.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isNULLRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.tenantBeginKeyPrefix; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isNULLRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.tenantBeginKeyPrefix; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.inbox.storage.proto.InboxMetadata; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.inbox.storage.proto.InboxMetadata; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; import com.google.protobuf.ByteString; import java.util.Collection; import java.util.Collections; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java similarity index 78% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java index a9f493825..7bbb3d340 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/RangeLeaderBalancerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.balance; +package org.apache.bifromq.inbox.store.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.RangeLeaderBalancer; -import com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.RangeLeaderBalancer; +import org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; public class RangeLeaderBalancerFactory implements IInboxStoreBalancerFactory { @Override diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java similarity index 92% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java index 4b045ea08..0b75c7e35 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/RangeSplitBalancerFactory.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.balance; +package org.apache.bifromq.inbox.store.balance; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.RangeSplitBalancer; -import com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.RangeSplitBalancer; +import org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; import com.google.protobuf.Struct; import com.google.protobuf.Value; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java similarity index 87% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java index b89fd4749..2a1706e25 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/balance/ReplicaCntBalancerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.balance; +package org.apache.bifromq.inbox.store.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.ReplicaCntBalancer; -import com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.ReplicaCntBalancer; +import org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory; import com.google.protobuf.Struct; import com.google.protobuf.Value; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/DelayTaskRunner.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/DelayTaskRunner.java similarity index 98% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/DelayTaskRunner.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/DelayTaskRunner.java index 87ce3a264..158e16b27 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/DelayTaskRunner.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/DelayTaskRunner.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.RateLimiter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/ExpireInboxTask.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/ExpireInboxTask.java similarity index 87% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/ExpireInboxTask.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/ExpireInboxTask.java index 5668b8c01..0d207a956 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/ExpireInboxTask.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/ExpireInboxTask.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.rpc.proto.DeleteReply; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.rpc.proto.DeleteReply; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/IDelayTaskRunner.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/IDelayTaskRunner.java similarity index 97% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/IDelayTaskRunner.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/IDelayTaskRunner.java index 7da047b00..d81d2a599 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/IDelayTaskRunner.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/IDelayTaskRunner.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; import java.util.Set; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/IDelayedTask.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/IDelayedTask.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/IDelayedTask.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/IDelayedTask.java index 837baf80f..f0d5e6d95 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/IDelayedTask.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/IDelayedTask.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/RetryableDelayedTask.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/RetryableDelayedTask.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/RetryableDelayedTask.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/RetryableDelayedTask.java index 868ee5397..68ed495be 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/RetryableDelayedTask.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/RetryableDelayedTask.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.record.TenantInboxInstance; import java.time.Duration; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ThreadLocalRandom; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/SendLWTTask.java b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/SendLWTTask.java similarity index 86% rename from bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/SendLWTTask.java rename to bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/SendLWTTask.java index d27df9cd5..8b9a4d3de 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/delay/SendLWTTask.java +++ b/bifromq-inbox/bifromq-inbox-store/src/main/java/org/apache/bifromq/inbox/store/delay/SendLWTTask.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTReply; -import com.baidu.bifromq.inbox.rpc.proto.SendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.rpc.proto.SendLWTReply; +import org.apache.bifromq.inbox.rpc.proto.SendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; import java.time.Duration; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory b/bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory similarity index 75% rename from bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory rename to bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory index 8118471d4..94fedec2d 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/com.baidu.bifromq.inbox.store.spi.IInboxStoreBalancerFactory +++ b/bifromq-inbox/bifromq-inbox-store/src/main/resources/META-INF/services/org.apache.bifromq.inbox.store.spi.IInboxStoreBalancerFactory @@ -11,6 +11,6 @@ # See the License for the specific language governing permissions and limitations under the License. # -com.baidu.bifromq.inbox.store.balance.ReplicaCntBalancerFactory -com.baidu.bifromq.inbox.store.balance.RangeSplitBalancerFactory -com.baidu.bifromq.inbox.store.balance.RangeLeaderBalancerFactory +org.apache.bifromq.inbox.store.balance.ReplicaCntBalancerFactory +org.apache.bifromq.inbox.store.balance.RangeSplitBalancerFactory +org.apache.bifromq.inbox.store.balance.RangeLeaderBalancerFactory diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/GCTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/GCTest.java similarity index 90% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/GCTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/GCTest.java index 1a0bc678d..7c270b174 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/GCTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/GCTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.reset; @@ -20,13 +20,13 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MQTTClientInfoConstants; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MQTTClientInfoConstants; import org.mockito.ArgumentCaptor; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxAdminTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxAdminTest.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxAdminTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxAdminTest.java index d3fdd5f1a..94f769f2d 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxAdminTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxAdminTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -23,20 +23,20 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchExistRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.eventcollector.EventType; import java.time.Duration; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteReply; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchExistRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.Test; public class InboxAdminTest extends InboxStoreTest { diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxExistTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxExistTest.java similarity index 92% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxExistTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxExistTest.java index db860a44a..6c18887fb 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxExistTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxExistTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -19,17 +19,17 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchExistRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; import java.time.Duration; import java.util.List; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchExistRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.Test; public class InboxExistTest extends InboxStoreTest { diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxGCProcessorTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxGCProcessorTest.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxGCProcessorTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxGCProcessorTest.java index 875bfbf31..56392ec21 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxGCProcessorTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxGCProcessorTest.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.inbox.storage.proto.GCReply; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcOutput; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.inbox.storage.proto.GCReply; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcOutput; import java.util.TreeMap; import java.util.concurrent.CompletableFuture; import org.mockito.Mock; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxInsertTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxInsertTest.java similarity index 97% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxInsertTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxInsertTest.java index becd060ca..15170b19b 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxInsertTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxInsertTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.type.QoS.AT_MOST_ONCE; +import static org.apache.bifromq.type.QoS.AT_MOST_ONCE; import static org.mockito.Mockito.clearInvocations; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -21,22 +21,22 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitReply; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; -import com.baidu.bifromq.inbox.storage.proto.SubMessagePack; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.eventcollector.inboxservice.Overflowed; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchCommitReply; +import org.apache.bifromq.inbox.storage.proto.BatchCommitRequest; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.inbox.storage.proto.SubMessagePack; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.eventcollector.inboxservice.Overflowed; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; import java.util.function.BiFunction; import java.util.function.Function; import org.mockito.ArgumentCaptor; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxLWTDelayTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxLWTDelayTest.java similarity index 84% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxLWTDelayTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxLWTDelayTest.java index 6fed445a1..8da82c33c 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxLWTDelayTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxLWTDelayTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -20,17 +20,17 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; import com.google.protobuf.ByteString; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; import org.testng.annotations.Test; public class InboxLWTDelayTest extends InboxStoreTest { diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxLWTTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxLWTTest.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxLWTTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxLWTTest.java index 4ca2226a8..26234404c 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxLWTTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxLWTTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.dist.client.PubResult.OK; -import static com.baidu.bifromq.dist.client.PubResult.TRY_LATER; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; +import static org.apache.bifromq.dist.client.PubResult.OK; +import static org.apache.bifromq.dist.client.PubResult.TRY_LATER; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -25,16 +25,16 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTReply; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; import com.google.protobuf.ByteString; import java.util.concurrent.CompletableFuture; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxSessionEventTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxSessionEventTest.java similarity index 90% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxSessionEventTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxSessionEventTest.java index c681358a8..49be76cb2 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxSessionEventTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxSessionEventTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -21,16 +21,16 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.eventcollector.EventType; import java.util.List; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.Test; public class InboxSessionEventTest extends InboxStoreTest { diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxStoreTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxStoreTest.java similarity index 81% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxStoreTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxStoreTest.java index abcfc336c..4cf828263 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxStoreTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxStoreTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; - -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; +package org.apache.bifromq.inbox.store; + +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.inbox.store.schema.KVSchemaUtil.inboxStartKeyPrefix; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; @@ -27,69 +27,15 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitReply; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchExistRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchInsertRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.GCReply; -import com.baidu.bifromq.inbox.storage.proto.GCRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcOutput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcOutput; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.InsertRequest; -import com.baidu.bifromq.inbox.storage.proto.InsertResult; -import com.baidu.bifromq.inbox.storage.proto.Replica; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; @@ -116,6 +62,60 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchCommitReply; +import org.apache.bifromq.inbox.storage.proto.BatchCommitRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteReply; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachReply; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchExistRequest; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.BatchInsertRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTReply; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubReply; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubReply; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.GCReply; +import org.apache.bifromq.inbox.storage.proto.GCRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcOutput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcOutput; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.InsertRequest; +import org.apache.bifromq.inbox.storage.proto.InsertResult; +import org.apache.bifromq.inbox.storage.proto.Replica; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.AfterClass; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxSubUnsubTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxSubUnsubTest.java similarity index 95% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxSubUnsubTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxSubUnsubTest.java index f6b5c1f0e..22703c2be 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/InboxSubUnsubTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/InboxSubUnsubTest.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteReply; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubReply; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteReply; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubReply; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubReply; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.type.ClientInfo; import java.util.Set; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/LoadExistingTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/LoadExistingTest.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/LoadExistingTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/LoadExistingTest.java index f4c1bc4b2..48d32b50e 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/LoadExistingTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/LoadExistingTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -20,14 +20,14 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.inbox.rpc.proto.DeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MQTTClientInfoConstants; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.inbox.rpc.proto.DeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MQTTClientInfoConstants; import org.mockito.ArgumentCaptor; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/LoadSubStatsTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/LoadSubStatsTest.java similarity index 88% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/LoadSubStatsTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/LoadSubStatsTest.java index a36c89f0a..17e7eca62 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/LoadSubStatsTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/LoadSubStatsTest.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertNotSame; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Gauge; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.Test; public class LoadSubStatsTest extends InboxStoreTest { diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/MessageUtil.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/MessageUtil.java similarity index 79% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/MessageUtil.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/MessageUtil.java index a5ad4f33d..726b8d81e 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/MessageUtil.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/MessageUtil.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchCommitRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchExistRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchFetchRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchInsertRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; -import com.baidu.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchCommitRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchExistRequest; +import org.apache.bifromq.inbox.storage.proto.BatchFetchRequest; +import org.apache.bifromq.inbox.storage.proto.BatchInsertRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxServiceROCoProcInput; +import org.apache.bifromq.inbox.storage.proto.InboxServiceRWCoProcInput; public class MessageUtil { public static InboxServiceRWCoProcInput buildAttachRequest(long reqId, BatchAttachRequest request) { diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/MeterTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/MeterTest.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/MeterTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/MeterTest.java index 8ee975f7b..51ccef078 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/MeterTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/MeterTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS0Test.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS0Test.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS0Test.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS0Test.java index ce6c67338..09432eee7 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS0Test.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS0Test.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.type.QoS.AT_MOST_ONCE; +import static org.apache.bifromq.type.QoS.AT_MOST_ONCE; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS1Test.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS1Test.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS1Test.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS1Test.java index c2e4026fe..d1b257bb3 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS1Test.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS1Test.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS2Test.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS2Test.java similarity index 93% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS2Test.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS2Test.java index 3833b659d..89b8a69fa 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/QoS2Test.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/QoS2Test.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.type.QoS.EXACTLY_ONCE; +import static org.apache.bifromq.type.QoS.EXACTLY_ONCE; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/SendLWTEventTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/SendLWTEventTest.java similarity index 85% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/SendLWTEventTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/SendLWTEventTest.java index 3b35894d3..9dc3fb15e 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/SendLWTEventTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/SendLWTEventTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; - -import static com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED; -import static com.baidu.bifromq.dist.client.PubResult.NO_MATCH; -import static com.baidu.bifromq.dist.client.PubResult.OK; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMessageSpaceBytes; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainTopics; +package org.apache.bifromq.inbox.store; + +import static org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED; +import static org.apache.bifromq.dist.client.PubResult.NO_MATCH; +import static org.apache.bifromq.dist.client.PubResult.OK; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMessageSpaceBytes; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainTopics; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -30,22 +30,22 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDetachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTReply; -import com.baidu.bifromq.inbox.storage.proto.BatchSendLWTRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDistError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDisted; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetained; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetainedError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.RetainMsgCleared; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDetachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTReply; +import org.apache.bifromq.inbox.storage.proto.BatchSendLWTRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDistError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDisted; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetained; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetainedError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.RetainMsgCleared; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; import com.google.protobuf.ByteString; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/SubStatsTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/SubStatsTest.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/SubStatsTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/SubStatsTest.java index 5da26af3e..520e4140b 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/SubStatsTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/SubStatsTest.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.BatchAttachRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchDeleteRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchSubRequest; -import com.baidu.bifromq.inbox.storage.proto.BatchUnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Gauge; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.BatchAttachRequest; +import org.apache.bifromq.inbox.storage.proto.BatchDeleteRequest; +import org.apache.bifromq.inbox.storage.proto.BatchSubRequest; +import org.apache.bifromq.inbox.storage.proto.BatchUnsubRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/TenantInboxSetTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/TenantInboxSetTest.java similarity index 94% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/TenantInboxSetTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/TenantInboxSetTest.java index b1051b8b5..5869d9f2e 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/TenantInboxSetTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/TenantInboxSetTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.never; @@ -27,12 +27,12 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.storage.proto.InboxMetadata; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.session.MQTTSessionStart; -import com.baidu.bifromq.plugin.eventcollector.session.MQTTSessionStop; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.storage.proto.InboxMetadata; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.session.MQTTSessionStart; +import org.apache.bifromq.plugin.eventcollector.session.MQTTSessionStop; +import org.apache.bifromq.type.ClientInfo; import java.util.function.Supplier; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/TenantsStateTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/TenantsStateTest.java similarity index 91% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/TenantsStateTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/TenantsStateTest.java index 91bf4991f..732b628b5 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/TenantsStateTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/TenantsStateTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store; +package org.apache.bifromq.inbox.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSessionSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSubCountGauge; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -24,9 +24,9 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.inbox.storage.proto.InboxMetadata; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.inbox.storage.proto.InboxMetadata; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; import lombok.SneakyThrows; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/delay/DelayTaskRunnerTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/delay/DelayTaskRunnerTest.java similarity index 99% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/delay/DelayTaskRunnerTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/delay/DelayTaskRunnerTest.java index eff010e90..9f2378050 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/delay/DelayTaskRunnerTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/delay/DelayTaskRunnerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; diff --git a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java similarity index 96% rename from bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java rename to bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java index 3cfa90fcb..1845c45e5 100644 --- a/bifromq-inbox/bifromq-inbox-store/src/test/java/com/baidu/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java +++ b/bifromq-inbox/bifromq-inbox-store/src/test/java/org/apache/bifromq/inbox/store/delay/RetryableDelayedTaskTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.inbox.store.delay; +package org.apache.bifromq.inbox.store.delay; import static org.mockito.Mockito.verify; -import com.baidu.bifromq.inbox.record.InboxInstance; -import com.baidu.bifromq.inbox.record.TenantInboxInstance; +import org.apache.bifromq.inbox.record.InboxInstance; +import org.apache.bifromq.inbox.record.TenantInboxInstance; import java.time.Duration; import java.util.concurrent.CompletableFuture; import org.mockito.ArgumentCaptor; diff --git a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/ITenantMeter.java b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/ITenantMeter.java similarity index 97% rename from bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/ITenantMeter.java rename to bifromq-metrics/src/main/java/org/apache/bifromq/metrics/ITenantMeter.java index 082f56b4c..fab7e8f2a 100644 --- a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/ITenantMeter.java +++ b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/ITenantMeter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics; +package org.apache.bifromq.metrics; import io.micrometer.core.instrument.Timer; import java.util.function.Supplier; diff --git a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantGauges.java b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantGauges.java similarity index 95% rename from bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantGauges.java rename to bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantGauges.java index 17bf83c65..82cd70888 100644 --- a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantGauges.java +++ b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantGauges.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics; +package org.apache.bifromq.metrics; -import static com.baidu.bifromq.metrics.ITenantMeter.TAG_TENANT_ID; +import static org.apache.bifromq.metrics.ITenantMeter.TAG_TENANT_ID; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; diff --git a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMeter.java b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMeter.java similarity index 98% rename from bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMeter.java rename to bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMeter.java index 2f12dbb31..21a8654c2 100644 --- a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMeter.java +++ b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMeter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics; +package org.apache.bifromq.metrics; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.DistributionSummary; diff --git a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMeterCache.java b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMeterCache.java similarity index 98% rename from bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMeterCache.java rename to bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMeterCache.java index 1306962ac..28cffdba5 100644 --- a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMeterCache.java +++ b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMeterCache.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics; +package org.apache.bifromq.metrics; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMetric.java b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMetric.java similarity index 99% rename from bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMetric.java rename to bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMetric.java index c5e7f3af3..91a4c329b 100644 --- a/bifromq-metrics/src/main/java/com/baidu/bifromq/metrics/TenantMetric.java +++ b/bifromq-metrics/src/main/java/org/apache/bifromq/metrics/TenantMetric.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics; +package org.apache.bifromq.metrics; import io.micrometer.core.instrument.Meter; diff --git a/bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/TenantMeterTest.java b/bifromq-metrics/src/test/java/org/apache/bifromq/metrics/TenantMeterTest.java similarity index 94% rename from bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/TenantMeterTest.java rename to bifromq-metrics/src/test/java/org/apache/bifromq/metrics/TenantMeterTest.java index 10f03aa58..44e508224 100644 --- a/bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/TenantMeterTest.java +++ b/bifromq-metrics/src/test/java/org/apache/bifromq/metrics/TenantMeterTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics; +package org.apache.bifromq.metrics; -import static com.baidu.bifromq.metrics.TenantMeter.TAG_TENANT_ID; +import static org.apache.bifromq.metrics.TenantMeter.TAG_TENANT_ID; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; diff --git a/bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/benchmark/TenantMeterBenchmark.java b/bifromq-metrics/src/test/java/org/apache/bifromq/metrics/benchmark/TenantMeterBenchmark.java similarity index 97% rename from bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/benchmark/TenantMeterBenchmark.java rename to bifromq-metrics/src/test/java/org/apache/bifromq/metrics/benchmark/TenantMeterBenchmark.java index af6be74b7..77a6e4bdb 100644 --- a/bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/benchmark/TenantMeterBenchmark.java +++ b/bifromq-metrics/src/test/java/org/apache/bifromq/metrics/benchmark/TenantMeterBenchmark.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics.benchmark; +package org.apache.bifromq.metrics.benchmark; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.metrics.TenantMetric; import com.sun.net.httpserver.HttpServer; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java b/bifromq-metrics/src/test/java/org/apache/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java similarity index 89% rename from bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java rename to bifromq-metrics/src/test/java/org/apache/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java index b37f25456..48f4f2e3e 100644 --- a/bifromq-metrics/src/test/java/com/baidu/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java +++ b/bifromq-metrics/src/test/java/org/apache/bifromq/metrics/benchmark/TenantMeterBenchmarkState.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.metrics.benchmark; +package org.apache.bifromq.metrics.benchmark; -import com.baidu.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.ITenantMeter; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.State; diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/DeliveryPipeline.java b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/DeliveryPipeline.java similarity index 77% rename from bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/DeliveryPipeline.java rename to bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/DeliveryPipeline.java index a165d679c..a92da28fb 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/DeliveryPipeline.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/DeliveryPipeline.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; +import org.apache.bifromq.plugin.subbroker.IDeliverer; import java.util.HashSet; import java.util.Set; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteRequest; +import org.apache.bifromq.type.MatchInfo; @Slf4j class DeliveryPipeline implements IDeliverer { diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/IMqttBrokerClient.java b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/IMqttBrokerClient.java similarity index 83% rename from bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/IMqttBrokerClient.java rename to bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/IMqttBrokerClient.java index ef8b999d8..5edc2edc7 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/IMqttBrokerClient.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/IMqttBrokerClient.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.plugin.subbroker.ISubBroker; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.plugin.subbroker.ISubBroker; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.type.QoS; public interface IMqttBrokerClient extends ISubBroker, IConnectable, AutoCloseable { static MqttBrokerClientBuilder newBuilder() { diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java rename to bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java index 639593bd4..d178b7728 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/IMqttBrokerClientBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; public interface IMqttBrokerClientBuilder { } diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/MqttBrokerClient.java b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/MqttBrokerClient.java similarity index 77% rename from bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/MqttBrokerClient.java rename to bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/MqttBrokerClient.java index cebb95c2b..1559f2020 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/MqttBrokerClient.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/MqttBrokerClient.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.mqtt.inbox.rpc.proto.SubReply.Result.ERROR; -import static com.baidu.bifromq.mqtt.inbox.util.DelivererKeyUtil.parseServerId; -import static com.baidu.bifromq.mqtt.inbox.util.DelivererKeyUtil.parseTenantId; import static java.util.Collections.emptyMap; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.mqtt.inbox.rpc.proto.SubReply.Result.ERROR; +import static org.apache.bifromq.mqtt.inbox.util.DelivererKeyUtil.parseServerId; +import static org.apache.bifromq.mqtt.inbox.util.DelivererKeyUtil.parseTenantId; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.OnlineInboxBrokerGrpc; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteRequest; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.plugin.subbroker.IDeliverer; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; +import org.apache.bifromq.plugin.subbroker.IDeliverer; import com.google.common.base.Preconditions; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.mqtt.inbox.rpc.proto.OnlineInboxBrokerGrpc; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteRequest; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.QoS; @Slf4j final class MqttBrokerClient implements IMqttBrokerClient { diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java rename to bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java index c669d2279..3aed1ab51 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/com/baidu/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/src/main/java/org/apache/bifromq/mqtt/inbox/MqttBrokerClientBuilder.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; import lombok.AccessLevel; diff --git a/bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/com/baidu/bifromq/mqtt/inbox/DeliveryPipelineTest.java b/bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/org/apache/bifromq/mqtt/inbox/DeliveryPipelineTest.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/com/baidu/bifromq/mqtt/inbox/DeliveryPipelineTest.java rename to bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/org/apache/bifromq/mqtt/inbox/DeliveryPipelineTest.java index 08ff9bcce..bc5df550e 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/com/baidu/bifromq/mqtt/inbox/DeliveryPipelineTest.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-client/src/test/java/org/apache/bifromq/mqtt/inbox/DeliveryPipelineTest.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteRequest; +import org.apache.bifromq.type.MatchInfo; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.AfterMethod; diff --git a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/com/baidu/bifromq/mqtt/inbox/RPCBluePrint.java b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/org/apache/bifromq/mqtt/inbox/RPCBluePrint.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/com/baidu/bifromq/mqtt/inbox/RPCBluePrint.java rename to bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/org/apache/bifromq/mqtt/inbox/RPCBluePrint.java index a0aec583b..ae3344ec3 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/com/baidu/bifromq/mqtt/inbox/RPCBluePrint.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/org/apache/bifromq/mqtt/inbox/RPCBluePrint.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox; +package org.apache.bifromq.mqtt.inbox; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.OnlineInboxBrokerGrpc; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.mqtt.inbox.rpc.proto.OnlineInboxBrokerGrpc; public class RPCBluePrint { public static final BluePrint INSTANCE = BluePrint.builder() diff --git a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/com/baidu/bifromq/mqtt/inbox/util/DelivererKeyUtil.java b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/org/apache/bifromq/mqtt/inbox/util/DelivererKeyUtil.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/com/baidu/bifromq/mqtt/inbox/util/DelivererKeyUtil.java rename to bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/org/apache/bifromq/mqtt/inbox/util/DelivererKeyUtil.java index 9b98ed6ba..7af863216 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/com/baidu/bifromq/mqtt/inbox/util/DelivererKeyUtil.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/java/org/apache/bifromq/mqtt/inbox/util/DelivererKeyUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox.util; +package org.apache.bifromq.mqtt.inbox.util; -import com.baidu.bifromq.sysprops.props.DeliverersPerMqttServer; +import org.apache.bifromq.sysprops.props.DeliverersPerMqttServer; public class DelivererKeyUtil { private static final String DELIMITER = ":"; diff --git a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/proto/mqttbroker/MessageReceiver.proto b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/proto/mqttbroker/MessageReceiver.proto index 8c62d1591..675e2c374 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/proto/mqttbroker/MessageReceiver.proto +++ b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/main/proto/mqttbroker/MessageReceiver.proto @@ -3,7 +3,7 @@ import "commontype/QoS.proto"; import "subbroker/type.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.mqtt.inbox.rpc.proto";; +option java_package = "org.apache.bifromq.mqtt.inbox.rpc.proto";; option java_outer_classname = "MessageReceiverProtos"; package mqttbroker; diff --git a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/com/baidu/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/org/apache/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/com/baidu/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java rename to bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/org/apache/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java index 703aabfe4..df01f8953 100644 --- a/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/com/baidu/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java +++ b/bifromq-mqtt/bifromq-mqtt-broker-rpc-definition/src/test/java/org/apache/bifromq/mqtt/inbox/util/DeliveryKeyUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.inbox.util; +package org.apache.bifromq.mqtt.inbox.util; import static org.testng.Assert.assertEquals; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/ConnListenerBuilder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/ConnListenerBuilder.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/ConnListenerBuilder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/ConnListenerBuilder.java index d6d4d37c9..a17d08cc5 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/ConnListenerBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/ConnListenerBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; import com.google.common.base.Preconditions; import io.netty.channel.ChannelOption; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/IMQTTBroker.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/IMQTTBroker.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/IMQTTBroker.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/IMQTTBroker.java index 2f4857111..e42ddd455 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/IMQTTBroker.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/IMQTTBroker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; public interface IMQTTBroker { static MQTTBrokerBuilder builder() { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/IMQTTBrokerBuilder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/IMQTTBrokerBuilder.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/IMQTTBrokerBuilder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/IMQTTBrokerBuilder.java index 3ecad8360..37c215006 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/IMQTTBrokerBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/IMQTTBrokerBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; public interface IMQTTBrokerBuilder { String brokerId(); diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/MQTTBroker.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/MQTTBroker.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/MQTTBroker.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/MQTTBroker.java index 50450836e..cfec0f432 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/MQTTBroker.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/MQTTBroker.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; -import static com.baidu.bifromq.mqtt.handler.condition.ORCondition.or; +import static org.apache.bifromq.mqtt.handler.condition.ORCondition.or; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.ClientAddrHandler; -import com.baidu.bifromq.mqtt.handler.ConditionalRejectHandler; -import com.baidu.bifromq.mqtt.handler.ConnectionRateLimitHandler; -import com.baidu.bifromq.mqtt.handler.MQTTMessageDebounceHandler; -import com.baidu.bifromq.mqtt.handler.MQTTPreludeHandler; -import com.baidu.bifromq.mqtt.handler.ProxyProtocolDetector; -import com.baidu.bifromq.mqtt.handler.ProxyProtocolHandler; -import com.baidu.bifromq.mqtt.handler.condition.DirectMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.ws.MqttOverWSHandler; -import com.baidu.bifromq.mqtt.handler.ws.WebSocketOnlyHandler; -import com.baidu.bifromq.mqtt.service.ILocalSessionServer; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.ClientAddrHandler; +import org.apache.bifromq.mqtt.handler.ConditionalRejectHandler; +import org.apache.bifromq.mqtt.handler.ConnectionRateLimitHandler; +import org.apache.bifromq.mqtt.handler.MQTTMessageDebounceHandler; +import org.apache.bifromq.mqtt.handler.MQTTPreludeHandler; +import org.apache.bifromq.mqtt.handler.ProxyProtocolDetector; +import org.apache.bifromq.mqtt.handler.ProxyProtocolHandler; +import org.apache.bifromq.mqtt.handler.condition.DirectMemPressureCondition; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.mqtt.handler.ws.MqttOverWSHandler; +import org.apache.bifromq.mqtt.handler.ws.WebSocketOnlyHandler; +import org.apache.bifromq.mqtt.service.ILocalSessionServer; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; import com.google.common.util.concurrent.RateLimiter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.netty4.NettyEventExecutorMetrics; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/MQTTBrokerBuilder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/MQTTBrokerBuilder.java similarity index 78% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/MQTTBrokerBuilder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/MQTTBrokerBuilder.java index 41bc9c2c2..3d8e1d593 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/MQTTBrokerBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/MQTTBrokerBuilder.java @@ -11,29 +11,29 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.mqtt.service.ILocalDistService; -import com.baidu.bifromq.mqtt.service.ILocalSessionRegistry; -import com.baidu.bifromq.mqtt.service.ILocalTopicRouter; -import com.baidu.bifromq.mqtt.service.LocalDistService; -import com.baidu.bifromq.mqtt.service.LocalSessionRegistry; -import com.baidu.bifromq.mqtt.service.LocalTopicRouter; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.mqtt.service.ILocalDistService; +import org.apache.bifromq.mqtt.service.ILocalSessionRegistry; +import org.apache.bifromq.mqtt.service.ILocalTopicRouter; +import org.apache.bifromq.mqtt.service.LocalDistService; +import org.apache.bifromq.mqtt.service.LocalSessionRegistry; +import org.apache.bifromq.mqtt.service.LocalTopicRouter; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; @Slf4j @NoArgsConstructor(access = AccessLevel.PACKAGE) diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ChannelAttrs.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ChannelAttrs.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ChannelAttrs.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ChannelAttrs.java index 858f13c00..0dd8f2c5b 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ChannelAttrs.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ChannelAttrs.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.mqtt.MqttDecoder; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ClientAddrHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ClientAddrHandler.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ClientAddrHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ClientAddrHandler.java index 93910819d..d3fbb704d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ClientAddrHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ClientAddrHandler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.mqtt.handler.ChannelAttrs.PEER_ADDR; +import static org.apache.bifromq.mqtt.handler.ChannelAttrs.PEER_ADDR; import com.google.common.base.Strings; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConditionalRejectHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConditionalRejectHandler.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConditionalRejectHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConditionalRejectHandler.java index 0d59beb13..e8e77f1ad 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConditionalRejectHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConditionalRejectHandler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConditionalSlowDownHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConditionalSlowDownHandler.java similarity index 87% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConditionalSlowDownHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConditionalSlowDownHandler.java index 8c613a6d6..f2389257d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConditionalSlowDownHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConditionalSlowDownHandler.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.mqtt.handler.condition.InboundResourceCondition; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.mqtt.handler.condition.InboundResourceCondition; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import java.time.Duration; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConnectionRateLimitHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConnectionRateLimitHandler.java similarity index 90% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConnectionRateLimitHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConnectionRateLimitHandler.java index ea49fcc28..ad2695a1b 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ConnectionRateLimitHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ConnectionRateLimitHandler.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; import com.google.common.util.concurrent.RateLimiter; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandler; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/IMQTTProtocolHelper.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/IMQTTProtocolHelper.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/IMQTTProtocolHelper.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/IMQTTProtocolHelper.java index 4ed42375e..77b848128 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/IMQTTProtocolHelper.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/IMQTTProtocolHelper.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; - -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.UserProperties; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +package org.apache.bifromq.mqtt.handler; + +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttPublishMessage; @@ -146,6 +146,6 @@ enum UnsubResult { record SubTask(String topicFilter, TopicFilterOption option, UserProperties userProperties) { } - record PubResult(com.baidu.bifromq.dist.client.PubResult distResult, RetainReply.Result retainResult) { + record PubResult(org.apache.bifromq.dist.client.PubResult distResult, RetainReply.Result retainResult) { } } diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MPSThrottler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MPSThrottler.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MPSThrottler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MPSThrottler.java index d557f40bf..2c6c1a50a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MPSThrottler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MPSThrottler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import java.util.concurrent.TimeUnit; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTConnectHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTConnectHandler.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTConnectHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTConnectHandler.java index a82f61183..307ac304a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTConnectHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTConnectHandler.java @@ -11,54 +11,54 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; - -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.metrics.TenantMetric.MqttIngressBytes; -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; -import static com.baidu.bifromq.mqtt.handler.condition.ORCondition.or; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_P_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_T_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnectPerSecond; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnections; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalSessionMemoryBytes; - -import com.baidu.bifromq.base.util.AsyncRetry; -import com.baidu.bifromq.base.util.FutureTracker; -import com.baidu.bifromq.base.util.exception.RetryTimeoutException; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistRequest; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.condition.DirectMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.condition.InboundResourceCondition; -import com.baidu.bifromq.mqtt.handler.record.GoAway; -import com.baidu.bifromq.mqtt.session.IMQTTPersistentSession; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.mqtt.utils.IMQTTMessageSizer; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ProtocolError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientconnected.ClientConnected; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sysprops.props.SanityCheckMqttUtf8String; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.UserProperties; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +package org.apache.bifromq.mqtt.handler; + +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.metrics.TenantMetric.MqttIngressBytes; +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; +import static org.apache.bifromq.mqtt.handler.condition.ORCondition.or; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_P_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_T_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnectPerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnections; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalSessionMemoryBytes; + +import org.apache.bifromq.base.util.AsyncRetry; +import org.apache.bifromq.base.util.FutureTracker; +import org.apache.bifromq.base.util.exception.RetryTimeoutException; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.AttachRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.ExistRequest; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.condition.DirectMemPressureCondition; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.mqtt.handler.condition.InboundResourceCondition; +import org.apache.bifromq.mqtt.handler.record.GoAway; +import org.apache.bifromq.mqtt.session.IMQTTPersistentSession; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.mqtt.utils.IMQTTMessageSizer; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ProtocolError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientconnected.ClientConnected; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.sysprops.props.SanityCheckMqttUtf8String; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import com.google.protobuf.ByteString; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFutureListener; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java index cde3abb00..7eac87fcb 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTMessageDebounceHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTMessageHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTMessageHandler.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTMessageHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTMessageHandler.java index c2cfc7aed..165c445a1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTMessageHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTMessageHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFuture; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPacketFilter.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPacketFilter.java similarity index 82% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPacketFilter.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPacketFilter.java index 0c7044512..d20da2009 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPacketFilter.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPacketFilter.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.metrics.TenantMetric.MqttChannelLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttEgressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS0EgressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1EgressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2EgressBytes; -import static com.baidu.bifromq.mqtt.utils.MQTTMessageTrimmer.trim; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.metrics.TenantMetric.MqttChannelLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttEgressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS0EgressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1EgressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2EgressBytes; +import static org.apache.bifromq.mqtt.utils.MQTTMessageTrimmer.trim; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.utils.IMQTTMessageSizer; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.OversizePacketDropped; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.utils.IMQTTMessageSizer; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.OversizePacketDropped; +import org.apache.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Timer; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOutboundHandlerAdapter; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java similarity index 87% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java index 3b41c2f4b..8e547f22c 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPersistentSessionHandler.java @@ -11,55 +11,55 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; -import static com.baidu.bifromq.inbox.util.InboxServiceUtil.receiverId; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSubCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentSubLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentUnsubCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttPersistentUnsubLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS0InternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1InternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2InternalLatency; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.UnsubResult.ERROR; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildSubAction; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSessionSpaceBytes; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSessions; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSubscribePerSecond; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSubscriptions; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentUnsubscribePerSecond; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.getDelivererKey; +import static org.apache.bifromq.inbox.util.InboxServiceUtil.receiverId; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSubCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentSubLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentUnsubCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttPersistentUnsubLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS0InternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1InternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2InternalLatency; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.UnsubResult.ERROR; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildSubAction; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSessionSpaceBytes; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSessions; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSubscribePerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentSubscriptions; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalPersistentUnsubscribePerSecond; -import com.baidu.bifromq.base.util.AsyncRetry; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachRequest; -import com.baidu.bifromq.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.mqtt.session.IMQTTPersistentSession; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchRequest; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessage; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.base.util.AsyncRetry; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachRequest; +import org.apache.bifromq.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.mqtt.session.IMQTTPersistentSession; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchRequest; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessage; +import org.apache.bifromq.util.TopicUtil; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import io.micrometer.core.instrument.Timer; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPreludeHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPreludeHandler.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPreludeHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPreludeHandler.java index f4620b709..5667fb564 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTPreludeHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTPreludeHandler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_CLIENT_IDENTIFIER_NOT_VALID; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_IDENTIFIER_REJECTED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_MALFORMED_PACKET; @@ -21,16 +21,16 @@ import static io.netty.handler.codec.mqtt.MqttMessageType.CONNECT; import static io.netty.handler.codec.mqtt.MqttMessageType.PUBLISH; -import com.baidu.bifromq.mqtt.handler.v3.MQTT3ConnectHandler; -import com.baidu.bifromq.mqtt.handler.v5.MQTT5ConnectHandler; -import com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageBuilders; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ConnectTimeout; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.IdentifierRejected; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ProtocolError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnacceptedProtocolVer; +import org.apache.bifromq.mqtt.handler.v3.MQTT3ConnectHandler; +import org.apache.bifromq.mqtt.handler.v5.MQTT5ConnectHandler; +import org.apache.bifromq.mqtt.handler.v5.MQTT5MessageBuilders; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ConnectTimeout; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.IdentifierRejected; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ProtocolError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnacceptedProtocolVer; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionHandler.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionHandler.java index 513c1b02e..e43647295 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionHandler.java @@ -11,113 +11,90 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; - -import static com.baidu.bifromq.inbox.storage.proto.RetainHandling.SEND_AT_SUBSCRIBE; -import static com.baidu.bifromq.inbox.storage.proto.RetainHandling.SEND_AT_SUBSCRIBE_IF_NOT_YET_EXISTS; -import static com.baidu.bifromq.metrics.TenantMetric.MqttConnectCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttDisconnectCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttIngressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS0DistBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS0IngressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1DeliverBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1DistBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1ExternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1IngressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2DeliverBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2DistBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2ExternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2IngressBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttTransientSubLatency; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT; -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.packetId; -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.messageExpiryInterval; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildPubAction; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildSubAction; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildUnsubAction; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; -import static com.baidu.bifromq.type.QoS.AT_MOST_ONCE; -import static com.baidu.bifromq.type.QoS.EXACTLY_ONCE; -import static com.baidu.bifromq.util.TopicUtil.isSharedSubscription; -import static com.baidu.bifromq.util.TopicUtil.isValidTopicFilter; -import static com.baidu.bifromq.util.TopicUtil.isWildcardTopicFilter; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMatchBytesPerSecond; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMatchPerSeconds; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMessageSpaceBytes; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainTopics; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainedBytesPerSecond; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainedMessagesPerSeconds; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalSharedSubscriptions; +package org.apache.bifromq.mqtt.handler; + +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMatchBytesPerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMatchPerSeconds; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainMessageSpaceBytes; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainTopics; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainedBytesPerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalRetainedMessagesPerSeconds; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalSharedSubscriptions; import static java.util.concurrent.CompletableFuture.allOf; - -import com.baidu.bifromq.base.util.FutureTracker; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.mqtt.session.IMQTTSession; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.mqtt.utils.IMQTTMessageSizer; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.clientbalancer.Redirection; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.PingReq; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl.PubActionDisallow; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl.SubActionDisallow; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl.UnsubActionDisallow; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ClientChannelError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopicFilter; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopicFilter; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS0DistError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1DistError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1PubAckDropped; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2DistError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2PubRecDropped; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDistError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDisted; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.DropReason; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS0Dropped; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS0Pushed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Dropped; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Pushed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Dropped; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Pushed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Received; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MatchRetainError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetained; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetainedError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling.RetainMsgCleared; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.subhandling.SubAcked; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.subhandling.UnsubAcked; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sessiondict.client.ISessionRegistration; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sysprops.props.ClientRedirectCheckIntervalSeconds; -import com.baidu.bifromq.sysprops.props.SanityCheckMqttUtf8String; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MQTTClientInfoConstants; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.UserProperties; -import com.baidu.bifromq.util.UTF8Util; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import static org.apache.bifromq.inbox.storage.proto.RetainHandling.SEND_AT_SUBSCRIBE; +import static org.apache.bifromq.inbox.storage.proto.RetainHandling.SEND_AT_SUBSCRIBE_IF_NOT_YET_EXISTS; +import static org.apache.bifromq.metrics.TenantMetric.MqttConnectCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttDisconnectCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttIngressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS0DistBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS0IngressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1DeliverBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1DistBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1ExternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1IngressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2DeliverBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2DistBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2ExternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2IngressBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttTransientSubLatency; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT; +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.packetId; +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.messageExpiryInterval; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildPubAction; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildSubAction; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildUnsubAction; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.type.QoS.AT_MOST_ONCE; +import static org.apache.bifromq.type.QoS.EXACTLY_ONCE; +import static org.apache.bifromq.util.TopicUtil.isSharedSubscription; +import static org.apache.bifromq.util.TopicUtil.isValidTopicFilter; +import static org.apache.bifromq.util.TopicUtil.isWildcardTopicFilter; + +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.clientbalancer.Redirection; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.PingReq; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl.PubActionDisallow; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl.SubActionDisallow; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl.UnsubActionDisallow; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ClientChannelError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopicFilter; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopicFilter; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS0DistError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1DistError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1PubAckDropped; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2DistError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2PubRecDropped; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDistError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.WillDisted; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.DropReason; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS0Dropped; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS0Pushed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Dropped; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Pushed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Dropped; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Pushed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Received; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MatchRetainError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetained; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.MsgRetainedError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling.RetainMsgCleared; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.subhandling.SubAcked; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.subhandling.UnsubAcked; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.github.benmanes.caffeine.cache.Cache; import com.google.common.collect.Sets; import io.micrometer.core.instrument.Timer; @@ -152,6 +129,29 @@ import lombok.Getter; import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.base.util.FutureTracker; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.mqtt.session.IMQTTSession; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.mqtt.utils.IMQTTMessageSizer; +import org.apache.bifromq.sessiondict.client.ISessionRegistration; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sysprops.props.ClientRedirectCheckIntervalSeconds; +import org.apache.bifromq.sysprops.props.SanityCheckMqttUtf8String; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MQTTClientInfoConstants; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.util.UTF8Util; /** * The abstract class for MQTT session handler. diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTSessionIdUtil.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionIdUtil.java similarity index 78% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTSessionIdUtil.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionIdUtil.java index 092a5d8a1..0a65cec25 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTSessionIdUtil.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTSessionIdUtil.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; public class MQTTSessionIdUtil { public static int packetId(long seq) { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTTransientSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTTransientSessionHandler.java similarity index 85% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTTransientSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTTransientSessionHandler.java index 752b8c009..15123487a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/MQTTTransientSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/MQTTTransientSessionHandler.java @@ -11,49 +11,36 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS0InternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS1InternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttQoS2InternalLatency; -import static com.baidu.bifromq.metrics.TenantMetric.MqttTransientSubCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttTransientUnsubCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttTransientUnsubLatency; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXISTS; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.OK; -import static com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper.UnsubResult.ERROR; -import static com.baidu.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; -import static com.baidu.bifromq.mqtt.service.ILocalDistService.globalize; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildSubAction; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientSubscribePerSecond; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientSubscriptions; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientUnsubscribePerSecond; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXCEED_LIMIT; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.EXISTS; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.SubResult.OK; +import static org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper.UnsubResult.ERROR; +import static org.apache.bifromq.mqtt.service.ILocalDistService.globalize; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildSubAction; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientSubscribePerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientSubscriptions; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientUnsubscribePerSecond; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS0InternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS1InternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttQoS2InternalLatency; +import static org.apache.bifromq.metrics.TenantMetric.MqttTransientSubCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttTransientUnsubCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttTransientUnsubLatency; +import static org.apache.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; -import com.baidu.bifromq.plugin.eventcollector.session.MQTTSessionStart; -import com.baidu.bifromq.plugin.eventcollector.session.MQTTSessionStop; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchRequest; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; +import org.apache.bifromq.plugin.eventcollector.session.MQTTSessionStart; +import org.apache.bifromq.plugin.eventcollector.session.MQTTSessionStop; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchRequest; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import com.google.common.collect.Sets; @@ -78,6 +65,19 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; @Slf4j public abstract class MQTTTransientSessionHandler extends MQTTSessionHandler implements IMQTTTransientSession { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolDetector.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ProxyProtocolDetector.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolDetector.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ProxyProtocolDetector.java index 7a6372b92..677287f9e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolDetector.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ProxyProtocolDetector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ProxyProtocolHandler.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ProxyProtocolHandler.java index d400e99b0..0500da70f 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ProxyProtocolHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/SendBufferCapacityHinter.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/SendBufferCapacityHinter.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/SendBufferCapacityHinter.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/SendBufferCapacityHinter.java index 11940587c..e9df11ff3 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/SendBufferCapacityHinter.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/SendBufferCapacityHinter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import io.netty.channel.Channel; import java.util.function.IntConsumer; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/TenantSettings.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/TenantSettings.java similarity index 61% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/TenantSettings.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/TenantSettings.java index e044bc5a6..ad5dd29bd 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/TenantSettings.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/TenantSettings.java @@ -11,42 +11,42 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.plugin.settingprovider.Setting.DebugModeEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ForceTransient; -import static com.baidu.bifromq.plugin.settingprovider.Setting.InBoundBandWidth; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MQTT3Enabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MQTT4Enabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MQTT5Enabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxLastWillBytes; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxResendTimes; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxSessionExpirySeconds; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicAlias; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerInbox; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerSub; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxUserPayloadBytes; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaximumQoS; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MinKeepAliveSeconds; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MinSessionExpirySeconds; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; -import static com.baidu.bifromq.plugin.settingprovider.Setting.OutBoundBandWidth; -import static com.baidu.bifromq.plugin.settingprovider.Setting.PayloadFormatValidationEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.QoS0DropOldest; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ReceivingMaximum; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ResendTimeoutSeconds; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainMessageMatchLimit; -import static com.baidu.bifromq.plugin.settingprovider.Setting.SessionInboxSize; -import static com.baidu.bifromq.plugin.settingprovider.Setting.SharedSubscriptionEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.SubscriptionIdentifierEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.WildcardSubscriptionEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.DebugModeEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.ForceTransient; +import static org.apache.bifromq.plugin.settingprovider.Setting.InBoundBandWidth; +import static org.apache.bifromq.plugin.settingprovider.Setting.MQTT3Enabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.MQTT4Enabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.MQTT5Enabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxLastWillBytes; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxResendTimes; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxSessionExpirySeconds; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicAlias; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerInbox; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerSub; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxUserPayloadBytes; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaximumQoS; +import static org.apache.bifromq.plugin.settingprovider.Setting.MinKeepAliveSeconds; +import static org.apache.bifromq.plugin.settingprovider.Setting.MinSessionExpirySeconds; +import static org.apache.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; +import static org.apache.bifromq.plugin.settingprovider.Setting.OutBoundBandWidth; +import static org.apache.bifromq.plugin.settingprovider.Setting.PayloadFormatValidationEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.QoS0DropOldest; +import static org.apache.bifromq.plugin.settingprovider.Setting.ReceivingMaximum; +import static org.apache.bifromq.plugin.settingprovider.Setting.ResendTimeoutSeconds; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainMessageMatchLimit; +import static org.apache.bifromq.plugin.settingprovider.Setting.SessionInboxSize; +import static org.apache.bifromq.plugin.settingprovider.Setting.SharedSubscriptionEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.SubscriptionIdentifierEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.WildcardSubscriptionEnabled; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.type.QoS; public class TenantSettings { public final boolean mqtt3Enabled; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/Condition.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/Condition.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/Condition.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/Condition.java index 92cc779da..5d2a23cca 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/Condition.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/Condition.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.condition; +package org.apache.bifromq.mqtt.handler.condition; /** * Condition interface. diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java similarity index 87% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java index 6fea41bad..1bacf67a1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/DirectMemPressureCondition.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.condition; +package org.apache.bifromq.mqtt.handler.condition; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java similarity index 87% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java index 8f125001d..70ade9ac5 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/HeapMemPressureCondition.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.condition; +package org.apache.bifromq.mqtt.handler.condition; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/InboundResourceCondition.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/InboundResourceCondition.java similarity index 82% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/InboundResourceCondition.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/InboundResourceCondition.java index 9ead9d490..ae69b9011 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/InboundResourceCondition.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/InboundResourceCondition.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.condition; +package org.apache.bifromq.mqtt.handler.condition; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalInboundBytesPerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalInboundBytesPerSecond; -import com.baidu.bifromq.type.ClientInfo; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; public class InboundResourceCondition implements Condition { private final IResourceThrottler resourceThrottler; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/ORCondition.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/ORCondition.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/ORCondition.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/ORCondition.java index 948818685..cc5e36edb 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/condition/ORCondition.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/condition/ORCondition.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.condition; +package org.apache.bifromq.mqtt.handler.condition; /** * Group of conditions that are met if any of the conditions are met. diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/record/GoAway.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/record/GoAway.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/record/GoAway.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/record/GoAway.java index 31a20d623..d6c2ccf1a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/record/GoAway.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/record/GoAway.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.record; +package org.apache.bifromq.mqtt.handler.record; -import com.baidu.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.Event; import io.netty.handler.codec.mqtt.MqttMessage; public record GoAway(MqttMessage farewell, boolean rightNow, Event... reasons) { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/record/ProtocolResponse.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/record/ProtocolResponse.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/record/ProtocolResponse.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/record/ProtocolResponse.java index 2580a3fdd..6f8a08239 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/record/ProtocolResponse.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/record/ProtocolResponse.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.record; +package org.apache.bifromq.mqtt.handler.record; -import com.baidu.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.Event; import io.netty.handler.codec.mqtt.MqttMessage; public record ProtocolResponse(MqttMessage message, Action action, Event... reasons) { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java similarity index 83% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java index 5d63c8437..7e832a09d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ConnectHandler.java @@ -11,70 +11,70 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.metrics.TenantMetric.MqttAuthFailureCount; -import static com.baidu.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.goAway; -import static com.baidu.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.ok; -import static com.baidu.bifromq.mqtt.handler.condition.ORCondition.or; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildConnAction; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.metrics.TenantMetric.MqttAuthFailureCount; +import static org.apache.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.goAway; +import static org.apache.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.ok; +import static org.apache.bifromq.mqtt.handler.condition.ORCondition.or; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildConnAction; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_BAD_USER_NAME_OR_PASSWORD; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_IDENTIFIER_REJECTED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_NOT_AUTHORIZED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_UNACCEPTABLE_PROTOCOL_VERSION; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.MQTTConnectHandler; -import com.baidu.bifromq.mqtt.handler.MQTTSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.condition.DirectMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.record.GoAway; -import com.baidu.bifromq.mqtt.utils.AuthUtil; -import com.baidu.bifromq.mqtt.utils.IMQTTMessageSizer; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.clientbalancer.Redirection; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.AuthError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.IdentifierRejected; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedClientIdentifier; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedUserName; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedWillTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.NotAuthorizedClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnauthenticatedClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; -import com.baidu.bifromq.sysprops.props.MaxMqtt3ClientIdLength; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.UserProperties; -import com.baidu.bifromq.util.TopicUtil; -import com.baidu.bifromq.util.UTF8Util; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.MQTTConnectHandler; +import org.apache.bifromq.mqtt.handler.MQTTSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.condition.DirectMemPressureCondition; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.mqtt.handler.record.GoAway; +import org.apache.bifromq.mqtt.utils.AuthUtil; +import org.apache.bifromq.mqtt.utils.IMQTTMessageSizer; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.clientbalancer.Redirection; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.AuthError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.IdentifierRejected; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedClientIdentifier; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedUserName; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedWillTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.NotAuthorizedClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnauthenticatedClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; +import org.apache.bifromq.sysprops.props.MaxMqtt3ClientIdLength; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.util.UTF8Util; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import com.google.common.base.Strings; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java index ab8dd164c..f36035c06 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3MessageBuilders.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import io.netty.buffer.Unpooled; import io.netty.handler.codec.mqtt.MqttFixedHeader; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java index 513d497fb..ae47cd869 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3MessageUtils.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import io.netty.handler.codec.mqtt.MqttPublishMessage; import io.netty.handler.codec.mqtt.MqttQoS; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java similarity index 79% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java index 3d21ed315..356403e35 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper; -import com.baidu.bifromq.mqtt.handler.MQTTPersistentSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper; +import org.apache.bifromq.mqtt.handler.MQTTPersistentSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import jakarta.annotation.Nullable; import lombok.Builder; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java similarity index 83% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java index 5a2b8fdc3..cd322307b 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ProtocolHelper.java @@ -11,54 +11,54 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; - -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.farewell; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.goAway; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.goAwayNow; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.response; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.responseNothing; -import static com.baidu.bifromq.mqtt.handler.v3.MQTT3MessageUtils.toMessage; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; +package org.apache.bifromq.mqtt.handler.v3; + +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.farewell; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.goAway; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.goAwayNow; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.response; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.responseNothing; +import static org.apache.bifromq.mqtt.handler.v3.MQTT3MessageUtils.toMessage; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper; -import com.baidu.bifromq.mqtt.handler.MQTTSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.BadPacket; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByServer; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedReceivingLimit; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Idle; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Kicked; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopicFilter; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.NoPubPermission; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeSubscription; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeUnsubscription; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.Discard; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1PubAcked; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2PubReced; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sysprops.props.SanityCheckMqttUtf8String; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.UserProperties; -import com.baidu.bifromq.util.TopicUtil; -import com.baidu.bifromq.util.UTF8Util; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper; +import org.apache.bifromq.mqtt.handler.MQTTSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.BadPacket; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByServer; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedReceivingLimit; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Idle; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Kicked; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopicFilter; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.NoPubPermission; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeSubscription; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeUnsubscription; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.Discard; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1PubAcked; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2PubReced; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.sysprops.props.SanityCheckMqttUtf8String; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.util.UTF8Util; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessageBuilders; @@ -387,7 +387,7 @@ public ProtocolResponse onQoS0DistDenied(String topic, Message distMessage, Chec @Override public ProtocolResponse onQoS0PubHandled(PubResult result, MqttPublishMessage message, UserProperties userProps) { - if (result.distResult() == com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED + if (result.distResult() == org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED) { String reason = result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED ? "Too many retained qos0 publish" @@ -416,7 +416,7 @@ public ProtocolResponse respondQoS1PacketInUse(MqttPublishMessage message) { @Override public ProtocolResponse onQoS1PubHandled(PubResult result, MqttPublishMessage message, UserProperties userProps) { - if (result.distResult() == com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED + if (result.distResult() == org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED) { String reason = result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED ? "Too many retained qos1 publish" @@ -459,7 +459,7 @@ public ProtocolResponse onQoS2DistDenied(String topic, int packetId, Message dis @Override public ProtocolResponse onQoS2PubHandled(PubResult result, MqttPublishMessage message, UserProperties userProps) { - if (result.distResult() == com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED + if (result.distResult() == org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED) { String reason = result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED ? "Too many retained qos2 publish" diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java similarity index 79% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java index a7859a7ed..cecadc8c1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper; -import com.baidu.bifromq.mqtt.handler.MQTTTransientSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper; +import org.apache.bifromq.mqtt.handler.MQTTTransientSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import jakarta.annotation.Nullable; import lombok.Builder; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/IReAuthenticator.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/IReAuthenticator.java similarity index 76% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/IReAuthenticator.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/IReAuthenticator.java index 8d18f4243..7ca3ad8f3 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/IReAuthenticator.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/IReAuthenticator.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.farewell; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.farewell; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; +import org.apache.bifromq.type.ClientInfo; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessageType; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java index df3f93bd4..35de8a069 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ConnectHandler.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import static com.baidu.bifromq.metrics.TenantMetric.MqttAuthFailureCount; -import static com.baidu.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.goAway; -import static com.baidu.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.ok; -import static com.baidu.bifromq.mqtt.handler.condition.ORCondition.or; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authData; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.isUTF8Payload; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.maximumPacketSize; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.mqttProps; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestProblemInformation; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestResponseInformation; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toWillMessage; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.topicAliasMaximum; -import static com.baidu.bifromq.mqtt.utils.AuthUtil.buildConnAction; -import static com.baidu.bifromq.mqtt.utils.MQTT5MessageSizer.MIN_CONTROL_PACKET_SIZE; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.metrics.TenantMetric.MqttAuthFailureCount; +import static org.apache.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.goAway; +import static org.apache.bifromq.mqtt.handler.MQTTConnectHandler.AuthResult.ok; +import static org.apache.bifromq.mqtt.handler.condition.ORCondition.or; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authData; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.isUTF8Payload; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.maximumPacketSize; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.mqttProps; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestProblemInformation; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestResponseInformation; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toWillMessage; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.topicAliasMaximum; +import static org.apache.bifromq.mqtt.utils.AuthUtil.buildConnAction; +import static org.apache.bifromq.mqtt.utils.MQTT5MessageSizer.MIN_CONTROL_PACKET_SIZE; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_BAD_AUTHENTICATION_METHOD; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_BAD_USERNAME_OR_PASSWORD; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_BANNED; @@ -59,51 +59,51 @@ import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_USE_ANOTHER_SERVER; import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.SESSION_EXPIRY_INTERVAL; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.MQTTConnectHandler; -import com.baidu.bifromq.mqtt.handler.MQTTSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.condition.DirectMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.record.GoAway; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; -import com.baidu.bifromq.mqtt.utils.AuthUtil; -import com.baidu.bifromq.mqtt.utils.IMQTTMessageSizer; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.Continue; -import com.baidu.bifromq.plugin.authprovider.type.Failed; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.clientbalancer.Redirection; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.AuthError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.EnhancedAuthAbortByClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedClientIdentifier; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedUserName; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedWillTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.NotAuthorizedClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ProtocolError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnauthenticatedClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; -import com.baidu.bifromq.sysprops.props.MaxMqtt5ClientIdLength; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.StringPair; -import com.baidu.bifromq.type.UserProperties; -import com.baidu.bifromq.util.TopicUtil; -import com.baidu.bifromq.util.UTF8Util; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.MQTTConnectHandler; +import org.apache.bifromq.mqtt.handler.MQTTSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.condition.DirectMemPressureCondition; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.mqtt.handler.record.GoAway; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; +import org.apache.bifromq.mqtt.utils.AuthUtil; +import org.apache.bifromq.mqtt.utils.IMQTTMessageSizer; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.Continue; +import org.apache.bifromq.plugin.authprovider.type.Failed; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.clientbalancer.Redirection; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.AuthError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.EnhancedAuthAbortByClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedClientIdentifier; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedUserName; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.MalformedWillTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.NotAuthorizedClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ProtocolError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnauthenticatedClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; +import org.apache.bifromq.sysprops.props.MaxMqtt5ClientIdLength; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.StringPair; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.util.UTF8Util; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import com.google.common.base.Strings; import com.google.protobuf.ByteString; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java index eb75501c6..0378761de 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5MessageBuilders.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; - -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.handler.MQTTSessionHandler; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubCompReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRelReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode; -import com.baidu.bifromq.type.UserProperties; +package org.apache.bifromq.mqtt.handler.v5; + +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.handler.MQTTSessionHandler; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubCompReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRelReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode; +import org.apache.bifromq.type.UserProperties; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java index e63f85dfc..28cdf0208 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5MessageUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.AUTHENTICATION_DATA; import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.AUTHENTICATION_METHOD; @@ -21,12 +21,12 @@ import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.REASON_STRING; import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.RESPONSE_TOPIC; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.StringPair; -import com.baidu.bifromq.type.UserProperties; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.StringPair; +import org.apache.bifromq.type.UserProperties; import com.google.protobuf.ByteString; import com.google.protobuf.UnsafeByteOperations; import io.netty.handler.codec.mqtt.MqttConnectMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java index 195a59090..6348686af 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper; -import com.baidu.bifromq.mqtt.handler.MQTTPersistentSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper; +import org.apache.bifromq.mqtt.handler.MQTTPersistentSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java index cdf3921c2..8c039fb6d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ProtocolHelper.java @@ -11,71 +11,71 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; - -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.farewell; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.farewellNow; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.response; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.isUTF8Payload; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.messageExpiryInterval; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.receiveMaximum; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestProblemInformation; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.responseTopic; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.subscriptionIdentifier; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.topicAlias; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.topicAliasMaximum; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.util.TopicUtil.isValidTopic; -import static com.baidu.bifromq.util.UTF8Util.isWellFormed; +package org.apache.bifromq.mqtt.handler.v5; + +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.farewell; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.farewellNow; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.response; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.isUTF8Payload; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.messageExpiryInterval; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.receiveMaximum; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestProblemInformation; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.responseTopic; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.subscriptionIdentifier; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.topicAlias; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.topicAliasMaximum; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.util.TopicUtil.isValidTopic; +import static org.apache.bifromq.util.UTF8Util.isWellFormed; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_BUSY; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.storage.proto.RetainHandling; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper; -import com.baidu.bifromq.mqtt.handler.MQTTSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubCompReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRelReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.BadPacket; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByServer; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedPubRate; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedReceivingLimit; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Idle; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Kicked; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopic; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopicFilter; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.NoPubPermission; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeSubscription; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeUnsubscription; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1PubAcked; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2PubReced; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sysprops.props.SanityCheckMqttUtf8String; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.UserProperties; -import com.baidu.bifromq.util.TopicUtil; -import com.baidu.bifromq.util.UTF8Util; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.storage.proto.RetainHandling; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper; +import org.apache.bifromq.mqtt.handler.MQTTSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubCompReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRelReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.BadPacket; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByServer; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedPubRate; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedReceivingLimit; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Idle; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InboxTransientError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Kicked; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopic; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.MalformedTopicFilter; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.NoPubPermission; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ServerBusy; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeSubscription; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.TooLargeUnsubscription; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS1PubAcked; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling.QoS2PubReced; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.sysprops.props.SanityCheckMqttUtf8String; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.UserProperties; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.util.UTF8Util; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import io.netty.handler.codec.TooLongFrameException; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; @@ -678,7 +678,7 @@ public ProtocolResponse onQoS0DistDenied(String topic, Message distMessage, Chec @Override public ProtocolResponse onQoS0PubHandled(PubResult result, MqttPublishMessage message, UserProperties userProps) { - if (result.distResult() == com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || + if (result.distResult() == org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED) { String reason = result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED ? "Too many retained qos0 publish" : @@ -722,7 +722,7 @@ public ProtocolResponse respondQoS1PacketInUse(MqttPublishMessage message) { @Override public ProtocolResponse onQoS1PubHandled(PubResult result, MqttPublishMessage message, UserProperties userProps) { - if (result.distResult() == com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || + if (result.distResult() == org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED) { String reason = result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED ? "Too many retained qos1 publish" : @@ -795,7 +795,7 @@ public ProtocolResponse onQoS2DistDenied(String topic, int packetId, Message dis @Override public ProtocolResponse onQoS2PubHandled(PubResult result, MqttPublishMessage message, UserProperties userProps) { - if (result.distResult() == com.baidu.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || + if (result.distResult() == org.apache.bifromq.dist.client.PubResult.BACK_PRESSURE_REJECTED || result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED) { String reason = result.retainResult() == RetainReply.Result.BACK_PRESSURE_REJECTED ? "Too many retained qos2 publish" : diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java index 4fa1042ca..b1a1e073f 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import com.baidu.bifromq.inbox.storage.proto.LWT; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.handler.IMQTTProtocolHelper; -import com.baidu.bifromq.mqtt.handler.MQTTTransientSessionHandler; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.inbox.storage.proto.LWT; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.handler.IMQTTProtocolHelper; +import org.apache.bifromq.mqtt.handler.MQTTTransientSessionHandler; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/ReAuthenticator.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/ReAuthenticator.java similarity index 87% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/ReAuthenticator.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/ReAuthenticator.java index 9b4b446af..0e9c11da3 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/ReAuthenticator.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/ReAuthenticator.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.farewell; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.farewellNow; -import static com.baidu.bifromq.mqtt.handler.record.ProtocolResponse.response; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.farewell; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.farewellNow; +import static org.apache.bifromq.mqtt.handler.record.ProtocolResponse.response; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import com.baidu.bifromq.mqtt.handler.record.ProtocolResponse; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.utils.AuthUtil; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.Continue; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ReAuthFailed; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.mqtt.handler.record.ProtocolResponse; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.utils.AuthUtil; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.Continue; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ProtocolViolation; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ReAuthFailed; +import org.apache.bifromq.type.ClientInfo; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttReasonCodeAndPropertiesVariableHeader; import java.util.Optional; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java index 8afb47d63..ef36743ed 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/ReceiverTopicAliasManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; import java.util.HashMap; import java.util.Map; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java index af98079fe..8716762f2 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/SenderTopicAliasManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java index 98907b7c1..51c3d9ea0 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5AuthReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5AuthReasonCode { Success((byte) 0x00), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java index a50ef39c2..888c49350 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5DisconnectReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5DisconnectReasonCode { Normal((byte) 0), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java index e2988c850..90b385f7e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubAckReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5PubAckReasonCode { Success((byte) 0x00), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java index 7547c2414..fe07a961e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubCompReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5PubCompReasonCode { Success((byte) 0x00), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java index 8c24ee062..5bdf58e24 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubRecReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5PubRecReasonCode { Success((byte) 0x00), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java index 284cde887..1caa70876 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5PubRelReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5PubRelReasonCode { Success((byte) 0x00), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java index 5c59a05bb..dc33a88b6 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5SubAckReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5SubAckReasonCode { GrantedQoS0(0), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java index 983f375a5..25b50f205 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/v5/reason/MQTT5UnsubAckReasonCode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5.reason; +package org.apache.bifromq.mqtt.handler.v5.reason; public enum MQTT5UnsubAckReasonCode { Success(0x00), diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java index 3cba4a2bb..27484c564 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/MqttOverWSHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/MqttOverWSHandler.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/MqttOverWSHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/MqttOverWSHandler.java index f594771d8..d9e551136 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/MqttOverWSHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/MqttOverWSHandler.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; -import static com.baidu.bifromq.mqtt.handler.condition.ORCondition.or; +import static org.apache.bifromq.mqtt.handler.condition.ORCondition.or; -import com.baidu.bifromq.mqtt.handler.ConditionalRejectHandler; -import com.baidu.bifromq.mqtt.handler.MQTTMessageDebounceHandler; -import com.baidu.bifromq.mqtt.handler.MQTTPreludeHandler; -import com.baidu.bifromq.mqtt.handler.condition.DirectMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.mqtt.handler.ConditionalRejectHandler; +import org.apache.bifromq.mqtt.handler.MQTTMessageDebounceHandler; +import org.apache.bifromq.mqtt.handler.MQTTPreludeHandler; +import org.apache.bifromq.mqtt.handler.condition.DirectMemPressureCondition; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelPipeline; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java index a9ff3a4b2..46aad3d8b 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java index 0b79e16fe..2cd3a96f4 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/handler/ws/WebSocketOnlyHandler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalDistService.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalDistService.java similarity index 80% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalDistService.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalDistService.java index b7b8e4f1d..9e58de743 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalDistService.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalDistService.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; - -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.type.MatchInfo; +package org.apache.bifromq.mqtt.service; + +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.type.MatchInfo; import java.util.concurrent.CompletableFuture; public interface ILocalDistService { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionRegistry.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionRegistry.java similarity index 90% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionRegistry.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionRegistry.java index 389ef8cfe..14676f291 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionRegistry.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionRegistry.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import com.baidu.bifromq.mqtt.session.IMQTTSession; +import org.apache.bifromq.mqtt.session.IMQTTSession; import java.util.concurrent.CompletableFuture; public interface ILocalSessionRegistry { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionServer.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionServer.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionServer.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionServer.java index 03d2a2496..e7dfb16f2 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionServer.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; public interface ILocalSessionServer { static LocalSessionServerBuilder builder() { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionServerBuilder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionServerBuilder.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionServerBuilder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionServerBuilder.java index a1403334a..c08a2c136 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalSessionServerBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalSessionServerBuilder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; public interface ILocalSessionServerBuilder { ILocalSessionServer build(); diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalTopicRouter.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalTopicRouter.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalTopicRouter.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalTopicRouter.java index fc7b3fa6a..c78962f3e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/ILocalTopicRouter.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/ILocalTopicRouter.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.type.MatchInfo; import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; @@ -26,17 +26,6 @@ * globally by dist service. */ public interface ILocalTopicRouter { - /** - * The bucketed local routes for a topic filter. - */ - interface ILocalRoutes { - String localReceiverId(); - - Map routesInfo(); - - long incarnation(); - } - CompletableFuture addTopicRoute(long reqId, String tenantId, String topicFilter, @@ -50,4 +39,15 @@ CompletableFuture removeTopicRoute(long reqId, String channelId); Optional> getTopicRoutes(String tenantId, MatchInfo matchInfo); + + /** + * The bucketed local routes for a topic filter. + */ + interface ILocalRoutes { + String localReceiverId(); + + Map routesInfo(); + + long incarnation(); + } } diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalDistService.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalDistService.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalDistService.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalDistService.java index 26afea4b8..5c7db31cd 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalDistService.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalDistService.java @@ -11,30 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import static com.baidu.bifromq.metrics.TenantMetric.MqttTransientFanOutBytes; -import static com.baidu.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientFanOutBytesPerSeconds; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientFanOutBytesPerSeconds; +import static org.apache.bifromq.metrics.TenantMetric.MqttTransientFanOutBytes; +import static org.apache.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.session.IMQTTSession; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.SizeUtil; -import com.baidu.bifromq.util.TopicUtil; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.mqtt.session.IMQTTSession; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.common.collect.Sets; import java.util.HashMap; import java.util.HashSet; @@ -43,6 +35,14 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.SizeUtil; +import org.apache.bifromq.util.TopicUtil; @Slf4j public class LocalDistService implements ILocalDistService { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionBrokerService.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionBrokerService.java similarity index 83% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionBrokerService.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionBrokerService.java index 9b79fc015..7888a1a37 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionBrokerService.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionBrokerService.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import static com.baidu.bifromq.baserpc.server.UnaryResponse.response; +import static org.apache.bifromq.baserpc.server.UnaryResponse.response; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.OnlineInboxBrokerGrpc; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubRequest; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubRequest; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteRequest; -import com.baidu.bifromq.mqtt.session.IMQTTSession; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.CheckRequest; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.mqtt.session.IMQTTSession; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.CheckRequest; import io.grpc.stub.StreamObserver; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.mqtt.inbox.rpc.proto.OnlineInboxBrokerGrpc; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubRequest; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubRequest; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteRequest; +import org.apache.bifromq.type.MatchInfo; @Slf4j final class LocalSessionBrokerService extends OnlineInboxBrokerGrpc.OnlineInboxBrokerImplBase { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionRegistry.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionRegistry.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionRegistry.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionRegistry.java index 11b22a83a..cae085f1c 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionRegistry.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionRegistry.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import com.baidu.bifromq.mqtt.session.IMQTTSession; +import org.apache.bifromq.mqtt.session.IMQTTSession; import com.google.common.util.concurrent.RateLimiter; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionServer.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionServer.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionServer.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionServer.java index b461cb3b9..ba75472e6 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionServer.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionServer.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import com.baidu.bifromq.mqtt.inbox.RPCBluePrint; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.mqtt.inbox.RPCBluePrint; @Slf4j class LocalSessionServer implements ILocalSessionServer { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionServerBuilder.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionServerBuilder.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionServerBuilder.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionServerBuilder.java index 92a2a97d3..9e9f16696 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionServerBuilder.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionServerBuilder.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; import com.google.common.util.concurrent.MoreExecutors; import java.util.HashMap; import java.util.HashSet; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionWritePipeline.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionWritePipeline.java similarity index 80% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionWritePipeline.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionWritePipeline.java index 4c02223db..e60a082c9 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalSessionWritePipeline.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalSessionWritePipeline.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.baserpc.server.ResponsePipeline; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.WriteRequest; -import com.baidu.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; -import com.baidu.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; -import com.baidu.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; +import org.apache.bifromq.baserpc.server.ResponsePipeline; import io.grpc.stub.StreamObserver; import java.time.Duration; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.WriteRequest; +import org.apache.bifromq.sysprops.props.IngressSlowDownDirectMemoryUsage; +import org.apache.bifromq.sysprops.props.IngressSlowDownHeapMemoryUsage; +import org.apache.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; @Slf4j class LocalSessionWritePipeline extends ResponsePipeline { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalTopicRouter.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalTopicRouter.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalTopicRouter.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalTopicRouter.java index c9c107fe9..340dcc532 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/service/LocalTopicRouter.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/service/LocalTopicRouter.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import static com.baidu.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; +import static org.apache.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.sysprops.props.DeliverersPerMqttServer; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.util.TopicUtil; import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.sysprops.props.DeliverersPerMqttServer; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.util.TopicUtil; public class LocalTopicRouter implements ILocalTopicRouter { private static final int TOPIC_FILTER_BUCKET_NUM = DeliverersPerMqttServer.INSTANCE.get(); diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTPersistentSession.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTPersistentSession.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTPersistentSession.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTPersistentSession.java index 26a49bed0..9f471e7d6 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTPersistentSession.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTPersistentSession.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; public interface IMQTTPersistentSession extends IMQTTSession { String NAME = "MQTTPersistentSession"; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTSession.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTSession.java similarity index 80% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTSession.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTSession.java index 4cde8ca03..2ed78e1e1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTSession.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTSession.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.mqtt.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.QoS; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.mqtt.inbox.rpc.proto.SubReply; +import org.apache.bifromq.mqtt.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.QoS; public interface IMQTTSession { String channelId(); diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTTransientSession.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTTransientSession.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTTransientSession.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTTransientSession.java index b35421747..0d4c9f31b 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/IMQTTTransientSession.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/IMQTTTransientSession.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.type.TopicMessagePack; import java.util.Set; /** diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/MQTTSessionAuthProvider.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/MQTTSessionAuthProvider.java similarity index 82% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/MQTTSessionAuthProvider.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/MQTTSessionAuthProvider.java index 1e3ffb5d6..ec5982698 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/MQTTSessionAuthProvider.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/MQTTSessionAuthProvider.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/MQTTSessionContext.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/MQTTSessionContext.java similarity index 80% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/MQTTSessionContext.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/MQTTSessionContext.java index ad9af4867..9dc677e10 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/MQTTSessionContext.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/MQTTSessionContext.java @@ -11,24 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; -import static com.baidu.bifromq.metrics.TenantMetric.MqttSessionWorkingMemoryGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttTransientSubCountGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttSessionWorkingMemoryGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttTransientSubCountGauge; -import com.baidu.bifromq.base.util.FutureTracker; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.mqtt.service.ILocalDistService; -import com.baidu.bifromq.mqtt.service.ILocalSessionRegistry; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.common.base.Ticker; import io.netty.channel.ChannelHandlerContext; import java.time.Duration; @@ -36,6 +29,13 @@ import java.util.concurrent.atomic.AtomicLong; import lombok.Builder; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.base.util.FutureTracker; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.mqtt.service.ILocalDistService; +import org.apache.bifromq.mqtt.service.ILocalSessionRegistry; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sysprops.props.ControlPlaneMaxBurstLatencyMillis; @Slf4j public final class MQTTSessionContext { diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/TenantGauge.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/TenantGauge.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/TenantGauge.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/TenantGauge.java index 6f4a025ff..cb6d8760c 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/session/TenantGauge.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/session/TenantGauge.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import io.micrometer.core.instrument.Meter; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/AuthUtil.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/AuthUtil.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/AuthUtil.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/AuthUtil.java index 18ade470e..25ef0f72a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/AuthUtil.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/AuthUtil.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authData; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestResponseInformation; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authData; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.requestResponseInformation; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.plugin.authprovider.type.ConnAction; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.PubAction; -import com.baidu.bifromq.plugin.authprovider.type.SubAction; -import com.baidu.bifromq.plugin.authprovider.type.UnsubAction; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.UserProperties; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.plugin.authprovider.type.ConnAction; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.PubAction; +import org.apache.bifromq.plugin.authprovider.type.SubAction; +import org.apache.bifromq.plugin.authprovider.type.UnsubAction; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.UserProperties; import com.google.common.base.Strings; import com.google.protobuf.ByteString; import io.netty.channel.Channel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/IMQTTMessageSizer.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/IMQTTMessageSizer.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/IMQTTMessageSizer.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/IMQTTMessageSizer.java index f9be87447..330b0af98 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/IMQTTMessageSizer.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/IMQTTMessageSizer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import static io.netty.buffer.ByteBufUtil.utf8Bytes; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTT3MessageSizer.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTT3MessageSizer.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTT3MessageSizer.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTT3MessageSizer.java index fc34885b4..c09195cf8 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTT3MessageSizer.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTT3MessageSizer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttConnectPayload; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizer.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTT5MessageSizer.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizer.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTT5MessageSizer.java index 24b8e3ef8..c78993368 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizer.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTT5MessageSizer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import static io.netty.buffer.ByteBufUtil.utf8Bytes; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTTMessageTrimmer.java b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTTMessageTrimmer.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTTMessageTrimmer.java rename to bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTTMessageTrimmer.java index 8a78260a5..e277bc2fa 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/main/java/com/baidu/bifromq/mqtt/utils/MQTTMessageTrimmer.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/main/java/org/apache/bifromq/mqtt/utils/MQTTMessageTrimmer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttConnectVariableHeader; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/MockableTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/MockableTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/MockableTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/MockableTest.java index cf627c0a0..9837b9ce1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/MockableTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/MockableTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; import java.lang.reflect.Method; import lombok.SneakyThrows; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/TestUtils.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/TestUtils.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/TestUtils.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/TestUtils.java index 89c7f6fb4..158d88984 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/TestUtils.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/TestUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt; +package org.apache.bifromq.mqtt; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/condition/ORConditionTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/condition/ORConditionTest.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/condition/ORConditionTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/condition/ORConditionTest.java index eb2ad14db..338140f6c 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/condition/ORConditionTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/condition/ORConditionTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.condition; +package org.apache.bifromq.mqtt.condition; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -22,8 +22,8 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.mqtt.handler.condition.ORCondition; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.mqtt.handler.condition.ORCondition; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/BaseSessionHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/BaseSessionHandlerTest.java similarity index 81% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/BaseSessionHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/BaseSessionHandlerTest.java index 440899c38..759ae7923 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/BaseSessionHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/BaseSessionHandlerTest.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; -import static com.baidu.bifromq.plugin.settingprovider.Setting.DebugModeEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ForceTransient; -import static com.baidu.bifromq.plugin.settingprovider.Setting.InBoundBandWidth; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerInbox; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerSub; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxUserPayloadBytes; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; -import static com.baidu.bifromq.plugin.settingprovider.Setting.OutBoundBandWidth; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainMessageMatchLimit; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; +import static org.apache.bifromq.plugin.settingprovider.Setting.DebugModeEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.ForceTransient; +import static org.apache.bifromq.plugin.settingprovider.Setting.InBoundBandWidth; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerInbox; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerSub; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxUserPayloadBytes; +import static org.apache.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; +import static org.apache.bifromq.plugin.settingprovider.Setting.OutBoundBandWidth; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainMessageMatchLimit; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -49,46 +49,20 @@ import static org.testng.Assert.assertEquals; import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.Fetched.Builder; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.mqtt.service.ILocalDistService; -import com.baidu.bifromq.mqtt.service.ILocalSessionRegistry; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.mqtt.utils.TestTicker; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Denied; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.client.ISessionRegistration; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessage; -import com.baidu.bifromq.type.TopicMessagePack; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Denied; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Timer; @@ -106,6 +80,32 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.Fetched.Builder; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.mqtt.service.ILocalDistService; +import org.apache.bifromq.mqtt.service.ILocalSessionRegistry; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.mqtt.utils.TestTicker; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.client.ISessionRegistration; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessage; +import org.apache.bifromq.type.TopicMessagePack; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ClientAddrHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ClientAddrHandlerTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ClientAddrHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ClientAddrHandlerTest.java index 2ad66fd4b..c1551e30d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ClientAddrHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ClientAddrHandlerTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.mqtt.handler.ChannelAttrs.PEER_ADDR; +import static org.apache.bifromq.mqtt.handler.ChannelAttrs.PEER_ADDR; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java similarity index 82% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java index bd0cc9d10..98de39f06 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConditionalRejectHandlerTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelError; import io.netty.channel.embedded.EmbeddedChannel; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java index 463d36b8c..22b62cec1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConditionalSlowDownHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.verify; @@ -20,12 +20,12 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.condition.Condition; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.condition.Condition; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.sysprops.props.MaxSlowDownTimeoutSeconds; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.embedded.EmbeddedChannel; import java.time.Duration; import java.util.concurrent.TimeUnit; @@ -34,12 +34,12 @@ import org.testng.annotations.Test; public class ConditionalSlowDownHandlerTest extends MockableTest { + @Mock + Supplier nanoProvider; @Mock private Condition slowDownCondition; @Mock private IEventCollector eventCollector; - @Mock - Supplier nanoProvider; private ClientInfo clientInfo = ClientInfo.newBuilder().build(); @Test diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java index 88203dc68..324470051 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ConnectionRateLimitHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.any; @@ -21,8 +21,8 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; import com.google.common.util.concurrent.RateLimiter; import io.netty.channel.ChannelPipeline; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/InboundResourceConditionTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/InboundResourceConditionTest.java similarity index 82% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/InboundResourceConditionTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/InboundResourceConditionTest.java index 9531ea829..c8a37419f 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/InboundResourceConditionTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/InboundResourceConditionTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.condition.InboundResourceCondition; -import com.baidu.bifromq.type.ClientInfo; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.condition.InboundResourceCondition; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTConnectHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTConnectHandlerTest.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTConnectHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTConnectHandlerTest.java index a0f56b780..8d317e459 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTConnectHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTConnectHandlerTest.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnectPerSecond; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnections; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalSessionMemoryBytes; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnectPerSecond; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnections; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalSessionMemoryBytes; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.record.GoAway; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.type.ClientInfo; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.record.GoAway; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java index f51512ff5..46e631cdd 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTMessageDebounceHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -19,7 +19,7 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.MockableTest; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; import io.netty.handler.codec.mqtt.MqttFixedHeader; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTPacketFilterTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTPacketFilterTest.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTPacketFilterTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTPacketFilterTest.java index 44b0c591b..d894e123e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTPacketFilterTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTPacketFilterTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_3_1_1_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_5_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.ArgumentMatchers.anyLong; @@ -28,14 +28,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.OversizePacketDropped; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.OversizePacketDropped; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Timer; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java index 1d3b2edb7..a0da38bb5 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/MQTTPreludeHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -22,15 +22,15 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.v3.MQTT3ConnectHandler; -import com.baidu.bifromq.mqtt.handler.v5.MQTT5ConnectHandler; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.v3.MQTT3ConnectHandler; +import org.apache.bifromq.mqtt.handler.v5.MQTT5ConnectHandler; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java index cf651e5c1..72823cae5 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ProxyProtocolDetectorTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java index 5b09f9a2a..21492e4dd 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ProxyProtocolHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler; +package org.apache.bifromq.mqtt.handler; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/BaseMQTTTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/BaseMQTTTest.java similarity index 80% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/BaseMQTTTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/BaseMQTTTest.java index 1a0bd78be..8c25e7c59 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/BaseMQTTTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/BaseMQTTTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; - -import static com.baidu.bifromq.inbox.rpc.proto.AttachReply.Code.OK; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; -import static com.baidu.bifromq.plugin.settingprovider.Setting.DebugModeEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ForceTransient; -import static com.baidu.bifromq.plugin.settingprovider.Setting.InBoundBandWidth; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerSub; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MaxUserPayloadBytes; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; -import static com.baidu.bifromq.plugin.settingprovider.Setting.OutBoundBandWidth; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainMessageMatchLimit; +package org.apache.bifromq.mqtt.handler.v3; + +import static org.apache.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; +import static org.apache.bifromq.plugin.settingprovider.Setting.DebugModeEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.ForceTransient; +import static org.apache.bifromq.plugin.settingprovider.Setting.InBoundBandWidth; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicFiltersPerSub; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevelLength; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxTopicLevels; +import static org.apache.bifromq.plugin.settingprovider.Setting.MaxUserPayloadBytes; +import static org.apache.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; +import static org.apache.bifromq.plugin.settingprovider.Setting.OutBoundBandWidth; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainMessageMatchLimit; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED; +import static org.apache.bifromq.inbox.rpc.proto.AttachReply.Code.OK; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -42,56 +42,25 @@ import static org.testng.Assert.assertEquals; import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.inbox.rpc.proto.SubReply; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.ConditionalRejectHandler; -import com.baidu.bifromq.mqtt.handler.MQTTMessageDebounceHandler; -import com.baidu.bifromq.mqtt.handler.MQTTPreludeHandler; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.mqtt.service.ILocalDistService; -import com.baidu.bifromq.mqtt.service.ILocalSessionRegistry; -import com.baidu.bifromq.mqtt.service.ILocalTopicRouter; -import com.baidu.bifromq.mqtt.service.LocalDistService; -import com.baidu.bifromq.mqtt.service.LocalSessionRegistry; -import com.baidu.bifromq.mqtt.service.LocalTopicRouter; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.mqtt.utils.TestTicker; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Denied; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.client.ISessionRegistration; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.util.TopicUtil; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Denied; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Tags; import io.netty.channel.ChannelInitializer; @@ -110,6 +79,37 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.inbox.rpc.proto.SubReply; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.ConditionalRejectHandler; +import org.apache.bifromq.mqtt.handler.MQTTMessageDebounceHandler; +import org.apache.bifromq.mqtt.handler.MQTTPreludeHandler; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.mqtt.service.ILocalDistService; +import org.apache.bifromq.mqtt.service.ILocalSessionRegistry; +import org.apache.bifromq.mqtt.service.ILocalTopicRouter; +import org.apache.bifromq.mqtt.service.LocalDistService; +import org.apache.bifromq.mqtt.service.LocalSessionRegistry; +import org.apache.bifromq.mqtt.service.LocalTopicRouter; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.mqtt.utils.TestTicker; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.client.ISessionRegistration; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.util.TopicUtil; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java index 10798a553..74375eae6 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3ConnectHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE; import static org.mockito.ArgumentMatchers.any; @@ -24,29 +24,29 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.clientbalancer.Redirection; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.type.ClientInfo; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.clientbalancer.Redirection; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java index 05d742989..7f6810bed 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3PersistentSessionHandlerTest.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.inbox.rpc.proto.UnsubReply.Code.ERROR; -import static com.baidu.bifromq.inbox.rpc.proto.UnsubReply.Code.OK; -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; -import static com.baidu.bifromq.type.QoS.EXACTLY_ONCE; +import static org.apache.bifromq.inbox.rpc.proto.UnsubReply.Code.ERROR; +import static org.apache.bifromq.inbox.rpc.proto.UnsubReply.Code.OK; +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; +import static org.apache.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; +import static org.apache.bifromq.plugin.eventcollector.EventType.SUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.type.QoS.EXACTLY_ONCE; import static io.netty.handler.codec.mqtt.MqttMessageType.PUBREL; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -42,27 +42,27 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.Fetched.Result; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.handler.BaseSessionHandlerTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Denied; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.Fetched.Result; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.handler.BaseSessionHandlerTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Denied; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessage; import com.google.protobuf.ByteString; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java similarity index 90% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java index 4c41bcf73..75db2cb85 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTT3TransientSessionHandlerTest.java @@ -11,54 +11,54 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; - - -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; -import static com.baidu.bifromq.plugin.eventcollector.EventType.DISCARD; -import static com.baidu.bifromq.plugin.eventcollector.EventType.EXCEED_RECEIVING_LIMIT; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_RECED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_REC_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SERVER_BUSY; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.TOO_LARGE_UNSUBSCRIPTION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACTION_DISALLOW; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ReceivingMaximum; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +package org.apache.bifromq.mqtt.handler.v3; + + +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; +import static org.apache.bifromq.plugin.eventcollector.EventType.DISCARD; +import static org.apache.bifromq.plugin.eventcollector.EventType.EXCEED_RECEIVING_LIMIT; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_RECED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_REC_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; +import static org.apache.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; +import static org.apache.bifromq.plugin.eventcollector.EventType.SERVER_BUSY; +import static org.apache.bifromq.plugin.eventcollector.EventType.SUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.TOO_LARGE_UNSUBSCRIPTION; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACTION_DISALLOW; +import static org.apache.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; +import static org.apache.bifromq.plugin.settingprovider.Setting.ReceivingMaximum; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ADDRESS_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static io.netty.handler.codec.mqtt.MqttMessageType.PUBREL; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -76,22 +76,22 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.mqtt.handler.BaseSessionHandlerTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.mqtt.handler.BaseSessionHandlerTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; import com.google.common.collect.Lists; import com.google.protobuf.ByteString; import io.netty.channel.Channel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java index c06d3a1f0..0f5035018 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTBadConnectTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_IDENTIFIER_REJECTED; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.eventcollector.EventType; import io.netty.handler.codec.mqtt.MqttConnAckMessage; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java index a523d0886..b4f7542f5 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTC2SPubTest.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.DISCARD; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; -import static com.baidu.bifromq.plugin.eventcollector.EventType.NO_PUB_PERMISSION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACK_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACTION_DISALLOW; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_RECED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_REC_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SERVER_BUSY; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.DISCARD; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.NO_PUB_PERMISSION; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACK_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACTION_DISALLOW; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_RECED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_REC_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.SERVER_BUSY; +import static org.apache.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -43,9 +43,9 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.type.ClientInfo; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader; import io.netty.handler.codec.mqtt.MqttMessageType; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTConnectTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTConnectTest.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTConnectTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTConnectTest.java index b356afee3..3ae28c14e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTConnectTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTConnectTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PING_REQ; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.PING_REQ; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_PROTOCOL_VER_KEY; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_BAD_USER_NAME_OR_PASSWORD; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_NOT_AUTHORIZED; @@ -30,13 +30,13 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientconnected.ClientConnected; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientconnected.ClientConnected; import io.netty.handler.codec.mqtt.MqttConnAckMessage; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java index 073974a97..9471b8ef3 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTDisconnectTest.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.plugin.eventcollector.EventType.BAD_PACKET; -import static com.baidu.bifromq.plugin.eventcollector.EventType.BY_CLIENT; -import static com.baidu.bifromq.plugin.eventcollector.EventType.BY_SERVER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.IDLE; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.BAD_PACKET; +import static org.apache.bifromq.plugin.eventcollector.EventType.BY_CLIENT; +import static org.apache.bifromq.plugin.eventcollector.EventType.BY_SERVER; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.IDLE; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.settingprovider.Setting; import io.netty.handler.codec.mqtt.MqttConnAckMessage; import io.netty.handler.codec.mqtt.MqttConnectMessage; import io.netty.handler.codec.mqtt.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTKickTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTKickTest.java similarity index 74% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTKickTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTKickTest.java index 6fed8571a..dfef4177e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTKickTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTKickTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.KICKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.KICKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; import io.netty.handler.codec.mqtt.MqttConnAckMessage; import io.netty.handler.codec.mqtt.MqttConnectMessage; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java index f94b0b260..67de95d3e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTMessageDebounceHandlerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.mqtt.handler.MQTTMessageDebounceHandler; +import org.apache.bifromq.mqtt.handler.MQTTMessageDebounceHandler; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java similarity index 85% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java index 979cd6e5f..046800c69 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTPersistentS2CPubTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; -import static com.baidu.bifromq.type.QoS.EXACTLY_ONCE; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.type.QoS.EXACTLY_ONCE; import static io.netty.handler.codec.mqtt.MqttMessageType.PUBREL; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -37,20 +37,20 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.Fetched.Builder; -import com.baidu.bifromq.inbox.storage.proto.Fetched.Result; -import com.baidu.bifromq.inbox.storage.proto.InboxMessage; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.Fetched.Builder; +import org.apache.bifromq.inbox.storage.proto.Fetched.Result; +import org.apache.bifromq.inbox.storage.proto.InboxMessage; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessage; import com.google.protobuf.ByteString; import io.netty.handler.codec.mqtt.MqttMessage; import io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java similarity index 73% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java index dabf2ced6..be91ba87f 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTRetainPubTest.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_RECED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_RECED; +import static org.apache.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; import io.netty.handler.codec.mqtt.MqttPublishMessage; import lombok.extern.slf4j.Slf4j; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTSubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTSubTest.java similarity index 92% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTSubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTSubTest.java index 3ad5e2895..7387a7b2c 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTSubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTSubTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; - -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SUB_ACTION_DISALLOW; -import static com.baidu.bifromq.plugin.eventcollector.EventType.TOO_LARGE_SUBSCRIPTION; +package org.apache.bifromq.mqtt.handler.v3; + +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.SUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.SUB_ACTION_DISALLOW; +import static org.apache.bifromq.plugin.eventcollector.EventType.TOO_LARGE_SUBSCRIPTION; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; @@ -30,8 +30,8 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.type.QoS; import io.netty.handler.codec.mqtt.MqttSubAckMessage; import io.netty.handler.codec.mqtt.MqttSubscribeMessage; import java.util.Arrays; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java index 0c46090c9..357ed6fdd 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTTransientS2CPubTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTUnSubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTUnSubTest.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTUnSubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTUnSubTest.java index 4c8d45101..5416c4823 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTUnSubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTUnSubTest.java @@ -11,24 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; +package org.apache.bifromq.mqtt.handler.v3; -import static com.baidu.bifromq.inbox.rpc.proto.UnsubReply.Code.ERROR; -import static com.baidu.bifromq.inbox.rpc.proto.UnsubReply.Code.OK; -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.TOO_LARGE_UNSUBSCRIPTION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACTION_DISALLOW; +import static org.apache.bifromq.inbox.rpc.proto.UnsubReply.Code.ERROR; +import static org.apache.bifromq.inbox.rpc.proto.UnsubReply.Code.OK; +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.TOO_LARGE_UNSUBSCRIPTION; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACTION_DISALLOW; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; import io.netty.handler.codec.mqtt.MqttUnsubAckMessage; import io.netty.handler.codec.mqtt.MqttUnsubscribeMessage; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java similarity index 82% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java index fe27e26fd..36b92a9b9 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v3/MQTTWillMessageTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v3; - - -import static com.baidu.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.IDLE; -import static com.baidu.bifromq.plugin.eventcollector.EventType.KICKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACTION_DISALLOW; -import static com.baidu.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.WILL_DISTED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.WILL_DIST_ERROR; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; +package org.apache.bifromq.mqtt.handler.v3; + + +import static org.apache.bifromq.plugin.eventcollector.EventType.CLIENT_CONNECTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.IDLE; +import static org.apache.bifromq.plugin.eventcollector.EventType.KICKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACTION_DISALLOW; +import static org.apache.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; +import static org.apache.bifromq.plugin.eventcollector.EventType.WILL_DISTED; +import static org.apache.bifromq.plugin.eventcollector.EventType.WILL_DIST_ERROR; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; @@ -36,15 +36,15 @@ import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.eventcollector.EventType; import io.netty.handler.codec.mqtt.MqttConnAckMessage; import io.netty.handler.codec.mqtt.MqttConnectMessage; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/EnhancedAuthTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/EnhancedAuthTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/EnhancedAuthTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/EnhancedAuthTest.java index 98cc7a281..72e5f57bf 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/EnhancedAuthTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/EnhancedAuthTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import static com.baidu.bifromq.mqtt.handler.condition.ORCondition.or; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; -import static com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; +import static org.apache.bifromq.mqtt.handler.condition.ORCondition.or; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.authMethod; +import static org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils.toUserProperties; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.when; @@ -23,37 +23,20 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.ConditionalRejectHandler; -import com.baidu.bifromq.mqtt.handler.ConnectionRateLimitHandler; -import com.baidu.bifromq.mqtt.handler.MQTTConnectHandler; -import com.baidu.bifromq.mqtt.handler.MQTTMessageDebounceHandler; -import com.baidu.bifromq.mqtt.handler.condition.HeapMemPressureCondition; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; -import com.baidu.bifromq.mqtt.service.ILocalSessionRegistry; -import com.baidu.bifromq.mqtt.service.LocalSessionRegistry; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Continue; -import com.baidu.bifromq.plugin.authprovider.type.Failed; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.StringPair; -import com.baidu.bifromq.type.UserProperties; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Continue; +import org.apache.bifromq.plugin.authprovider.type.Failed; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.common.util.concurrent.RateLimiter; import com.google.protobuf.ByteString; import io.netty.channel.Channel; @@ -75,6 +58,23 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.ConditionalRejectHandler; +import org.apache.bifromq.mqtt.handler.ConnectionRateLimitHandler; +import org.apache.bifromq.mqtt.handler.MQTTConnectHandler; +import org.apache.bifromq.mqtt.handler.MQTTMessageDebounceHandler; +import org.apache.bifromq.mqtt.handler.condition.HeapMemPressureCondition; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; +import org.apache.bifromq.mqtt.service.ILocalSessionRegistry; +import org.apache.bifromq.mqtt.service.LocalSessionRegistry; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.StringPair; +import org.apache.bifromq.type.UserProperties; import org.mockito.Mock; import org.mockito.Mockito; import org.testng.annotations.BeforeMethod; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java index 8b860736d..65064a009 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5ConnectHandlerTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_CLIENT_IDENTIFIER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_USERNAME; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_WILL_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.OUT_OF_TENANT_RESOURCE; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.RESOURCE_THROTTLED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_CLIENT_IDENTIFIER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_USERNAME; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_WILL_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.OUT_OF_TENANT_RESOURCE; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.RESOURCE_THROTTLED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_CLIENT_IDENTIFIER_NOT_VALID; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_MALFORMED_PACKET; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_PACKET_TOO_LARGE; @@ -39,33 +39,33 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.rpc.proto.AttachReply; -import com.baidu.bifromq.inbox.rpc.proto.DetachReply; -import com.baidu.bifromq.inbox.rpc.proto.ExistReply; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.clientbalancer.Redirection; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.type.ClientInfo; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.rpc.proto.AttachReply; +import org.apache.bifromq.inbox.rpc.proto.DetachReply; +import org.apache.bifromq.inbox.rpc.proto.ExistReply; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.clientbalancer.Redirection; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Redirect; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ResourceThrottled; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import com.google.protobuf.ByteString; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java index 3973e8cf0..286c8e7f1 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5PersistentSessionHandlerTest.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; - - -import static com.baidu.bifromq.inbox.rpc.proto.UnsubReply.Code.ERROR; -import static com.baidu.bifromq.inbox.rpc.proto.UnsubReply.Code.OK; -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; -import static com.baidu.bifromq.type.QoS.AT_LEAST_ONCE; -import static com.baidu.bifromq.type.QoS.EXACTLY_ONCE; +package org.apache.bifromq.mqtt.handler.v5; + + +import static org.apache.bifromq.inbox.rpc.proto.UnsubReply.Code.ERROR; +import static org.apache.bifromq.inbox.rpc.proto.UnsubReply.Code.OK; +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; +import static org.apache.bifromq.plugin.eventcollector.EventType.INBOX_TRANSIENT_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.SUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; +import static org.apache.bifromq.type.QoS.AT_LEAST_ONCE; +import static org.apache.bifromq.type.QoS.EXACTLY_ONCE; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.times; @@ -40,20 +40,20 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.inbox.rpc.proto.CommitReply; -import com.baidu.bifromq.inbox.rpc.proto.CommitRequest; -import com.baidu.bifromq.inbox.rpc.proto.UnsubReply; -import com.baidu.bifromq.inbox.storage.proto.Fetched; -import com.baidu.bifromq.inbox.storage.proto.Fetched.Result; -import com.baidu.bifromq.inbox.storage.proto.InboxVersion; -import com.baidu.bifromq.mqtt.handler.BaseSessionHandlerTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.inbox.rpc.proto.CommitReply; +import org.apache.bifromq.inbox.rpc.proto.CommitRequest; +import org.apache.bifromq.inbox.rpc.proto.UnsubReply; +import org.apache.bifromq.inbox.storage.proto.Fetched; +import org.apache.bifromq.inbox.storage.proto.Fetched.Result; +import org.apache.bifromq.inbox.storage.proto.InboxVersion; +import org.apache.bifromq.mqtt.handler.BaseSessionHandlerTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS1Confirmed; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling.QoS2Confirmed; +import org.apache.bifromq.type.QoS; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java index 031549cb5..db42cbbee 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/MQTT5TransientSessionHandlerTest.java @@ -11,48 +11,48 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; - - -import static com.baidu.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; -import static com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.NoSubscriptionExisted; -import static com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.NotAuthorized; -import static com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.Success; -import static com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.UnspecifiedError; -import static com.baidu.bifromq.plugin.eventcollector.EventType.EXCEED_PUB_RATE; -import static com.baidu.bifromq.plugin.eventcollector.EventType.EXCEED_RECEIVING_LIMIT; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_RECED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.PUB_REC_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_DIST_ERROR; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SERVER_BUSY; -import static com.baidu.bifromq.plugin.eventcollector.EventType.SUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; -import static com.baidu.bifromq.plugin.eventcollector.EventType.UNSUB_ACTION_DISALLOW; -import static com.baidu.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ReceivingMaximum; -import static com.baidu.bifromq.plugin.settingprovider.Setting.RetainEnabled; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; -import static com.baidu.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; +package org.apache.bifromq.mqtt.handler.v5; + + +import static org.apache.bifromq.mqtt.handler.MQTTSessionIdUtil.userSessionId; +import static org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.NoSubscriptionExisted; +import static org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.NotAuthorized; +import static org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.Success; +import static org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode.UnspecifiedError; +import static org.apache.bifromq.plugin.eventcollector.EventType.EXCEED_PUB_RATE; +import static org.apache.bifromq.plugin.eventcollector.EventType.EXCEED_RECEIVING_LIMIT; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.INVALID_TOPIC_FILTER; +import static org.apache.bifromq.plugin.eventcollector.EventType.MALFORMED_TOPIC; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED; +import static org.apache.bifromq.plugin.eventcollector.EventType.MSG_RETAINED_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.PROTOCOL_VIOLATION; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_RECED; +import static org.apache.bifromq.plugin.eventcollector.EventType.PUB_REC_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS0_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS1_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_CONFIRMED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_DIST_ERROR; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_PUSHED; +import static org.apache.bifromq.plugin.eventcollector.EventType.QOS2_RECEIVED; +import static org.apache.bifromq.plugin.eventcollector.EventType.RETAIN_MSG_CLEARED; +import static org.apache.bifromq.plugin.eventcollector.EventType.SERVER_BUSY; +import static org.apache.bifromq.plugin.eventcollector.EventType.SUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACKED; +import static org.apache.bifromq.plugin.eventcollector.EventType.UNSUB_ACTION_DISALLOW; +import static org.apache.bifromq.plugin.settingprovider.Setting.MsgPubPerSec; +import static org.apache.bifromq.plugin.settingprovider.Setting.ReceivingMaximum; +import static org.apache.bifromq.plugin.settingprovider.Setting.RetainEnabled; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.CLEARED; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.ERROR; +import static org.apache.bifromq.retain.rpc.proto.RetainReply.Result.RETAINED; import static io.netty.handler.codec.mqtt.MqttMessageType.DISCONNECT; import static io.netty.handler.codec.mqtt.MqttMessageType.PUBACK; import static io.netty.handler.codec.mqtt.MqttMessageType.PUBREC; @@ -75,26 +75,26 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.dist.client.PubResult; -import com.baidu.bifromq.mqtt.handler.BaseSessionHandlerTest; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.TenantSettings; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.mqtt.utils.MQTTMessageUtils; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedReceivingLimit; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MQTTClientInfoConstants; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.dist.client.PubResult; +import org.apache.bifromq.mqtt.handler.BaseSessionHandlerTest; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.TenantSettings; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.mqtt.utils.MQTTMessageUtils; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ExceedReceivingLimit; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MQTTClientInfoConstants; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; +import org.apache.bifromq.type.TopicMessagePack; import com.google.protobuf.ByteString; import io.netty.channel.Channel; import io.netty.channel.ChannelDuplexHandler; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java index 943dac9ab..031bb2543 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/ReceiverTopicAliasManagerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java index 049526a4a..68af94fd0 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/v5/SenderTopicAliasManagerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.v5; +package org.apache.bifromq.mqtt.handler.v5; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java index 783ddc93e..7d28dfebf 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/ByteBufToWebSocketFrameEncoderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java index 016bd128b..ee86080c7 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/MqttOverWSHandlerTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.mqtt.handler.ChannelAttrs; -import com.baidu.bifromq.mqtt.handler.ConditionalRejectHandler; -import com.baidu.bifromq.mqtt.handler.MQTTMessageDebounceHandler; -import com.baidu.bifromq.mqtt.handler.MQTTPreludeHandler; -import com.baidu.bifromq.mqtt.session.MQTTSessionContext; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.mqtt.handler.ChannelAttrs; +import org.apache.bifromq.mqtt.handler.ConditionalRejectHandler; +import org.apache.bifromq.mqtt.handler.MQTTMessageDebounceHandler; +import org.apache.bifromq.mqtt.handler.MQTTPreludeHandler; +import org.apache.bifromq.mqtt.session.MQTTSessionContext; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java index 79db7971c..5db23b3b0 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/WebSocketFrameToByteBufDecoderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java index bbe95aeb0..edc7e132e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/handler/ws/WebSocketOnlyHandlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.handler.ws; +package org.apache.bifromq.mqtt.handler.ws; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/MQTTTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/MQTTTest.java similarity index 85% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/MQTTTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/MQTTTest.java index a2a7177df..05cc9117e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/MQTTTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/MQTTTest.java @@ -11,51 +11,29 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration; +package org.apache.bifromq.mqtt.integration; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.lenient; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.server.IDistServer; -import com.baidu.bifromq.dist.worker.IDistWorker; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.server.IInboxServer; -import com.baidu.bifromq.inbox.store.IInboxStore; -import com.baidu.bifromq.mqtt.IMQTTBroker; -import com.baidu.bifromq.mqtt.inbox.IMqttBrokerClient; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.clientbalancer.IClientBalancer; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.plugin.subbroker.SubBrokerManager; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.server.IRetainServer; -import com.baidu.bifromq.retain.store.IRetainStore; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.server.ISessionDictServer; -import com.baidu.bifromq.type.ClientInfo; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.clientbalancer.IClientBalancer; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.plugin.subbroker.SubBrokerManager; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.server.IRetainServer; +import org.apache.bifromq.retain.store.IRetainStore; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import com.google.common.collect.Sets; import io.reactivex.rxjava3.core.Observable; import java.lang.reflect.Method; @@ -65,6 +43,28 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.server.IDistServer; +import org.apache.bifromq.dist.worker.IDistWorker; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.server.IInboxServer; +import org.apache.bifromq.inbox.store.IInboxStore; +import org.apache.bifromq.mqtt.IMQTTBroker; +import org.apache.bifromq.mqtt.inbox.IMqttBrokerClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.server.ISessionDictServer; +import org.apache.bifromq.type.ClientInfo; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java similarity index 85% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java index 85cbb1981..1966cf97a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTBadConnectMessageTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.eclipse.paho.client.mqttv3.MqttException.REASON_CODE_INVALID_CLIENT_ID; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.mqtt.TestUtils; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.IdentifierRejected; +import org.apache.bifromq.mqtt.TestUtils; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.IdentifierRejected; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTConnectTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTConnectTest.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTConnectTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTConnectTest.java index bf59fee0b..e8c5819fb 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTConnectTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTConnectTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.eclipse.paho.client.mqttv3.MqttException.REASON_CODE_BROKER_UNAVAILABLE; import static org.eclipse.paho.client.mqttv3.MqttException.REASON_CODE_FAILED_AUTHENTICATION; @@ -26,22 +26,22 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.TestUtils; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Denied; -import com.baidu.bifromq.plugin.authprovider.type.Error; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.AuthError; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.NotAuthorizedClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnauthenticatedClient; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; +import org.apache.bifromq.mqtt.TestUtils; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Denied; +import org.apache.bifromq.plugin.authprovider.type.Error; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.AuthError; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.NotAuthorizedClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.UnauthenticatedClient; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.InvalidTopic; import java.io.EOFException; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java similarity index 85% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java index 9985ebbb7..08913b96d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTDisconnectTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -20,16 +20,16 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ByClient; import java.util.concurrent.CompletableFuture; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.mockito.ArgumentCaptor; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTFanInTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTFanInTest.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTFanInTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTFanInTest.java index 5250d9e66..a9e1c9d06 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTFanInTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTFanInTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -19,14 +19,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import java.lang.reflect.Method; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTFanOutTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTFanOutTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTFanOutTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTFanOutTest.java index 7cd779c5b..0c33b71d9 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTFanOutTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTFanOutTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -19,14 +19,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import java.lang.reflect.Method; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTKickTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTKickTest.java similarity index 87% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTKickTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTKickTest.java index 82f16bf6e..c04b212ca 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTKickTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTKickTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -20,14 +20,14 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Kicked; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.Kicked; import java.util.concurrent.CompletableFuture; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTLastWillTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTLastWillTest.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTLastWillTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTLastWillTest.java index 0f47ffe18..7091138c8 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTLastWillTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTLastWillTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -21,15 +21,15 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.eventcollector.Event; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTPubSubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTPubSubTest.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTPubSubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTPubSubTest.java index 10bb1c251..f3b47668a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTPubSubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTPubSubTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -19,15 +19,15 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestAsyncClient; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestAsyncClient; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTRetainTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTRetainTest.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTRetainTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTRetainTest.java index c8de7d257..b24ca8148 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/MQTTRetainTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/MQTTRetainTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3; +package org.apache.bifromq.mqtt.integration.v3; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -22,16 +22,16 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v3.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v3.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v3.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.settingprovider.Setting; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.observers.TestObserver; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttMsg.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttMsg.java similarity index 95% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttMsg.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttMsg.java index e1edb8d51..e8d8026a7 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttMsg.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttMsg.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3.client; +package org.apache.bifromq.mqtt.integration.v3.client; import com.google.protobuf.ByteString; import org.eclipse.paho.client.mqttv3.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttResponse.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttResponse.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttResponse.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttResponse.java index cd4a151c2..c152eb98e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttResponse.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttResponse.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3.client; +package org.apache.bifromq.mqtt.integration.v3.client; public class MqttResponse { public final byte type; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java index 67ef09f30..3f00e6ab0 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttTestAsyncClient.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3.client; +package org.apache.bifromq.mqtt.integration.v3.client; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttTestClient.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttTestClient.java similarity index 98% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttTestClient.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttTestClient.java index 6635305ff..b72446f0e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v3/client/MqttTestClient.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v3/client/MqttTestClient.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v3.client; +package org.apache.bifromq.mqtt.integration.v3.client; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/LWTTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/LWTTest.java similarity index 88% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/LWTTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/LWTTest.java index 34c4c4b9d..a7455d734 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/LWTTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/LWTTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5; +package org.apache.bifromq.mqtt.integration.v5; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -20,24 +20,24 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertSame; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v5.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v5.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.authprovider.type.Success; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.observers.TestObserver; import java.lang.reflect.Method; import java.time.Duration; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v5.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v5.client.MqttTestClient; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; import org.eclipse.paho.mqttv5.client.MqttConnectionOptions; import org.eclipse.paho.mqttv5.common.MqttMessage; import org.eclipse.paho.mqttv5.common.packet.MqttProperties; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/MQTTConnectTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/MQTTConnectTest.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/MQTTConnectTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/MQTTConnectTest.java index 2642b2535..c312222a4 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/MQTTConnectTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/MQTTConnectTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5; +package org.apache.bifromq.mqtt.integration.v5; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -19,14 +19,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v5.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v5.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.plugin.settingprovider.Setting; import com.google.common.base.Strings; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/PubFailTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/PubFailTest.java similarity index 84% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/PubFailTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/PubFailTest.java index b390c44d1..a54cffc5a 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/PubFailTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/PubFailTest.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5; +package org.apache.bifromq.mqtt.integration.v5; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v5.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v5.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.authprovider.type.Success; import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; import org.eclipse.paho.mqttv5.client.MqttConnectionOptions; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/PubSubTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/PubSubTest.java similarity index 91% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/PubSubTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/PubSubTest.java index 8632fe6b2..e229c9f00 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/PubSubTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/PubSubTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5; +package org.apache.bifromq.mqtt.integration.v5; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; @@ -19,14 +19,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.mqtt.integration.MQTTTest; -import com.baidu.bifromq.mqtt.integration.v5.client.MqttMsg; -import com.baidu.bifromq.mqtt.integration.v5.client.MqttTestClient; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.mqtt.integration.MQTTTest; +import org.apache.bifromq.mqtt.integration.v5.client.MqttMsg; +import org.apache.bifromq.mqtt.integration.v5.client.MqttTestClient; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.Success; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.lang.reflect.Method; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttMsg.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttMsg.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttMsg.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttMsg.java index 6eca19a18..13a2aa243 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttMsg.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttMsg.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5.client; +package org.apache.bifromq.mqtt.integration.v5.client; import com.google.protobuf.ByteString; import org.eclipse.paho.mqttv5.common.MqttMessage; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttResponse.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttResponse.java similarity index 93% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttResponse.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttResponse.java index 3a5096076..549cbe2e6 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttResponse.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttResponse.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5.client; +package org.apache.bifromq.mqtt.integration.v5.client; public class MqttResponse { public final byte type; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java index 6f7bccac6..70166950e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttTestAsyncClient.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5.client; +package org.apache.bifromq.mqtt.integration.v5.client; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttTestClient.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttTestClient.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttTestClient.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttTestClient.java index acf6b1fea..5171f35f2 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/integration/v5/client/MqttTestClient.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/integration/v5/client/MqttTestClient.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.integration.v5.client; +package org.apache.bifromq.mqtt.integration.v5.client; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalDistServiceTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalDistServiceTest.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalDistServiceTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalDistServiceTest.java index c15b81415..2a5c71cbd 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalDistServiceTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalDistServiceTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; -import static com.baidu.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientFanOutBytesPerSeconds; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalTransientFanOutBytesPerSeconds; import static java.util.Collections.emptySet; import static java.util.Collections.singleton; +import static org.apache.bifromq.mqtt.inbox.util.DelivererKeyUtil.toDelivererKey; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -31,21 +31,16 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.session.IMQTTTransientSession; -import com.baidu.bifromq.plugin.subbroker.CheckReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryPack; -import com.baidu.bifromq.plugin.subbroker.DeliveryPackage; -import com.baidu.bifromq.plugin.subbroker.DeliveryReply; -import com.baidu.bifromq.plugin.subbroker.DeliveryRequest; -import com.baidu.bifromq.plugin.subbroker.DeliveryResult; -import com.baidu.bifromq.plugin.subbroker.DeliveryResults; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; -import com.baidu.bifromq.util.TopicUtil; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.session.IMQTTTransientSession; +import org.apache.bifromq.plugin.subbroker.CheckReply; +import org.apache.bifromq.plugin.subbroker.DeliveryPack; +import org.apache.bifromq.plugin.subbroker.DeliveryPackage; +import org.apache.bifromq.plugin.subbroker.DeliveryReply; +import org.apache.bifromq.plugin.subbroker.DeliveryRequest; +import org.apache.bifromq.plugin.subbroker.DeliveryResult; +import org.apache.bifromq.plugin.subbroker.DeliveryResults; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; @@ -55,6 +50,11 @@ import java.util.TreeMap; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; +import org.apache.bifromq.util.TopicUtil; import org.mockito.Mock; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalSessionRegistryTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalSessionRegistryTest.java similarity index 94% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalSessionRegistryTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalSessionRegistryTest.java index 008504455..9e628e60d 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalSessionRegistryTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalSessionRegistryTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.session.IMQTTSession; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.session.IMQTTSession; import java.util.concurrent.CompletableFuture; import org.mockito.Mock; import org.testng.annotations.Test; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalTopicRouterTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalTopicRouterTest.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalTopicRouterTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalTopicRouterTest.java index 9ce041a61..5889f270b 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/service/LocalTopicRouterTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/service/LocalTopicRouterTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.service; +package org.apache.bifromq.mqtt.service; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -25,13 +25,13 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.client.MatchResult; -import com.baidu.bifromq.dist.client.UnmatchResult; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.sysprops.props.DeliverersPerMqttServer; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.client.MatchResult; +import org.apache.bifromq.dist.client.UnmatchResult; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.sysprops.props.DeliverersPerMqttServer; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.util.TopicUtil; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java similarity index 90% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java index dfd66a895..2d0150e49 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/session/MQTTSessionAuthProviderTest.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.PubAction; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.PubAction; +import org.apache.bifromq.type.ClientInfo; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.DefaultEventLoop; import io.netty.util.concurrent.EventExecutor; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/session/TenantGaugeTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/session/TenantGaugeTest.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/session/TenantGaugeTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/session/TenantGaugeTest.java index c498bd1d9..9fc6bd666 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/session/TenantGaugeTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/session/TenantGaugeTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.session; +package org.apache.bifromq.mqtt.session; -import static com.baidu.bifromq.metrics.TenantMetric.MqttSessionWorkingMemoryGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttSessionWorkingMemoryGauge; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT3MessageSizerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTT3MessageSizerTest.java similarity index 97% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT3MessageSizerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTT3MessageSizerTest.java index dc21a5d0e..6b34e7c62 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT3MessageSizerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTT3MessageSizerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.v3.MQTT3MessageBuilders; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.v3.MQTT3MessageBuilders; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizerTest.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTT5MessageSizerTest.java similarity index 89% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizerTest.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTT5MessageSizerTest.java index 4c534d8a2..f90099378 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTT5MessageSizerTest.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTT5MessageSizerTest.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import static io.netty.handler.codec.mqtt.MqttSubscriptionOption.RetainedHandlingPolicy.SEND_AT_SUBSCRIBE; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.inbox.storage.proto.TopicFilterOption; -import com.baidu.bifromq.mqtt.MockableTest; -import com.baidu.bifromq.mqtt.handler.MQTTSessionHandler; -import com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageBuilders; -import com.baidu.bifromq.mqtt.handler.v5.MQTT5MessageUtils; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubCompReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRelReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.StringPair; -import com.baidu.bifromq.type.UserProperties; +import org.apache.bifromq.inbox.storage.proto.TopicFilterOption; +import org.apache.bifromq.mqtt.MockableTest; +import org.apache.bifromq.mqtt.handler.MQTTSessionHandler; +import org.apache.bifromq.mqtt.handler.v5.MQTT5MessageBuilders; +import org.apache.bifromq.mqtt.handler.v5.MQTT5MessageUtils; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5AuthReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5DisconnectReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubCompReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRelReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5SubAckReasonCode; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5UnsubAckReasonCode; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.StringPair; +import org.apache.bifromq.type.UserProperties; import com.google.protobuf.ByteString; import io.netty.buffer.ByteBuf; import io.netty.channel.embedded.EmbeddedChannel; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTTMessageUtils.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTTMessageUtils.java similarity index 99% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTTMessageUtils.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTTMessageUtils.java index 291f7308b..0d7e8a92f 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/MQTTMessageUtils.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/MQTTMessageUtils.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.RESPONSE_TOPIC; import static io.netty.handler.codec.mqtt.MqttProperties.MqttPropertyType.TOPIC_ALIAS; -import com.baidu.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.mqtt.handler.v5.reason.MQTT5PubRecReasonCode; +import org.apache.bifromq.type.QoS; import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/TestTicker.java b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/TestTicker.java similarity index 96% rename from bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/TestTicker.java rename to bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/TestTicker.java index d9cfe9d61..b5c72789e 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/java/com/baidu/bifromq/mqtt/utils/TestTicker.java +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/java/org/apache/bifromq/mqtt/utils/TestTicker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.mqtt.utils; +package org.apache.bifromq.mqtt.utils; import com.google.common.base.Ticker; import java.util.concurrent.TimeUnit; diff --git a/bifromq-mqtt/bifromq-mqtt-server/src/test/resources/logback.xml b/bifromq-mqtt/bifromq-mqtt-server/src/test/resources/logback.xml index 2bd4238a1..719d440f4 100644 --- a/bifromq-mqtt/bifromq-mqtt-server/src/test/resources/logback.xml +++ b/bifromq-mqtt/bifromq-mqtt-server/src/test/resources/logback.xml @@ -18,7 +18,7 @@ %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - + diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/README.md b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/README.md index 3144d9d09..211710bac 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/README.md +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/README.md @@ -15,7 +15,7 @@ To generate a new project using the BifroMQ Plugin Archetype, run the following ```bash mvn archetype:generate \ - -DarchetypeGroupId=com.baidu.bifromq \ + -DarchetypeGroupId=org.apache.bifromq \ -DarchetypeArtifactId=bifromq-plugin-archetype \ -DarchetypeVersion=${bifromqVersion} \ -DgroupId=com.yourcompany.newproject \ diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/src/main/java/__pluginName__AuthProvider.java b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/src/main/java/__pluginName__AuthProvider.java index 500686d33..68f466540 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/src/main/java/__pluginName__AuthProvider.java +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/auth-provider/src/main/java/__pluginName__AuthProvider.java @@ -13,18 +13,18 @@ package $ -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Error; -import com.baidu.bifromq.plugin.authprovider.type.Failed; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Error; +import org.apache.bifromq.plugin.authprovider.type.Failed; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.type.ClientInfo; import java.util.concurrent.CompletableFuture; import org.pf4j.Extension; import org.slf4j.Logger; diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/src/main/java/__pluginName__.java b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/src/main/java/__pluginName__.java index c87667f5c..4dc07d47d 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/src/main/java/__pluginName__.java +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-build/src/main/java/__pluginName__.java @@ -15,7 +15,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; -import com.baidu.bifromq.plugin.BifroMQPluginDescriptor; +import org.apache.bifromq.plugin.BifroMQPluginDescriptor; import java.io.File; import java.nio.file.Path; import org.slf4j.Logger; diff --git a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/src/main/java/__pluginContextName__.java b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/src/main/java/__pluginContextName__.java index a352a399f..c363edf10 100644 --- a/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/src/main/java/__pluginContextName__.java +++ b/bifromq-plugin/bifromq-plugin-archetype/src/main/resources/archetype-resources/plugin-context/src/main/java/__pluginContextName__.java @@ -13,7 +13,7 @@ package $ -import com.baidu.bifromq.plugin.BifroMQPluginDescriptor; +import org.apache.bifromq.plugin.BifroMQPluginDescriptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/AuthProviderManager.java b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/AuthProviderManager.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/AuthProviderManager.java rename to bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/AuthProviderManager.java index f67307f4f..8f045f259 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/AuthProviderManager.java +++ b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/AuthProviderManager.java @@ -11,27 +11,27 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.authprovider; +package org.apache.bifromq.plugin.authprovider; -import static com.baidu.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; +import static org.apache.bifromq.plugin.eventcollector.ThreadLocalEventPool.getLocal; +import static org.apache.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Error; -import com.baidu.bifromq.plugin.authprovider.type.Failed; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl.AccessControlError; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Error; +import org.apache.bifromq.plugin.authprovider.type.Failed; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl.AccessControlError; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Timer; import java.util.Map; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/DevOnlyAuthProvider.java b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/DevOnlyAuthProvider.java similarity index 82% rename from bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/DevOnlyAuthProvider.java rename to bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/DevOnlyAuthProvider.java index d6e72e43a..dcb52ce71 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/DevOnlyAuthProvider.java +++ b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/DevOnlyAuthProvider.java @@ -11,20 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.authprovider; +package org.apache.bifromq.plugin.authprovider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.type.ClientInfo; import com.google.common.base.Strings; import java.util.concurrent.CompletableFuture; class DevOnlyAuthProvider implements IAuthProvider { private static final CheckResult GRANTED = CheckResult.newBuilder().setGranted( - com.baidu.bifromq.plugin.authprovider.type.Granted.getDefaultInstance()).build(); + Granted.getDefaultInstance()).build(); @Override public CompletableFuture auth(MQTT3AuthData authData) { diff --git a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/MetricConstants.java b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/MetricConstants.java similarity index 94% rename from bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/MetricConstants.java rename to bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/MetricConstants.java index da139a892..a05c64068 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/MetricConstants.java +++ b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/MetricConstants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.authprovider; +package org.apache.bifromq.plugin.authprovider; class MetricConstants { static final String CALL_TIMER = "call.exec.timer"; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/MetricManager.java b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/MetricManager.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/MetricManager.java rename to bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/MetricManager.java index 7a531d72c..3cd1fea1f 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/com/baidu/bifromq/plugin/authprovider/MetricManager.java +++ b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/main/java/org/apache/bifromq/plugin/authprovider/MetricManager.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.authprovider; +package org.apache.bifromq.plugin.authprovider; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.CALL_FAIL_COUNTER; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.CALL_TIMER; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.TAG_METHOD; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.TAG_TYPE; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.CALL_FAIL_COUNTER; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.CALL_TIMER; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.TAG_METHOD; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.TAG_TYPE; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/com/baidu/bifromq/plugin/authprovider/AuthProviderManagerTest.java b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/org/apache/bifromq/plugin/authprovider/AuthProviderManagerTest.java similarity index 92% rename from bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/com/baidu/bifromq/plugin/authprovider/AuthProviderManagerTest.java rename to bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/org/apache/bifromq/plugin/authprovider/AuthProviderManagerTest.java index 97cc1eb96..4581a547b 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/com/baidu/bifromq/plugin/authprovider/AuthProviderManagerTest.java +++ b/bifromq-plugin/bifromq-plugin-auth-provider-helper/src/test/java/org/apache/bifromq/plugin/authprovider/AuthProviderManagerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.authprovider; +package org.apache.bifromq.plugin.authprovider; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.CALL_FAIL_COUNTER; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.CALL_TIMER; -import static com.baidu.bifromq.plugin.authprovider.MetricConstants.TAG_METHOD; -import static com.baidu.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.CALL_FAIL_COUNTER; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.CALL_TIMER; +import static org.apache.bifromq.plugin.authprovider.MetricConstants.TAG_METHOD; +import static org.apache.bifromq.plugin.settingprovider.Setting.ByPassPermCheckError; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,25 +24,25 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Error; -import com.baidu.bifromq.plugin.authprovider.type.Failed; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.PubAction; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.plugin.authprovider.type.SubAction; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl.AccessControlError; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Error; +import org.apache.bifromq.plugin.authprovider.type.Failed; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.PubAction; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.plugin.authprovider.type.SubAction; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl.AccessControlError; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.type.ClientInfo; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/com/baidu/bifromq/plugin/authprovider/IAuthProvider.java b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/org/apache/bifromq/plugin/authprovider/IAuthProvider.java similarity index 85% rename from bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/com/baidu/bifromq/plugin/authprovider/IAuthProvider.java rename to bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/org/apache/bifromq/plugin/authprovider/IAuthProvider.java index 834088b67..c71144f8e 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/com/baidu/bifromq/plugin/authprovider/IAuthProvider.java +++ b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/java/org/apache/bifromq/plugin/authprovider/IAuthProvider.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.authprovider; +package org.apache.bifromq.plugin.authprovider; -import com.baidu.bifromq.plugin.authprovider.type.CheckResult; -import com.baidu.bifromq.plugin.authprovider.type.Denied; -import com.baidu.bifromq.plugin.authprovider.type.Error; -import com.baidu.bifromq.plugin.authprovider.type.Failed; -import com.baidu.bifromq.plugin.authprovider.type.Granted; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Success; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.type.CheckResult; +import org.apache.bifromq.plugin.authprovider.type.Denied; +import org.apache.bifromq.plugin.authprovider.type.Error; +import org.apache.bifromq.plugin.authprovider.type.Failed; +import org.apache.bifromq.plugin.authprovider.type.Granted; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT5ExtendedAuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Success; +import org.apache.bifromq.type.ClientInfo; import java.util.concurrent.CompletableFuture; import org.pf4j.ExtensionPoint; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt3_auth_types.proto b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt3_auth_types.proto index 97bbb7821..bf5d0c911 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt3_auth_types.proto +++ b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt3_auth_types.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package mqtt3authtypes; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.plugin.authprovider.type"; +option java_package = "org.apache.bifromq.plugin.authprovider.type"; option java_outer_classname = "MQTT3AuthTypesProto"; option optimize_for = SPEED; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt5_auth_types.proto b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt5_auth_types.proto index 3acc61172..8478e94a9 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt5_auth_types.proto +++ b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt5_auth_types.proto @@ -3,7 +3,7 @@ import "commontype/UserProperties.proto"; package mqtt5authtypes; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.plugin.authprovider.type"; +option java_package = "org.apache.bifromq.plugin.authprovider.type"; option java_outer_classname = "MQTT5AuthTypesProto"; option optimize_for = SPEED; diff --git a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt_actions.proto b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt_actions.proto index 3ec213bc9..9e17cccca 100644 --- a/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt_actions.proto +++ b/bifromq-plugin/bifromq-plugin-auth-provider/src/main/proto/mqtt_actions.proto @@ -5,7 +5,7 @@ import "commontype/QoS.proto"; package checktypes; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.plugin.authprovider.type"; +option java_package = "org.apache.bifromq.plugin.authprovider.type"; option java_outer_classname = "CheckTypesProto"; option optimize_for = SPEED; diff --git a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerManager.java b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerManager.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerManager.java rename to bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerManager.java index 9ef841a77..2b5f26c9c 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerManager.java +++ b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerManager.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.clientbalancer; +package org.apache.bifromq.plugin.clientbalancer; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Timer; diff --git a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/com/baidu/bifromq/plugin/clientbalancer/DummyClientBalancer.java b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/org/apache/bifromq/plugin/clientbalancer/DummyClientBalancer.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/com/baidu/bifromq/plugin/clientbalancer/DummyClientBalancer.java rename to bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/org/apache/bifromq/plugin/clientbalancer/DummyClientBalancer.java index 9df0aab9f..a8b5c3f01 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/com/baidu/bifromq/plugin/clientbalancer/DummyClientBalancer.java +++ b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/main/java/org/apache/bifromq/plugin/clientbalancer/DummyClientBalancer.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.clientbalancer; +package org.apache.bifromq.plugin.clientbalancer; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; import java.util.Optional; diff --git a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java rename to bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java index b818e2638..84bc84f6a 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java +++ b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerManagerTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.clientbalancer; +package org.apache.bifromq.plugin.clientbalancer; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; import org.pf4j.DefaultPluginManager; import org.pf4j.PluginManager; import org.testng.annotations.AfterMethod; diff --git a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java similarity index 93% rename from bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java rename to bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java index 31553afe9..3fa090f84 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/com/baidu/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java +++ b/bifromq-plugin/bifromq-plugin-client-balancer-helper/src/test/java/org/apache/bifromq/plugin/clientbalancer/ClientBalancerTestStub.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.clientbalancer; +package org.apache.bifromq.plugin.clientbalancer; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; import java.util.Optional; import org.pf4j.Extension; diff --git a/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/com/baidu/bifromq/plugin/clientbalancer/IClientBalancer.java b/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/org/apache/bifromq/plugin/clientbalancer/IClientBalancer.java similarity index 92% rename from bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/com/baidu/bifromq/plugin/clientbalancer/IClientBalancer.java rename to bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/org/apache/bifromq/plugin/clientbalancer/IClientBalancer.java index 6b47fccaf..ae24848e2 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/com/baidu/bifromq/plugin/clientbalancer/IClientBalancer.java +++ b/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/org/apache/bifromq/plugin/clientbalancer/IClientBalancer.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.clientbalancer; +package org.apache.bifromq.plugin.clientbalancer; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; import java.util.Optional; import org.pf4j.ExtensionPoint; diff --git a/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/com/baidu/bifromq/plugin/clientbalancer/Redirection.java b/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/org/apache/bifromq/plugin/clientbalancer/Redirection.java similarity index 94% rename from bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/com/baidu/bifromq/plugin/clientbalancer/Redirection.java rename to bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/org/apache/bifromq/plugin/clientbalancer/Redirection.java index b8cfd5e7f..34fc18dc5 100644 --- a/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/com/baidu/bifromq/plugin/clientbalancer/Redirection.java +++ b/bifromq-plugin/bifromq-plugin-client-balancer/src/main/java/org/apache/bifromq/plugin/clientbalancer/Redirection.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.clientbalancer; +package org.apache.bifromq.plugin.clientbalancer; import java.util.Optional; diff --git a/bifromq-plugin/bifromq-plugin-context/src/main/java/com/baidu/bifromq/plugin/BifroMQPluginContext.java b/bifromq-plugin/bifromq-plugin-context/src/main/java/org/apache/bifromq/plugin/BifroMQPluginContext.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-context/src/main/java/com/baidu/bifromq/plugin/BifroMQPluginContext.java rename to bifromq-plugin/bifromq-plugin-context/src/main/java/org/apache/bifromq/plugin/BifroMQPluginContext.java index 0ff0d9c4d..e277c0441 100644 --- a/bifromq-plugin/bifromq-plugin-context/src/main/java/com/baidu/bifromq/plugin/BifroMQPluginContext.java +++ b/bifromq-plugin/bifromq-plugin-context/src/main/java/org/apache/bifromq/plugin/BifroMQPluginContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin; +package org.apache.bifromq.plugin; /** * Provides a base context for custom BifroMQ plugins. This abstract class should be subclassed by developers to create diff --git a/bifromq-plugin/bifromq-plugin-context/src/main/java/com/baidu/bifromq/plugin/BifroMQPluginDescriptor.java b/bifromq-plugin/bifromq-plugin-context/src/main/java/org/apache/bifromq/plugin/BifroMQPluginDescriptor.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-context/src/main/java/com/baidu/bifromq/plugin/BifroMQPluginDescriptor.java rename to bifromq-plugin/bifromq-plugin-context/src/main/java/org/apache/bifromq/plugin/BifroMQPluginDescriptor.java index fa85bec10..348627c89 100644 --- a/bifromq-plugin/bifromq-plugin-context/src/main/java/com/baidu/bifromq/plugin/BifroMQPluginDescriptor.java +++ b/bifromq-plugin/bifromq-plugin-context/src/main/java/org/apache/bifromq/plugin/BifroMQPluginDescriptor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin; +package org.apache.bifromq.plugin; import java.nio.file.Path; import lombok.Getter; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorManager.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/EventCollectorManager.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorManager.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/EventCollectorManager.java index 377050ec4..e9fb835ab 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorManager.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/EventCollectorManager.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; -import com.baidu.bifromq.basehlc.HLC; +import org.apache.bifromq.basehlc.HLC; import com.google.common.annotations.VisibleForTesting; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventPool.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/EventPool.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventPool.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/EventPool.java index 0cbefa37d..e9d149d21 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventPool.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/EventPool.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import java.lang.reflect.Modifier; import java.util.HashSet; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/ThreadLocalEventPool.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/ThreadLocalEventPool.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/ThreadLocalEventPool.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/ThreadLocalEventPool.java index 3c9fe3b1e..77867dbf9 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/com/baidu/bifromq/plugin/eventcollector/ThreadLocalEventPool.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/main/java/org/apache/bifromq/plugin/eventcollector/ThreadLocalEventPool.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import static java.lang.ThreadLocal.withInitial; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorManagerTest.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventCollectorManagerTest.java similarity index 91% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorManagerTest.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventCollectorManagerTest.java index faa2612f9..254e9da9c 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorManagerTest.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventCollectorManagerTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.PingReq; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.PingReq; +import org.apache.bifromq.type.ClientInfo; import org.pf4j.DefaultPluginManager; import org.pf4j.PluginManager; import org.testng.annotations.AfterMethod; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorTestStub.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventCollectorTestStub.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorTestStub.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventCollectorTestStub.java index 9ffe4c989..5864dcd3f 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventCollectorTestStub.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventCollectorTestStub.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import java.util.ArrayList; import java.util.List; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventPoolTest.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventPoolTest.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventPoolTest.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventPoolTest.java index 5d42e701d..b94dbca57 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/EventPoolTest.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/EventPoolTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; diff --git a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java similarity index 91% rename from bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java rename to bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java index ad04df39b..7eff217b0 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/com/baidu/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java +++ b/bifromq-plugin/bifromq-plugin-event-collector-helper/src/test/java/org/apache/bifromq/plugin/eventcollector/ThreadLocalEventPoolTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import static org.testng.Assert.assertNotSame; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.PingReq; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.PingReq; import com.google.common.util.concurrent.Uninterruptibles; import java.util.concurrent.atomic.AtomicReference; import org.testng.annotations.Test; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/ClientEvent.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/ClientEvent.java similarity index 92% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/ClientEvent.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/ClientEvent.java index 7712a548b..8e40c51f0 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/ClientEvent.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/ClientEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/Event.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/Event.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/Event.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/Event.java index bbc8e5743..e52693904 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/Event.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/Event.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import lombok.SneakyThrows; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventType.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/EventType.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventType.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/EventType.java index d28c1fa16..27fbc358b 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/EventType.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/EventType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; public enum EventType { // mqttbroker diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/IEventCollector.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/IEventCollector.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/IEventCollector.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/IEventCollector.java index 2032ce07a..2e03947aa 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/IEventCollector.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/IEventCollector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; import org.pf4j.ExtensionPoint; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/OutOfTenantResource.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/OutOfTenantResource.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/OutOfTenantResource.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/OutOfTenantResource.java index 68b62b3f2..307fca394 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/OutOfTenantResource.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/OutOfTenantResource.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector; +package org.apache.bifromq.plugin.eventcollector; -import static com.baidu.bifromq.plugin.eventcollector.EventType.OUT_OF_TENANT_RESOURCE; +import static org.apache.bifromq.plugin.eventcollector.EventType.OUT_OF_TENANT_RESOURCE; import lombok.Getter; import lombok.Setter; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DeliverError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DeliverError.java similarity index 83% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DeliverError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DeliverError.java index 26acde29b..d1f96ba1e 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DeliverError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DeliverError.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java similarity index 84% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java index 80a341193..10a90d63f 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DeliverNoInbox.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Delivered.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Delivered.java similarity index 83% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Delivered.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Delivered.java index 54dbdc3f6..632e29706 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Delivered.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Delivered.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DistError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DistError.java similarity index 85% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DistError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DistError.java index 38bf547f6..8b353e6bf 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/DistError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/DistError.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.PublisherMessagePack; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.PublisherMessagePack; import lombok.Getter; import lombok.Setter; import lombok.ToString; @@ -26,10 +26,6 @@ @Accessors(fluent = true, chain = true) @ToString(callSuper = true) public class DistError extends Event { - public enum DistErrorCode { - DROP_EXCEED_LIMIT, RPC_FAILURE - } - private long reqId; private Iterable messages; private DistErrorCode code; @@ -46,4 +42,8 @@ public void clone(DistError orig) { this.messages = orig.messages; this.code = orig.code; } + + public enum DistErrorCode { + DROP_EXCEED_LIMIT, RPC_FAILURE + } } diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Disted.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Disted.java similarity index 84% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Disted.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Disted.java index 513d1d576..a396860ab 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Disted.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Disted.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.PublisherMessagePack; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.PublisherMessagePack; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/MatchError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/MatchError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/MatchError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/MatchError.java index eb91229d9..548faa7b5 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/MatchError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/MatchError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Matched.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Matched.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Matched.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Matched.java index 08de187a5..878114d2d 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Matched.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Matched.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/SubscribeError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/SubscribeError.java similarity index 88% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/SubscribeError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/SubscribeError.java index 376b2bf4d..ebcc3e93a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/SubscribeError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/SubscribeError.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Subscribed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Subscribed.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Subscribed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Subscribed.java index e29e59676..b941b0b2a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Subscribed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Subscribed.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/UnmatchError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/UnmatchError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/UnmatchError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/UnmatchError.java index 00f30fd6b..e3ef495a7 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/UnmatchError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/UnmatchError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Unmatched.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Unmatched.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Unmatched.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Unmatched.java index ed067bd92..2bfef1148 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Unmatched.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Unmatched.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java index b11590e01..dc4e8ab99 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/UnsubscribeError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Unsubscribed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Unsubscribed.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Unsubscribed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Unsubscribed.java index f05788638..833c59ba5 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/distservice/Unsubscribed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/distservice/Unsubscribed.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.distservice; +package org.apache.bifromq.plugin.eventcollector.distservice; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/inboxservice/Overflowed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/inboxservice/Overflowed.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/inboxservice/Overflowed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/inboxservice/Overflowed.java index 02ecf3a98..322d2609a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/inboxservice/Overflowed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/inboxservice/Overflowed.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.inboxservice; +package org.apache.bifromq.plugin.eventcollector.inboxservice; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java similarity index 79% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java index f9c274ad9..97ccec7d8 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/OversizePacketDropped.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker; +package org.apache.bifromq.plugin.eventcollector.mqttbroker; -import static com.baidu.bifromq.plugin.eventcollector.EventType.OVERSIZE_PACKET_DROPPED; +import static org.apache.bifromq.plugin.eventcollector.EventType.OVERSIZE_PACKET_DROPPED; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/PingReq.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/PingReq.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/PingReq.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/PingReq.java index 729c3c6cf..189da878b 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/PingReq.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/PingReq.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker; +package org.apache.bifromq.plugin.eventcollector.mqttbroker; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java similarity index 85% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java index 5cd42fae4..e383111e0 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/AccessControlError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java similarity index 85% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java index dd66747cf..58bfc9d09 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/PubActionDisallow.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java similarity index 84% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java index b99b0765b..50d58caf0 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/SubActionDisallow.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java similarity index 85% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java index 50d27c8ed..9fd5a430f 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/accessctrl/UnsubActionDisallow.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.accessctrl; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.accessctrl; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java index 88cd52eca..b50f1ac23 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/AuthError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java similarity index 91% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java index 0a342380a..624bbc3b1 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelClosedEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.Event; import java.net.InetSocketAddress; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java index 83a580da9..23aff8fe5 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ChannelError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java index 7ac9cdf36..ab46965d0 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ConnectTimeout.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java index 896c420c2..d63849e96 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/EnhancedAuthAbortByClient.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java index 414501822..cb6c12591 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/IdentifierRejected.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java index 0e6eb62be..e521dcbab 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedClientIdentifier.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java index a90c72d62..de176b38d 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedUserName.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java index 3722ab6d3..79718e301 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/MalformedWillTopic.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java index bc173efd5..ed15c114f 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/NotAuthorizedClient.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java index efe1e3856..3fc67de0b 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/ProtocolError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java index aa68a945e..fe96b9a4a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnacceptedProtocolVer.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java index 179c6bcb6..04314e793 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/channelclosed/UnauthenticatedClient.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java similarity index 88% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java index f4d74cd18..ec6269bd8 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientconnected/ClientConnected.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientconnected; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientconnected; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import java.nio.ByteBuffer; import lombok.Getter; import lombok.Setter; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java index 79e021739..250404cb5 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/BadPacket.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java index a56ab9862..92848a7bf 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByClient.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java similarity index 85% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java index 5c14695c4..80134719e 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ByServer.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java index 5aa4402bd..5077c4d64 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientChannelError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java index e4678b2ca..f1a5eb01e 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ClientDisconnectEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; import lombok.ToString; /** diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java index d91d2c7ab..00789e69d 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedPubRate.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java index c79779361..99e139d0b 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ExceedReceivingLimit.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java index b1b7a0647..aafbdd860 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Idle.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java similarity index 88% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java index 930f073ef..5bd43e2d6 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InboxTransientError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java index f3d4cd885..e1e930e08 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopic.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java index 395670c43..72818b8c8 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/InvalidTopicFilter.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java index c25abdd9d..dd44762f4 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Kicked.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.ClientInfo; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java index e64a3dc14..540983c40 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopic.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java index 3d37828e9..6538aabfb 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/MalformedTopicFilter.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java index dd4385e62..225767bb9 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/NoPubPermission.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java index c3f1202fd..f101d7a50 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ProtocolViolation.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java similarity index 88% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java index 4fd056b63..9fb2416a5 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ReAuthFailed.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java index 0516bc401..f91d1bb49 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/Redirect.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java index 84d1b7bda..aec19567c 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ResourceThrottled.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java index 94b733c46..ee67e29e2 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/ServerBusy.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java index 77199e99b..d1e08d27a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeSubscription.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java index 09dce69f4..efacb8592 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/clientdisconnect/TooLargeUnsubscription.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java index a5733573e..fc8c4d82f 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/Discard.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java similarity index 91% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java index ec9cd005b..35da15cc0 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/DistEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java index b751e782f..732a3b139 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS0DistError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java index 90113ae56..7cef8be4c 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1DistError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java index b18b2b21b..355c2d7be 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAckDropped.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java index 7c4a48635..191c49a95 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS1PubAcked.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java index 795ea5bff..65ffc6286 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2DistError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java index 7ca66cce7..264f611a7 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubRecDropped.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java index fd8cc2872..daea87dbe 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/QoS2PubReced.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java index 01bf5a606..822069aad 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDistError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java index fc288cede..118c51384 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/disthandling/WillDisted.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.disthandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.disthandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java similarity index 91% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java index 8ffd55a75..5f315bb18 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/DropReason.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; /** * The reason why a message is dropped before publishing to subscriber. diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java similarity index 92% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java index b3685a20b..441aaa85e 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/PushEvent.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.type.ClientInfo; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java index 22d71d7a5..e6d1f05af 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Dropped.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java index 0d5c965f1..599faa5e2 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS0Pushed.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java index cc68bf6c8..b85842e60 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Confirmed.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java index 21273103d..e091e754e 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Dropped.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java index 35a2a3bd3..7b92b2bc9 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS1Pushed.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java index 44bb5477f..e74d97ed9 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Confirmed.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java index a9f31afd2..a82d3dc65 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Dropped.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java index 05af5aefa..0653c3d04 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Pushed.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java index 98912d790..0ee8df5c3 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/pushhandling/QoS2Received.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.pushhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.pushhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java index 45980fb80..17effa66d 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MatchRetainError.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java similarity index 88% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java index ea9a7dcff..8e420b78a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetained.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java similarity index 89% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java index f8c29a96a..8c4cf39e2 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/MsgRetainedError.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.type.QoS; import java.nio.ByteBuffer; import lombok.Getter; import lombok.Setter; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java similarity index 88% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java index 70a0ddc5e..6003716cf 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainEvent.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; import lombok.ToString; @ToString(callSuper = true) diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java similarity index 90% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java index 74a54c3e7..8acf63117 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/retainhandling/RetainMsgCleared.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.retainhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.retainhandling; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java index 2c0d540ee..51d53a37a 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/subhandling/SubAcked.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.subhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.subhandling; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java similarity index 86% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java index 53e94cafa..4acefb61f 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/mqttbroker/subhandling/UnsubAcked.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.mqttbroker.subhandling; +package org.apache.bifromq.plugin.eventcollector.mqttbroker.subhandling; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/session/MQTTSessionStart.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/session/MQTTSessionStart.java similarity index 80% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/session/MQTTSessionStart.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/session/MQTTSessionStart.java index 76992861a..74c8f9fda 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/session/MQTTSessionStart.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/session/MQTTSessionStart.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.session; +package org.apache.bifromq.plugin.eventcollector.session; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_START; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/session/MQTTSessionStop.java b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/session/MQTTSessionStop.java similarity index 80% rename from bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/session/MQTTSessionStop.java rename to bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/session/MQTTSessionStop.java index 1413d0c4e..d8406383e 100644 --- a/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/com/baidu/bifromq/plugin/eventcollector/session/MQTTSessionStop.java +++ b/bifromq-plugin/bifromq-plugin-event-collector/src/main/java/org/apache/bifromq/plugin/eventcollector/session/MQTTSessionStop.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.eventcollector.session; +package org.apache.bifromq.plugin.eventcollector.session; -import static com.baidu.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; +import static org.apache.bifromq.plugin.eventcollector.EventType.MQTT_SESSION_STOP; -import com.baidu.bifromq.plugin.eventcollector.ClientEvent; -import com.baidu.bifromq.plugin.eventcollector.EventType; +import org.apache.bifromq.plugin.eventcollector.ClientEvent; +import org.apache.bifromq.plugin.eventcollector.EventType; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/bifromq-plugin/bifromq-plugin-main/src/main/java/com/baidu/bifromq/plugin/BifroMQPlugin.java b/bifromq-plugin/bifromq-plugin-main/src/main/java/org/apache/bifromq/plugin/BifroMQPlugin.java similarity index 99% rename from bifromq-plugin/bifromq-plugin-main/src/main/java/com/baidu/bifromq/plugin/BifroMQPlugin.java rename to bifromq-plugin/bifromq-plugin-main/src/main/java/org/apache/bifromq/plugin/BifroMQPlugin.java index 0d24105fd..647e2890b 100644 --- a/bifromq-plugin/bifromq-plugin-main/src/main/java/com/baidu/bifromq/plugin/BifroMQPlugin.java +++ b/bifromq-plugin/bifromq-plugin-main/src/main/java/org/apache/bifromq/plugin/BifroMQPlugin.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin; +package org.apache.bifromq.plugin; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; diff --git a/bifromq-plugin/bifromq-plugin-main/src/test/java/com/baidu/bifromq/plugin/BifroMQPluginTest.java b/bifromq-plugin/bifromq-plugin-main/src/test/java/org/apache/bifromq/plugin/BifroMQPluginTest.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-main/src/test/java/com/baidu/bifromq/plugin/BifroMQPluginTest.java rename to bifromq-plugin/bifromq-plugin-main/src/test/java/org/apache/bifromq/plugin/BifroMQPluginTest.java index e03123542..c07840ed1 100644 --- a/bifromq-plugin/bifromq-plugin-main/src/test/java/com/baidu/bifromq/plugin/BifroMQPluginTest.java +++ b/bifromq-plugin/bifromq-plugin-main/src/test/java/org/apache/bifromq/plugin/BifroMQPluginTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin; +package org.apache.bifromq.plugin; import static org.testng.Assert.assertTrue; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java index 7ee2db7e8..758066032 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQDefaultPluginLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import java.nio.file.Path; import org.pf4j.DefaultPluginLoader; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java index f10164c43..0bd199400 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQDevelopmentPluginLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import java.nio.file.Path; import org.pf4j.DevelopmentPluginLoader; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQExtensionFactory.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQExtensionFactory.java similarity index 94% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQExtensionFactory.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQExtensionFactory.java index ce1fa7c6e..90d6bc4dc 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQExtensionFactory.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQExtensionFactory.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; -import com.baidu.bifromq.plugin.BifroMQPlugin; -import com.baidu.bifromq.plugin.BifroMQPluginContext; +import org.apache.bifromq.plugin.BifroMQPlugin; +import org.apache.bifromq.plugin.BifroMQPluginContext; import java.lang.reflect.Constructor; import lombok.extern.slf4j.Slf4j; import org.pf4j.DefaultExtensionFactory; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQExtensionFinder.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQExtensionFinder.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQExtensionFinder.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQExtensionFinder.java index 6835b236a..fb880add6 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQExtensionFinder.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQExtensionFinder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import java.io.IOException; import java.io.InputStream; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQJarPluginLoader.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQJarPluginLoader.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQJarPluginLoader.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQJarPluginLoader.java index 1140c1d3f..56096b6d6 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQJarPluginLoader.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQJarPluginLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import java.nio.file.Path; import org.pf4j.JarPluginLoader; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginClassLoader.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginClassLoader.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginClassLoader.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginClassLoader.java index a65d9f874..a0d76ac7d 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginClassLoader.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginClassLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import org.pf4j.PluginClassLoader; import org.pf4j.PluginDescriptor; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginFactory.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginFactory.java similarity index 93% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginFactory.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginFactory.java index af94eed7a..87529c180 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginFactory.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginFactory.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import static org.pf4j.RuntimeMode.DEVELOPMENT; -import com.baidu.bifromq.plugin.BifroMQPlugin; -import com.baidu.bifromq.plugin.BifroMQPluginDescriptor; +import org.apache.bifromq.plugin.BifroMQPlugin; +import org.apache.bifromq.plugin.BifroMQPluginDescriptor; import java.lang.reflect.Constructor; import lombok.extern.slf4j.Slf4j; import org.pf4j.DefaultPluginFactory; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginManager.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginManager.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginManager.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginManager.java index 6159d7f2d..056c3e908 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/BifroMQPluginManager.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/BifroMQPluginManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import lombok.extern.slf4j.Slf4j; import org.pf4j.CompoundPluginLoader; diff --git a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/ProvidedPackages.java b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/ProvidedPackages.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/ProvidedPackages.java rename to bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/ProvidedPackages.java index a77cfc18d..4b82f3926 100644 --- a/bifromq-plugin/bifromq-plugin-manager/src/main/java/com/baidu/bifromq/plugin/manager/ProvidedPackages.java +++ b/bifromq-plugin/bifromq-plugin-manager/src/main/java/org/apache/bifromq/plugin/manager/ProvidedPackages.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.manager; +package org.apache.bifromq.plugin.manager; import java.util.HashSet; import java.util.Set; @@ -20,8 +20,8 @@ public class ProvidedPackages { private static final Set PACKAGES = new HashSet<>(); static { - PACKAGES.add("com.baidu.bifromq.type."); - PACKAGES.add("com.baidu.bifromq.plugin."); + PACKAGES.add("org.apache.bifromq.type."); + PACKAGES.add("org.apache.bifromq.plugin."); PACKAGES.add("io.micrometer.core."); PACKAGES.add("com.google.protobuf."); } diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/com/baidu/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/org/apache/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java similarity index 81% rename from bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/com/baidu/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java rename to bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/org/apache/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java index 1aecb337b..efc337c0b 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/com/baidu/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java +++ b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/org/apache/bifromq/plugin/resourcethrottler/DevOnlyResourceThrottler.java @@ -11,10 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.resourcethrottler; - -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; +package org.apache.bifromq.plugin.resourcethrottler; public class DevOnlyResourceThrottler implements IResourceThrottler { @Override diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/com/baidu/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/org/apache/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/com/baidu/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java rename to bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/org/apache/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java index 29a99e94c..0432b5aa7 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/com/baidu/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java +++ b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/main/java/org/apache/bifromq/plugin/resourcethrottler/ResourceThrottlerManager.java @@ -11,10 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.resourcethrottler; +package org.apache.bifromq.plugin.resourcethrottler; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Timer; diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/com/baidu/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/org/apache/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java similarity index 87% rename from bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/com/baidu/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java rename to bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/org/apache/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java index 875653e5f..6062e5816 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/com/baidu/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java +++ b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/org/apache/bifromq/plugin/resourcethrottler/ResourceThrottlerTestStub.java @@ -11,10 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.resourcethrottler; +package org.apache.bifromq.plugin.resourcethrottler; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/com/baidu/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/org/apache/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/com/baidu/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java rename to bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/org/apache/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java index 827a3571c..5ba7182f6 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/com/baidu/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java +++ b/bifromq-plugin/bifromq-plugin-resource-throttler-helper/src/test/java/org/apache/bifromq/plugin/resourcethrottler/TenantResourceThrottlerManagerTest.java @@ -11,13 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.resourcethrottler; +package org.apache.bifromq.plugin.resourcethrottler; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; import org.pf4j.DefaultPluginManager; import org.pf4j.PluginManager; import org.testng.annotations.AfterMethod; diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/com/bifromq/plugin/resourcethrottler/IResourceThrottler.java b/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/org/apache/bifromq/plugin/resourcethrottler/IResourceThrottler.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/com/bifromq/plugin/resourcethrottler/IResourceThrottler.java rename to bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/org/apache/bifromq/plugin/resourcethrottler/IResourceThrottler.java index b78eb8640..b1504e7c2 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/com/bifromq/plugin/resourcethrottler/IResourceThrottler.java +++ b/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/org/apache/bifromq/plugin/resourcethrottler/IResourceThrottler.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.bifromq.plugin.resourcethrottler; +package org.apache.bifromq.plugin.resourcethrottler; import org.pf4j.ExtensionPoint; diff --git a/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/com/bifromq/plugin/resourcethrottler/TenantResourceType.java b/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/org/apache/bifromq/plugin/resourcethrottler/TenantResourceType.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/com/bifromq/plugin/resourcethrottler/TenantResourceType.java rename to bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/org/apache/bifromq/plugin/resourcethrottler/TenantResourceType.java index 6534066ab..2a948bebb 100644 --- a/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/com/bifromq/plugin/resourcethrottler/TenantResourceType.java +++ b/bifromq-plugin/bifromq-plugin-resource-throttler/src/main/java/org/apache/bifromq/plugin/resourcethrottler/TenantResourceType.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.bifromq.plugin.resourcethrottler; +package org.apache.bifromq.plugin.resourcethrottler; public enum TenantResourceType { TotalConnections, diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/CacheOptions.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/CacheOptions.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/CacheOptions.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/CacheOptions.java index 3b4aa4c3a..60f71919b 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/CacheOptions.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/CacheOptions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/CacheableSettingProvider.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/CacheableSettingProvider.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/CacheableSettingProvider.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/CacheableSettingProvider.java index b0e204f09..7597e3f52 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/CacheableSettingProvider.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/CacheableSettingProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/DevOnlySettingProvider.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/DevOnlySettingProvider.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/DevOnlySettingProvider.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/DevOnlySettingProvider.java index 70d3128d7..d71e32b32 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/DevOnlySettingProvider.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/DevOnlySettingProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import java.util.EnumMap; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/MonitoredSettingProvider.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/MonitoredSettingProvider.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/MonitoredSettingProvider.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/MonitoredSettingProvider.java index eac35cc5f..db536617a 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/MonitoredSettingProvider.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/MonitoredSettingProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderManager.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/SettingProviderManager.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderManager.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/SettingProviderManager.java index a9c85e7ee..f7463b0b6 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderManager.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/main/java/org/apache/bifromq/plugin/settingprovider/SettingProviderManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java index 59e7ef239..6e17e01ef 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/CacheableSettingProviderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import static org.awaitility.Awaitility.await; import static org.mockito.Mockito.when; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java index 6631a8a9b..4933e873c 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/MonitoredSettingProviderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderManagerTest.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingProviderManagerTest.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderManagerTest.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingProviderManagerTest.java index 1fb229194..7a3ddb62d 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderManagerTest.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingProviderManagerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderTestStub.java b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingProviderTestStub.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderTestStub.java rename to bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingProviderTestStub.java index 403360b90..e1923884b 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingProviderTestStub.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider-helper/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingProviderTestStub.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import java.util.HashMap; import java.util.Map; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/com/baidu/bifromq/plugin/settingprovider/ISettingProvider.java b/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/org/apache/bifromq/plugin/settingprovider/ISettingProvider.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/com/baidu/bifromq/plugin/settingprovider/ISettingProvider.java rename to bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/org/apache/bifromq/plugin/settingprovider/ISettingProvider.java index 028d65e96..c298f1544 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/com/baidu/bifromq/plugin/settingprovider/ISettingProvider.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/org/apache/bifromq/plugin/settingprovider/ISettingProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import org.pf4j.ExtensionPoint; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/com/baidu/bifromq/plugin/settingprovider/Setting.java b/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/org/apache/bifromq/plugin/settingprovider/Setting.java similarity index 99% rename from bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/com/baidu/bifromq/plugin/settingprovider/Setting.java rename to bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/org/apache/bifromq/plugin/settingprovider/Setting.java index c92e02f54..0cbfd6c1f 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/com/baidu/bifromq/plugin/settingprovider/Setting.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider/src/main/java/org/apache/bifromq/plugin/settingprovider/Setting.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import java.util.function.BiPredicate; import java.util.function.Predicate; diff --git a/bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingTest.java b/bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingTest.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingTest.java rename to bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingTest.java index 2e3dd488c..f68fdea9f 100644 --- a/bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/com/baidu/bifromq/plugin/settingprovider/SettingTest.java +++ b/bifromq-plugin/bifromq-plugin-setting-provider/src/test/java/org/apache/bifromq/plugin/settingprovider/SettingTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.settingprovider; +package org.apache.bifromq.plugin.settingprovider; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/ISubBrokerManager.java b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/ISubBrokerManager.java similarity index 94% rename from bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/ISubBrokerManager.java rename to bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/ISubBrokerManager.java index 004f5c21c..16497bdb1 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/ISubBrokerManager.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/ISubBrokerManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; public interface ISubBrokerManager extends AutoCloseable { ISubBroker get(int subBrokerId); diff --git a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/MonitoredSubBroker.java b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/MonitoredSubBroker.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/MonitoredSubBroker.java rename to bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/MonitoredSubBroker.java index 7150ed35d..c766e1e89 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/MonitoredSubBroker.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/MonitoredSubBroker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; import com.google.common.base.Preconditions; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/NoInboxSubBroker.java b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/NoInboxSubBroker.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/NoInboxSubBroker.java rename to bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/NoInboxSubBroker.java index 26fee4580..445e9e40f 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/NoInboxSubBroker.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/NoInboxSubBroker.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.type.MatchInfo; import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/SubBrokerManager.java b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/SubBrokerManager.java similarity index 98% rename from bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/SubBrokerManager.java rename to bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/SubBrokerManager.java index 717ccc728..e4f258a7b 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/com/baidu/bifromq/plugin/subbroker/SubBrokerManager.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/main/java/org/apache/bifromq/plugin/subbroker/SubBrokerManager.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; import java.util.HashMap; import java.util.List; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/com/baidu/bifromq/plugin/subbroker/SubBrokerManagerTest.java b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/org/apache/bifromq/plugin/subbroker/SubBrokerManagerTest.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/com/baidu/bifromq/plugin/subbroker/SubBrokerManagerTest.java rename to bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/org/apache/bifromq/plugin/subbroker/SubBrokerManagerTest.java index f40779126..6a1f0db1f 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/com/baidu/bifromq/plugin/subbroker/SubBrokerManagerTest.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker-helper/src/test/java/org/apache/bifromq/plugin/subbroker/SubBrokerManagerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.times; @@ -19,8 +19,8 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; import java.util.List; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/IDeliverer.java b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/IDeliverer.java similarity index 96% rename from bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/IDeliverer.java rename to bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/IDeliverer.java index c80363e82..f0cf0ec65 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/IDeliverer.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/IDeliverer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/ISubBroker.java b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/ISubBroker.java similarity index 97% rename from bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/ISubBroker.java rename to bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/ISubBroker.java index aa38e06b8..3bd5b9d38 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/ISubBroker.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/ISubBroker.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; import java.util.concurrent.CompletableFuture; import org.pf4j.ExtensionPoint; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/TypeUtil.java b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/TypeUtil.java similarity index 95% rename from bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/TypeUtil.java rename to bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/TypeUtil.java index 4ab68031e..3ca24c3f4 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/com/baidu/bifromq/plugin/subbroker/TypeUtil.java +++ b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/java/org/apache/bifromq/plugin/subbroker/TypeUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.plugin.subbroker; +package org.apache.bifromq.plugin.subbroker; -import com.baidu.bifromq.type.MatchInfo; +import org.apache.bifromq.type.MatchInfo; import java.util.Map; import java.util.stream.Collectors; diff --git a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/proto/subbroker/type.proto b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/proto/subbroker/type.proto index 508ab4076..b33272e0f 100644 --- a/bifromq-plugin/bifromq-plugin-sub-broker/src/main/proto/subbroker/type.proto +++ b/bifromq-plugin/bifromq-plugin-sub-broker/src/main/proto/subbroker/type.proto @@ -2,7 +2,7 @@ syntax = "proto3"; import "commontype/MatchInfo.proto"; import "commontype/TopicMessage.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.plugin.subbroker";; +option java_package = "org.apache.bifromq.plugin.subbroker";; option java_outer_classname = "SubBrokerProtos"; package subbroker; diff --git a/bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/IRetainClient.java b/bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/IRetainClient.java similarity index 74% rename from bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/IRetainClient.java rename to bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/IRetainClient.java index 1ace4b5a1..8c3bb9172 100644 --- a/bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/IRetainClient.java +++ b/bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/IRetainClient.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.client; +package org.apache.bifromq.retain.client; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.retain.rpc.proto.ExpireAllReply; +import org.apache.bifromq.retain.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchRequest; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClient.java b/bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/RetainClient.java similarity index 81% rename from bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClient.java rename to bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/RetainClient.java index dc196a6d6..d2349f28c 100644 --- a/bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClient.java +++ b/bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/RetainClient.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.client; +package org.apache.bifromq.retain.client; -import static com.baidu.bifromq.metrics.TenantMetric.MqttIngressRetainBytes; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainMatchCount; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainedBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttIngressRetainBytes; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainMatchCount; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainedBytes; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceGrpc; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.QoS; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.retain.rpc.proto.ExpireAllReply; +import org.apache.bifromq.retain.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchRequest; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.retain.rpc.proto.RetainServiceGrpc; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.QoS; import com.google.protobuf.ByteString; import io.reactivex.rxjava3.core.Observable; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClientBuilder.java b/bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/RetainClientBuilder.java similarity index 86% rename from bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClientBuilder.java rename to bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/RetainClientBuilder.java index 446d8e719..b6fb0baaa 100644 --- a/bifromq-retain/bifromq-retain-client/src/main/java/com/baidu/bifromq/retain/client/RetainClientBuilder.java +++ b/bifromq-retain/bifromq-retain-client/src/main/java/org/apache/bifromq/retain/client/RetainClientBuilder.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.client; +package org.apache.bifromq.retain.client; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.retain.RPCBluePrint; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.retain.RPCBluePrint; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; import lombok.AccessLevel; diff --git a/bifromq-retain/bifromq-retain-coproc-proto/src/main/proto/retainservice/RetainStoreCoProc.proto b/bifromq-retain/bifromq-retain-coproc-proto/src/main/proto/retainservice/RetainStoreCoProc.proto index e9876afcb..4c3eeccfe 100644 --- a/bifromq-retain/bifromq-retain-coproc-proto/src/main/proto/retainservice/RetainStoreCoProc.proto +++ b/bifromq-retain/bifromq-retain-coproc-proto/src/main/proto/retainservice/RetainStoreCoProc.proto @@ -3,7 +3,7 @@ import "commontype/ClientInfo.proto"; import "commontype/TopicMessage.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.retain.rpc.proto"; +option java_package = "org.apache.bifromq.retain.rpc.proto"; option java_outer_classname = "RetainCoProcProtos"; package retainservice; diff --git a/bifromq-retain/bifromq-retain-gc/src/main/java/com/baidu/bifromq/retain/store/gc/IRetainStoreGCProcessor.java b/bifromq-retain/bifromq-retain-gc/src/main/java/org/apache/bifromq/retain/store/gc/IRetainStoreGCProcessor.java similarity index 95% rename from bifromq-retain/bifromq-retain-gc/src/main/java/com/baidu/bifromq/retain/store/gc/IRetainStoreGCProcessor.java rename to bifromq-retain/bifromq-retain-gc/src/main/java/org/apache/bifromq/retain/store/gc/IRetainStoreGCProcessor.java index 6d4815bea..9f553d193 100644 --- a/bifromq-retain/bifromq-retain-gc/src/main/java/com/baidu/bifromq/retain/store/gc/IRetainStoreGCProcessor.java +++ b/bifromq-retain/bifromq-retain-gc/src/main/java/org/apache/bifromq/retain/store/gc/IRetainStoreGCProcessor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.gc; +package org.apache.bifromq.retain.store.gc; import jakarta.annotation.Nullable; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-retain/bifromq-retain-gc/src/main/java/com/baidu/bifromq/retain/store/gc/RetainStoreGCProcessor.java b/bifromq-retain/bifromq-retain-gc/src/main/java/org/apache/bifromq/retain/store/gc/RetainStoreGCProcessor.java similarity index 77% rename from bifromq-retain/bifromq-retain-gc/src/main/java/com/baidu/bifromq/retain/store/gc/RetainStoreGCProcessor.java rename to bifromq-retain/bifromq-retain-gc/src/main/java/org/apache/bifromq/retain/store/gc/RetainStoreGCProcessor.java index e25acf633..37918dde4 100644 --- a/bifromq-retain/bifromq-retain-gc/src/main/java/com/baidu/bifromq/retain/store/gc/RetainStoreGCProcessor.java +++ b/bifromq-retain/bifromq-retain-gc/src/main/java/org/apache/bifromq/retain/store/gc/RetainStoreGCProcessor.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.gc; +package org.apache.bifromq.retain.store.gc; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.dist.worker.schema.KVSchemaUtil.tenantBeginKey; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.retain.rpc.proto.GCReply; -import com.baidu.bifromq.retain.rpc.proto.GCRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.retain.rpc.proto.GCReply; +import org.apache.bifromq.retain.rpc.proto.GCRequest; +import org.apache.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; import jakarta.annotation.Nullable; import java.util.Arrays; import java.util.concurrent.CompletableFuture; diff --git a/bifromq-retain/bifromq-retain-gc/src/test/java/com/baidu/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java b/bifromq-retain/bifromq-retain-gc/src/test/java/org/apache/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java similarity index 94% rename from bifromq-retain/bifromq-retain-gc/src/test/java/com/baidu/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java rename to bifromq-retain/bifromq-retain-gc/src/test/java/org/apache/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java index e63baa5a4..259fc4782 100644 --- a/bifromq-retain/bifromq-retain-gc/src/test/java/com/baidu/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java +++ b/bifromq-retain/bifromq-retain-gc/src/test/java/org/apache/bifromq/retain/store/gc/RetainStoreGCProcessorTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.gc; +package org.apache.bifromq.retain.store.gc; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.argThat; @@ -22,14 +22,14 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.retain.rpc.proto.GCRequest; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.retain.rpc.proto.GCRequest; import com.google.protobuf.ByteString; import java.util.Collections; import java.util.TreeMap; diff --git a/bifromq-retain/bifromq-retain-rpc-definition/src/main/java/com/baidu/bifromq/retain/RPCBluePrint.java b/bifromq-retain/bifromq-retain-rpc-definition/src/main/java/org/apache/bifromq/retain/RPCBluePrint.java similarity index 88% rename from bifromq-retain/bifromq-retain-rpc-definition/src/main/java/com/baidu/bifromq/retain/RPCBluePrint.java rename to bifromq-retain/bifromq-retain-rpc-definition/src/main/java/org/apache/bifromq/retain/RPCBluePrint.java index f684fdaeb..832d011a3 100644 --- a/bifromq-retain/bifromq-retain-rpc-definition/src/main/java/com/baidu/bifromq/retain/RPCBluePrint.java +++ b/bifromq-retain/bifromq-retain-rpc-definition/src/main/java/org/apache/bifromq/retain/RPCBluePrint.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain; +package org.apache.bifromq.retain; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceGrpc; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.retain.rpc.proto.RetainServiceGrpc; public class RPCBluePrint { public static final BluePrint INSTANCE = BluePrint.builder() diff --git a/bifromq-retain/bifromq-retain-rpc-definition/src/main/proto/retainservice/RetainService.proto b/bifromq-retain/bifromq-retain-rpc-definition/src/main/proto/retainservice/RetainService.proto index 4d4db8fd6..8b99fbb03 100644 --- a/bifromq-retain/bifromq-retain-rpc-definition/src/main/proto/retainservice/RetainService.proto +++ b/bifromq-retain/bifromq-retain-rpc-definition/src/main/proto/retainservice/RetainService.proto @@ -4,7 +4,7 @@ import "commontype/MatchInfo.proto"; import "commontype/TopicMessage.proto"; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.retain.rpc.proto"; +option java_package = "org.apache.bifromq.retain.rpc.proto"; option java_outer_classname = "RetainServiceProtos"; package retainservice; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/IRetainServer.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/IRetainServer.java similarity index 94% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/IRetainServer.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/IRetainServer.java index 2167502da..402506dc1 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/IRetainServer.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/IRetainServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server; +package org.apache.bifromq.retain.server; public interface IRetainServer { static RetainServerBuilder builder() { diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServer.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainServer.java similarity index 83% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServer.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainServer.java index b5600c892..a506d2c20 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServer.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainServer.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server; +package org.apache.bifromq.retain.server; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.deliverer.BatchDeliveryCallBuilderFactory; -import com.baidu.bifromq.deliverer.MessageDeliverer; -import com.baidu.bifromq.retain.RPCBluePrint; -import com.baidu.bifromq.retain.server.scheduler.DeleteCallScheduler; -import com.baidu.bifromq.retain.server.scheduler.MatchCallScheduler; -import com.baidu.bifromq.retain.server.scheduler.RetainCallScheduler; -import com.baidu.bifromq.retain.store.gc.RetainStoreGCProcessor; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.deliverer.BatchDeliveryCallBuilderFactory; +import org.apache.bifromq.deliverer.MessageDeliverer; +import org.apache.bifromq.retain.RPCBluePrint; +import org.apache.bifromq.retain.server.scheduler.DeleteCallScheduler; +import org.apache.bifromq.retain.server.scheduler.MatchCallScheduler; +import org.apache.bifromq.retain.server.scheduler.RetainCallScheduler; +import org.apache.bifromq.retain.store.gc.RetainStoreGCProcessor; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServerBuilder.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainServerBuilder.java similarity index 81% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServerBuilder.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainServerBuilder.java index 701f46864..44af8ea6e 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainServerBuilder.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainServerBuilder.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server; +package org.apache.bifromq.retain.server; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.HashSet; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainService.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainService.java similarity index 84% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainService.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainService.java index 11d5b2abc..0be19cde6 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/RetainService.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/RetainService.java @@ -11,34 +11,34 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server; +package org.apache.bifromq.retain.server; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.baserpc.server.UnaryResponse.response; -import static com.baidu.bifromq.deliverer.DeliveryCallResult.OK; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainMatchedBytes; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.baserpc.server.UnaryResponse.response; +import static org.apache.bifromq.deliverer.DeliveryCallResult.OK; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainMatchedBytes; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basescheduler.exception.BackPressureException; -import com.baidu.bifromq.basescheduler.exception.BatcherUnavailableException; -import com.baidu.bifromq.deliverer.DeliveryCall; -import com.baidu.bifromq.deliverer.DeliveryCallResult; -import com.baidu.bifromq.deliverer.IMessageDeliverer; -import com.baidu.bifromq.deliverer.TopicMessagePackHolder; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllReply; -import com.baidu.bifromq.retain.rpc.proto.ExpireAllRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceGrpc; -import com.baidu.bifromq.retain.server.scheduler.IMatchCallScheduler; -import com.baidu.bifromq.retain.server.scheduler.IRetainCallScheduler; -import com.baidu.bifromq.retain.server.scheduler.MatchRetainedRequest; -import com.baidu.bifromq.retain.store.gc.IRetainStoreGCProcessor; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basescheduler.exception.BackPressureException; +import org.apache.bifromq.basescheduler.exception.BatcherUnavailableException; +import org.apache.bifromq.deliverer.DeliveryCall; +import org.apache.bifromq.deliverer.DeliveryCallResult; +import org.apache.bifromq.deliverer.IMessageDeliverer; +import org.apache.bifromq.deliverer.TopicMessagePackHolder; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.retain.rpc.proto.ExpireAllReply; +import org.apache.bifromq.retain.rpc.proto.ExpireAllRequest; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchRequest; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.retain.rpc.proto.RetainServiceGrpc; +import org.apache.bifromq.retain.server.scheduler.IMatchCallScheduler; +import org.apache.bifromq.retain.server.scheduler.IRetainCallScheduler; +import org.apache.bifromq.retain.server.scheduler.MatchRetainedRequest; +import org.apache.bifromq.retain.store.gc.IRetainStoreGCProcessor; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.TopicMessagePack; import io.grpc.stub.StreamObserver; import java.util.List; import java.util.Objects; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchCall.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchMatchCall.java similarity index 78% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchCall.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchMatchCall.java index 34585b291..636d52f5a 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchCall.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchMatchCall.java @@ -11,36 +11,36 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import static com.baidu.bifromq.base.util.CompletableFutureUtil.unwrap; -import static com.baidu.bifromq.retain.rpc.proto.MatchReply.Result.OK; -import static com.baidu.bifromq.retain.server.scheduler.BatchMatchCallHelper.parallelMatch; -import static com.baidu.bifromq.retain.server.scheduler.BatchMatchCallHelper.serialMatch; -import static com.baidu.bifromq.retain.server.scheduler.MatchCallRangeRouter.rangeLookup; -import static com.baidu.bifromq.util.TopicUtil.isWildcardTopicFilter; +import static org.apache.bifromq.base.util.CompletableFutureUtil.unwrap; +import static org.apache.bifromq.retain.rpc.proto.MatchReply.Result.OK; +import static org.apache.bifromq.retain.server.scheduler.BatchMatchCallHelper.parallelMatch; +import static org.apache.bifromq.retain.server.scheduler.BatchMatchCallHelper.serialMatch; +import static org.apache.bifromq.retain.server.scheduler.MatchCallRangeRouter.rangeLookup; +import static org.apache.bifromq.util.TopicUtil.isWildcardTopicFilter; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.client.exception.BadRequestException; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.InternalErrorException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.retain.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.retain.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchParam; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceROCoProcInput; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.client.exception.BadRequestException; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.InternalErrorException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.retain.rpc.proto.BatchMatchReply; +import org.apache.bifromq.retain.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.retain.rpc.proto.MatchParam; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.retain.rpc.proto.RetainServiceROCoProcInput; import java.util.ArrayDeque; import java.util.Collections; import java.util.HashMap; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchCallHelper.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchMatchCallHelper.java similarity index 96% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchCallHelper.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchMatchCallHelper.java index 53fc60cca..1b39bef71 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchCallHelper.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchMatchCallHelper.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.type.TopicMessage; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCall.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCall.java similarity index 83% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCall.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCall.java index 225156df2..88426c3ff 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCall.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCall.java @@ -11,21 +11,21 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.basekv.client.IMutationPipeline; -import com.baidu.bifromq.basekv.client.exception.BadVersionException; -import com.baidu.bifromq.basekv.client.exception.TryLaterException; -import com.baidu.bifromq.basekv.client.scheduler.BatchMutationCall; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallBatcherKey; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.baserpc.client.exception.ServerNotFoundException; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; +import org.apache.bifromq.basekv.client.IMutationPipeline; +import org.apache.bifromq.basekv.client.exception.BadVersionException; +import org.apache.bifromq.basekv.client.exception.TryLaterException; +import org.apache.bifromq.basekv.client.scheduler.BatchMutationCall; +import org.apache.bifromq.basekv.client.scheduler.MutationCallBatcherKey; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.baserpc.client.exception.ServerNotFoundException; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; import com.google.common.collect.Iterables; import java.util.Iterator; import java.util.Map; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCallHelper.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCallHelper.java similarity index 85% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCallHelper.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCallHelper.java index 3ea523f64..03f587522 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCallHelper.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCallHelper.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.retain.rpc.proto.BatchRetainRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainMessage; -import com.baidu.bifromq.retain.rpc.proto.RetainParam; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.retain.rpc.proto.BatchRetainRequest; +import org.apache.bifromq.retain.rpc.proto.RetainMessage; +import org.apache.bifromq.retain.rpc.proto.RetainParam; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/DeleteCallScheduler.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/DeleteCallScheduler.java similarity index 72% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/DeleteCallScheduler.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/DeleteCallScheduler.java index a31a56c85..2223b7450 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/DeleteCallScheduler.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/DeleteCallScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/IMatchCallScheduler.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/IMatchCallScheduler.java similarity index 86% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/IMatchCallScheduler.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/IMatchCallScheduler.java index ce2fedae6..8189dce1a 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/IMatchCallScheduler.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/IMatchCallScheduler.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; public interface IMatchCallScheduler extends IBatchCallScheduler { } diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/IRetainCallScheduler.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/IRetainCallScheduler.java similarity index 76% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/IRetainCallScheduler.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/IRetainCallScheduler.java index a4c1fec96..35e154ca3 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/IRetainCallScheduler.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/IRetainCallScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; public interface IRetainCallScheduler extends IBatchCallScheduler { } diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallBatcherKey.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallBatcherKey.java similarity index 93% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallBatcherKey.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallBatcherKey.java index 09f0e75bf..b31d94890 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallBatcherKey.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallBatcherKey.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; public record MatchCallBatcherKey(String tenantId, int queueId) { diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallRangeRouter.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallRangeRouter.java similarity index 79% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallRangeRouter.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallRangeRouter.java index 14d9b24e4..9f45ec92d 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallRangeRouter.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallRangeRouter.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compare; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.compareStartKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.endKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.startKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.filterPrefix; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.parseLevelHash; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainKeyPrefix; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.util.TopicUtil.isMultiWildcardTopicFilter; -import static com.baidu.bifromq.util.TopicUtil.isNormalTopicFilter; -import static com.baidu.bifromq.util.TopicUtil.isWildcardTopicFilter; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compare; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareEndKeys; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.compareStartKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.endKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.startKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.filterPrefix; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.parseLevelHash; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainKeyPrefix; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.util.TopicUtil.isMultiWildcardTopicFilter; +import static org.apache.bifromq.util.TopicUtil.isNormalTopicFilter; +import static org.apache.bifromq.util.TopicUtil.isWildcardTopicFilter; +import static org.apache.bifromq.util.TopicUtil.parse; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.retain.store.schema.KVSchemaUtil; -import com.baidu.bifromq.retain.store.schema.LevelHash; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.retain.store.schema.KVSchemaUtil; +import org.apache.bifromq.retain.store.schema.LevelHash; import com.google.protobuf.ByteString; import java.util.ArrayList; import java.util.Collection; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallScheduler.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallScheduler.java similarity index 81% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallScheduler.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallScheduler.java index e119a2fad..ffb122fd8 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchCallScheduler.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchCallScheduler.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import java.time.Duration; import java.util.Optional; diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedRequest.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedRequest.java similarity index 93% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedRequest.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedRequest.java index 59c34e973..672d486be 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedRequest.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedRequest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; public record MatchRetainedRequest(String tenantId, String topicFilter, int limit) { } diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedResult.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedResult.java similarity index 83% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedResult.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedResult.java index 57c55d040..576a9f991 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedResult.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedResult.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.type.TopicMessage; import java.util.List; public record MatchRetainedResult(MatchReply.Result result, List retainMessages) { diff --git a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/RetainCallScheduler.java b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/RetainCallScheduler.java similarity index 73% rename from bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/RetainCallScheduler.java rename to bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/RetainCallScheduler.java index 63eba0790..cb1f6713f 100644 --- a/bifromq-retain/bifromq-retain-server/src/main/java/com/baidu/bifromq/retain/server/scheduler/RetainCallScheduler.java +++ b/bifromq-retain/bifromq-retain-server/src/main/java/org/apache/bifromq/retain/server/scheduler/RetainCallScheduler.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.scheduler.MutationCallScheduler; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.scheduler.MutationCallScheduler; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; import com.google.protobuf.ByteString; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/RetainServiceTest.java b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/RetainServiceTest.java similarity index 91% rename from bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/RetainServiceTest.java rename to bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/RetainServiceTest.java index 25dde90d8..ccbd7ebbe 100644 --- a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/RetainServiceTest.java +++ b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/RetainServiceTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server; +package org.apache.bifromq.retain.server; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -21,25 +21,25 @@ import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; -import com.baidu.bifromq.deliverer.DeliveryCall; -import com.baidu.bifromq.deliverer.DeliveryCallResult; -import com.baidu.bifromq.deliverer.IMessageDeliverer; -import com.baidu.bifromq.retain.rpc.proto.MatchReply; -import com.baidu.bifromq.retain.rpc.proto.MatchRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainReply; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.retain.server.scheduler.IMatchCallScheduler; -import com.baidu.bifromq.retain.server.scheduler.IRetainCallScheduler; -import com.baidu.bifromq.retain.server.scheduler.MatchRetainedResult; -import com.baidu.bifromq.retain.store.gc.IRetainStoreGCProcessor; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.MatchInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessage; -import com.baidu.bifromq.util.TopicUtil; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; +import org.apache.bifromq.deliverer.DeliveryCall; +import org.apache.bifromq.deliverer.DeliveryCallResult; +import org.apache.bifromq.deliverer.IMessageDeliverer; +import org.apache.bifromq.retain.rpc.proto.MatchReply; +import org.apache.bifromq.retain.rpc.proto.MatchRequest; +import org.apache.bifromq.retain.rpc.proto.RetainReply; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.retain.server.scheduler.IMatchCallScheduler; +import org.apache.bifromq.retain.server.scheduler.IRetainCallScheduler; +import org.apache.bifromq.retain.server.scheduler.MatchRetainedResult; +import org.apache.bifromq.retain.store.gc.IRetainStoreGCProcessor; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.MatchInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessage; +import org.apache.bifromq.util.TopicUtil; import com.google.protobuf.ByteString; import io.grpc.Context; import io.grpc.stub.StreamObserver; diff --git a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java similarity index 94% rename from bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java rename to bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java index 9fb39eeee..452c14093 100644 --- a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java +++ b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/BatchMatchRetainedRequestHelperTest.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import static com.baidu.bifromq.retain.server.scheduler.BatchMatchCallHelper.parallelMatch; +import static org.apache.bifromq.retain.server.scheduler.BatchMatchCallHelper.parallelMatch; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.eq; @@ -23,11 +23,11 @@ import static org.mockito.MockitoAnnotations.openMocks; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessage; import com.google.protobuf.ByteString; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java similarity index 90% rename from bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java rename to bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java index 1464a8c34..d80b5e3e9 100644 --- a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java +++ b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/BatchRetainCallHelperTest.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.retain.rpc.proto.BatchRetainRequest; -import com.baidu.bifromq.retain.rpc.proto.RetainMessage; -import com.baidu.bifromq.retain.rpc.proto.RetainParam; -import com.baidu.bifromq.retain.rpc.proto.RetainRequest; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; +import org.apache.bifromq.retain.rpc.proto.BatchRetainRequest; +import org.apache.bifromq.retain.rpc.proto.RetainMessage; +import org.apache.bifromq.retain.rpc.proto.RetainParam; +import org.apache.bifromq.retain.rpc.proto.RetainRequest; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; diff --git a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java similarity index 89% rename from bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java rename to bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java index c31b32cbc..8d87a4d6f 100644 --- a/bifromq-retain/bifromq-retain-server/src/test/java/com/baidu/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java +++ b/bifromq-retain/bifromq-retain-server/src/test/java/org/apache/bifromq/retain/server/scheduler/MatchRetainedRequestRangeRouterTest.java @@ -11,20 +11,20 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.server.scheduler; +package org.apache.bifromq.retain.server.scheduler; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.inRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.split; -import static com.baidu.bifromq.retain.server.scheduler.MatchCallRangeRouter.rangeLookup; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.inRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.split; +import static org.apache.bifromq.retain.server.scheduler.MatchCallRangeRouter.rangeLookup; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeDescriptor; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeDescriptor; +import org.apache.bifromq.basekv.utils.BoundaryUtil; import com.google.protobuf.ByteString; import java.util.Iterator; import java.util.Map; diff --git a/bifromq-retain/bifromq-retain-store-schema/src/main/java/com/baidu/bifromq/retain/store/schema/KVSchemaUtil.java b/bifromq-retain/bifromq-retain-store-schema/src/main/java/org/apache/bifromq/retain/store/schema/KVSchemaUtil.java similarity index 89% rename from bifromq-retain/bifromq-retain-store-schema/src/main/java/com/baidu/bifromq/retain/store/schema/KVSchemaUtil.java rename to bifromq-retain/bifromq-retain-store-schema/src/main/java/org/apache/bifromq/retain/store/schema/KVSchemaUtil.java index 36d118e7e..e94763dc5 100644 --- a/bifromq-retain/bifromq-retain-store-schema/src/main/java/com/baidu/bifromq/retain/store/schema/KVSchemaUtil.java +++ b/bifromq-retain/bifromq-retain-store-schema/src/main/java/org/apache/bifromq/retain/store/schema/KVSchemaUtil.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.schema; +package org.apache.bifromq.retain.store.schema; -import static com.baidu.bifromq.util.BSUtil.toByteString; -import static com.baidu.bifromq.util.BSUtil.toShort; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; -import static com.baidu.bifromq.util.TopicUtil.escape; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.util.BSUtil.toByteString; +import static org.apache.bifromq.util.BSUtil.toShort; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicUtil.escape; +import static org.apache.bifromq.util.TopicUtil.parse; import static com.google.protobuf.ByteString.copyFromUtf8; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; diff --git a/bifromq-retain/bifromq-retain-store-schema/src/main/java/com/baidu/bifromq/retain/store/schema/LevelHash.java b/bifromq-retain/bifromq-retain-store-schema/src/main/java/org/apache/bifromq/retain/store/schema/LevelHash.java similarity index 96% rename from bifromq-retain/bifromq-retain-store-schema/src/main/java/com/baidu/bifromq/retain/store/schema/LevelHash.java rename to bifromq-retain/bifromq-retain-store-schema/src/main/java/org/apache/bifromq/retain/store/schema/LevelHash.java index 604232afd..4752374ef 100644 --- a/bifromq-retain/bifromq-retain-store-schema/src/main/java/com/baidu/bifromq/retain/store/schema/LevelHash.java +++ b/bifromq-retain/bifromq-retain-store-schema/src/main/java/org/apache/bifromq/retain/store/schema/LevelHash.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.schema; +package org.apache.bifromq.retain.store.schema; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; diff --git a/bifromq-retain/bifromq-retain-store-schema/src/test/java/com/baidu/bifromq/retain/store/schema/KVSchemaUtilTest.java b/bifromq-retain/bifromq-retain-store-schema/src/test/java/org/apache/bifromq/retain/store/schema/KVSchemaUtilTest.java similarity index 87% rename from bifromq-retain/bifromq-retain-store-schema/src/test/java/com/baidu/bifromq/retain/store/schema/KVSchemaUtilTest.java rename to bifromq-retain/bifromq-retain-store-schema/src/test/java/org/apache/bifromq/retain/store/schema/KVSchemaUtilTest.java index 441968c90..1d18f0d7f 100644 --- a/bifromq-retain/bifromq-retain-store-schema/src/test/java/com/baidu/bifromq/retain/store/schema/KVSchemaUtilTest.java +++ b/bifromq-retain/bifromq-retain-store-schema/src/test/java/org/apache/bifromq/retain/store/schema/KVSchemaUtilTest.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.schema; - -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.filterPrefix; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.parseTenantId; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainKeyPrefix; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.util.BSUtil.toByteString; -import static com.baidu.bifromq.util.TopicUtil.isMultiWildcardTopicFilter; -import static com.baidu.bifromq.util.TopicUtil.parse; +package org.apache.bifromq.retain.store.schema; + +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.filterPrefix; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.parseTenantId; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainKeyPrefix; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.util.BSUtil.toByteString; +import static org.apache.bifromq.util.TopicUtil.isMultiWildcardTopicFilter; +import static org.apache.bifromq.util.TopicUtil.parse; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; diff --git a/bifromq-retain/bifromq-retain-store-schema/src/test/java/com/baidu/bifromq/retain/store/schema/LevelHashTest.java b/bifromq-retain/bifromq-retain-store-schema/src/test/java/org/apache/bifromq/retain/store/schema/LevelHashTest.java similarity index 95% rename from bifromq-retain/bifromq-retain-store-schema/src/test/java/com/baidu/bifromq/retain/store/schema/LevelHashTest.java rename to bifromq-retain/bifromq-retain-store-schema/src/test/java/org/apache/bifromq/retain/store/schema/LevelHashTest.java index f0f334e55..a55ad3e08 100644 --- a/bifromq-retain/bifromq-retain-store-schema/src/test/java/com/baidu/bifromq/retain/store/schema/LevelHashTest.java +++ b/bifromq-retain/bifromq-retain-store-schema/src/test/java/org/apache/bifromq/retain/store/schema/LevelHashTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.schema; +package org.apache.bifromq.retain.store.schema; import static org.testng.Assert.assertEquals; diff --git a/bifromq-retain/bifromq-retain-store-spi/src/main/java/com/baidu/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java b/bifromq-retain/bifromq-retain-store-spi/src/main/java/org/apache/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java similarity index 88% rename from bifromq-retain/bifromq-retain-store-spi/src/main/java/com/baidu/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java rename to bifromq-retain/bifromq-retain-store-spi/src/main/java/org/apache/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java index d24f9a5d2..04d6542f8 100644 --- a/bifromq-retain/bifromq-retain-store-spi/src/main/java/com/baidu/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java +++ b/bifromq-retain/bifromq-retain-store-spi/src/main/java/org/apache/bifromq/retain/store/spi/IRetainStoreBalancerFactory.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.spi; +package org.apache.bifromq.retain.store.spi; -import com.baidu.bifromq.basekv.balance.IStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.IStoreBalancerFactory; import com.google.protobuf.Struct; public interface IRetainStoreBalancerFactory extends IStoreBalancerFactory { diff --git a/bifromq-retain/bifromq-retain-store-spi/src/main/java/com/baidu/bifromq/retain/store/spi/SplitKey.java b/bifromq-retain/bifromq-retain-store-spi/src/main/java/org/apache/bifromq/retain/store/spi/SplitKey.java similarity index 81% rename from bifromq-retain/bifromq-retain-store-spi/src/main/java/com/baidu/bifromq/retain/store/spi/SplitKey.java rename to bifromq-retain/bifromq-retain-store-spi/src/main/java/org/apache/bifromq/retain/store/spi/SplitKey.java index 835206a71..86a654de1 100644 --- a/bifromq-retain/bifromq-retain-store-spi/src/main/java/com/baidu/bifromq/retain/store/spi/SplitKey.java +++ b/bifromq-retain/bifromq-retain-store-spi/src/main/java/org/apache/bifromq/retain/store/spi/SplitKey.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.spi; +package org.apache.bifromq.retain.store.spi; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.filterPrefix; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainKeyPrefix; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.filterPrefix; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainKeyPrefix; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.util.TopicUtil.parse; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; -import com.baidu.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.Boundary; import com.google.protobuf.ByteString; import java.util.List; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/IRetainStore.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/IRetainStore.java similarity index 95% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/IRetainStore.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/IRetainStore.java index 31e9061a4..8ae28bd4b 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/IRetainStore.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/IRetainStore.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; public interface IRetainStore { String CLUSTER_NAME = "retain.store"; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainMatcher.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainMatcher.java similarity index 98% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainMatcher.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainMatcher.java index 76bed5c11..8def5cacf 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainMatcher.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainMatcher.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import java.util.List; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStore.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStore.java similarity index 91% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStore.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStore.java index b37d70344..fefb13421 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStore.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStore.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import com.baidu.bifromq.base.util.AsyncRunner; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basehookloader.BaseHookLoader; -import com.baidu.bifromq.basekv.balance.KVStoreBalanceController; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.server.IBaseKVStoreServer; -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.retain.store.gc.IRetainStoreGCProcessor; -import com.baidu.bifromq.retain.store.gc.RetainStoreGCProcessor; -import com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory; +import org.apache.bifromq.base.util.AsyncRunner; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basehookloader.BaseHookLoader; +import org.apache.bifromq.basekv.balance.KVStoreBalanceController; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.server.IBaseKVStoreServer; +import org.apache.bifromq.baserpc.client.IConnectable; +import org.apache.bifromq.retain.store.gc.IRetainStoreGCProcessor; +import org.apache.bifromq.retain.store.gc.RetainStoreGCProcessor; +import org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreBuilder.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreBuilder.java similarity index 84% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreBuilder.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreBuilder.java index 81b9b0c81..df490bdd1 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreBuilder.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreBuilder.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; import com.google.protobuf.Struct; import java.time.Duration; import java.util.HashMap; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreCoProc.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreCoProc.java similarity index 85% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreCoProc.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreCoProc.java index 5f07f5ac6..fc35c82a6 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreCoProc.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreCoProc.java @@ -11,44 +11,44 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.parseTenantId; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.parseTenantId; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.retainMessageKey; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; import static java.util.Collections.emptyList; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVIterator; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.basekv.store.api.IKVWriter; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ROCoProcOutput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcOutput; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; -import com.baidu.bifromq.retain.rpc.proto.BatchMatchReply; -import com.baidu.bifromq.retain.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.retain.rpc.proto.BatchRetainReply; -import com.baidu.bifromq.retain.rpc.proto.BatchRetainRequest; -import com.baidu.bifromq.retain.rpc.proto.GCReply; -import com.baidu.bifromq.retain.rpc.proto.GCRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.retain.rpc.proto.MatchResultPack; -import com.baidu.bifromq.retain.rpc.proto.RetainMessage; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceROCoProcInput; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceROCoProcOutput; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceRWCoProcOutput; -import com.baidu.bifromq.retain.store.index.RetainTopicIndex; -import com.baidu.bifromq.retain.store.index.RetainedMsgInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVIterator; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVWriter; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.ROCoProcOutput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcOutput; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.retain.rpc.proto.BatchMatchReply; +import org.apache.bifromq.retain.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.retain.rpc.proto.BatchRetainReply; +import org.apache.bifromq.retain.rpc.proto.BatchRetainRequest; +import org.apache.bifromq.retain.rpc.proto.GCReply; +import org.apache.bifromq.retain.rpc.proto.GCRequest; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.retain.rpc.proto.MatchResultPack; +import org.apache.bifromq.retain.rpc.proto.RetainMessage; +import org.apache.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.retain.rpc.proto.RetainServiceROCoProcInput; +import org.apache.bifromq.retain.rpc.proto.RetainServiceROCoProcOutput; +import org.apache.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; +import org.apache.bifromq.retain.rpc.proto.RetainServiceRWCoProcOutput; +import org.apache.bifromq.retain.store.index.RetainTopicIndex; +import org.apache.bifromq.retain.store.index.RetainedMsgInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessage; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreCoProcFactory.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreCoProcFactory.java similarity index 79% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreCoProcFactory.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreCoProcFactory.java index 5458d283c..aa8cfbd35 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/RetainStoreCoProcFactory.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/RetainStoreCoProcFactory.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import com.baidu.bifromq.basekv.proto.KVRangeId; -import com.baidu.bifromq.basekv.store.api.IKVCloseableReader; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProc; -import com.baidu.bifromq.basekv.store.api.IKVRangeCoProcFactory; -import com.baidu.bifromq.basekv.store.api.IKVRangeSplitHinter; -import com.baidu.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; -import com.baidu.bifromq.basekv.utils.KVRangeIdUtil; +import org.apache.bifromq.basekv.proto.KVRangeId; +import org.apache.bifromq.basekv.store.api.IKVCloseableReader; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProc; +import org.apache.bifromq.basekv.store.api.IKVRangeCoProcFactory; +import org.apache.bifromq.basekv.store.api.IKVRangeSplitHinter; +import org.apache.bifromq.basekv.store.range.hinter.MutationKVLoadBasedSplitHinter; +import org.apache.bifromq.basekv.utils.KVRangeIdUtil; import java.time.Duration; import java.util.Collections; import java.util.List; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/TenantRetainedSet.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/TenantRetainedSet.java similarity index 71% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/TenantRetainedSet.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/TenantRetainedSet.java index b579aa1ba..72c4bceca 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/TenantRetainedSet.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/TenantRetainedSet.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.isNULLRange; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainNumGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainSpaceGauge; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.isNULLRange; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainSpaceGauge; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; -import com.baidu.bifromq.basekv.proto.Boundary; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.basekv.proto.Boundary; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.metrics.ITenantMeter; import com.google.protobuf.ByteString; import java.util.concurrent.atomic.AtomicLong; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/TenantsState.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/TenantsState.java similarity index 94% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/TenantsState.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/TenantsState.java index 46d72511f..a72a3b09f 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/TenantsState.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/TenantsState.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import com.baidu.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.basekv.store.api.IKVReader; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java similarity index 78% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java index e95d656ce..022e02187 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/RangeLeaderBalancerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.balance; +package org.apache.bifromq.retain.store.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.RangeLeaderBalancer; -import com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.RangeLeaderBalancer; +import org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory; public class RangeLeaderBalancerFactory implements IRetainStoreBalancerFactory { @Override diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/RangeSplitBalancerFactory.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/RangeSplitBalancerFactory.java similarity index 92% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/RangeSplitBalancerFactory.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/RangeSplitBalancerFactory.java index d3f83f179..e55d47567 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/RangeSplitBalancerFactory.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/RangeSplitBalancerFactory.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.balance; +package org.apache.bifromq.retain.store.balance; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.RangeSplitBalancer; -import com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.RangeSplitBalancer; +import org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory; import com.google.protobuf.Struct; import com.google.protobuf.Value; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java similarity index 90% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java index cd8493dc0..e4aa00aff 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/balance/ReplicaCntBalancerFactory.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.balance; +package org.apache.bifromq.retain.store.balance; -import com.baidu.bifromq.basekv.balance.StoreBalancer; -import com.baidu.bifromq.basekv.balance.impl.ReplicaCntBalancer; -import com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory; +import org.apache.bifromq.basekv.balance.StoreBalancer; +import org.apache.bifromq.basekv.balance.impl.ReplicaCntBalancer; +import org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory; import com.google.protobuf.Struct; import com.google.protobuf.Value; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/IRetainTopicIndex.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/IRetainTopicIndex.java similarity index 95% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/IRetainTopicIndex.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/IRetainTopicIndex.java index 0ef2907f8..536b6dbc6 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/IRetainTopicIndex.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/IRetainTopicIndex.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.index; +package org.apache.bifromq.retain.store.index; import java.util.Set; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/RetainTopicIndex.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/RetainTopicIndex.java similarity index 94% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/RetainTopicIndex.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/RetainTopicIndex.java index e8fe3ca90..bbbbebf87 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/RetainTopicIndex.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/RetainTopicIndex.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.index; +package org.apache.bifromq.retain.store.index; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.SYS_PREFIX; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD; +import static org.apache.bifromq.util.TopicConst.SYS_PREFIX; -import com.baidu.bifromq.util.TopicUtil; -import com.baidu.bifromq.util.index.Branch; -import com.baidu.bifromq.util.index.TopicLevelTrie; +import org.apache.bifromq.util.TopicUtil; +import org.apache.bifromq.util.index.Branch; +import org.apache.bifromq.util.index.TopicLevelTrie; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/RetainedMsgInfo.java b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/RetainedMsgInfo.java similarity index 95% rename from bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/RetainedMsgInfo.java rename to bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/RetainedMsgInfo.java index e43ebd554..1fcab91d9 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/index/RetainedMsgInfo.java +++ b/bifromq-retain/bifromq-retain-store/src/main/java/org/apache/bifromq/retain/store/index/RetainedMsgInfo.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.index; +package org.apache.bifromq.retain.store.index; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory b/bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory similarity index 77% rename from bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory rename to bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory index 3bfcdfa34..933455693 100644 --- a/bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/com.baidu.bifromq.retain.store.spi.IRetainStoreBalancerFactory +++ b/bifromq-retain/bifromq-retain-store/src/main/resources/META-INF/services/org.apache.bifromq.retain.store.spi.IRetainStoreBalancerFactory @@ -12,6 +12,6 @@ # # DO NOT enable recovery balancer if range split balancer is enabled -com.baidu.bifromq.retain.store.balance.ReplicaCntBalancerFactory -com.baidu.bifromq.retain.store.balance.RangeLeaderBalancerFactory -com.baidu.bifromq.retain.store.balance.RangeSplitBalancerFactory +org.apache.bifromq.retain.store.balance.ReplicaCntBalancerFactory +org.apache.bifromq.retain.store.balance.RangeLeaderBalancerFactory +org.apache.bifromq.retain.store.balance.RangeSplitBalancerFactory diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/DeleteBehaviorTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/DeleteBehaviorTest.java similarity index 92% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/DeleteBehaviorTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/DeleteBehaviorTest.java index cd4a4b8f3..4d859611b 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/DeleteBehaviorTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/DeleteBehaviorTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.retain.rpc.proto.RetainResult; import org.testng.annotations.Test; public class DeleteBehaviorTest extends RetainStoreTest { diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/GCTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/GCTest.java similarity index 95% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/GCTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/GCTest.java index de49b1003..432e764a0 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/GCTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/GCTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.type.TopicMessage; import io.micrometer.core.instrument.Gauge; import java.time.Duration; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/LoadMetadataTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/LoadMetadataTest.java similarity index 95% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/LoadMetadataTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/LoadMetadataTest.java index 9ceb4fd76..e960b1b39 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/LoadMetadataTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/LoadMetadataTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertNotSame; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.basekv.utils.BoundaryUtil; import io.micrometer.core.instrument.Gauge; import java.time.Duration; import org.testng.annotations.BeforeMethod; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/ReplaceBehaviorTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/ReplaceBehaviorTest.java similarity index 88% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/ReplaceBehaviorTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/ReplaceBehaviorTest.java index 51b7f013e..53e429fc5 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/ReplaceBehaviorTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/ReplaceBehaviorTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.type.TopicMessage; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainBehaviorTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainBehaviorTest.java similarity index 87% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainBehaviorTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainBehaviorTest.java index d664505e6..98f92b8a6 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainBehaviorTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainBehaviorTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.type.TopicMessage; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainMatchTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainMatchTest.java similarity index 97% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainMatchTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainMatchTest.java index 3e436e036..4a5e4dd69 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainMatchTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainMatchTest.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static com.google.common.collect.Sets.newHashSet; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.type.TopicMessage; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainMatcherTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainMatcherTest.java similarity index 87% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainMatcherTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainMatcherTest.java index 5940652fa..1f53d7513 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainMatcherTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainMatcherTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import static com.baidu.bifromq.retain.store.RetainMatcher.MatchResult.MATCHED_AND_CONTINUE; -import static com.baidu.bifromq.retain.store.RetainMatcher.MatchResult.MATCHED_AND_STOP; -import static com.baidu.bifromq.retain.store.RetainMatcher.MatchResult.MISMATCH_AND_CONTINUE; -import static com.baidu.bifromq.retain.store.RetainMatcher.MatchResult.MISMATCH_AND_STOP; -import static com.baidu.bifromq.retain.store.RetainMatcher.match; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.retain.store.RetainMatcher.MatchResult.MATCHED_AND_CONTINUE; +import static org.apache.bifromq.retain.store.RetainMatcher.MatchResult.MATCHED_AND_STOP; +import static org.apache.bifromq.retain.store.RetainMatcher.MatchResult.MISMATCH_AND_CONTINUE; +import static org.apache.bifromq.retain.store.RetainMatcher.MatchResult.MISMATCH_AND_STOP; +import static org.apache.bifromq.retain.store.RetainMatcher.match; +import static org.apache.bifromq.util.TopicUtil.parse; import static org.testng.Assert.assertEquals; import lombok.extern.slf4j.Slf4j; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainStoreTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainStoreTest.java similarity index 81% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainStoreTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainStoreTest.java index 1f6f0e455..df0097c0d 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/RetainStoreTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/RetainStoreTest.java @@ -11,58 +11,58 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; -import static com.baidu.bifromq.basekv.client.KVRangeRouterUtil.findByKey; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainNumGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainSpaceGauge; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByBoundary; +import static org.apache.bifromq.basekv.client.KVRangeRouterUtil.findByKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainNumGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainSpaceGauge; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.basehlc.HLC; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.client.KVRangeSetting; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.basekv.store.proto.KVRangeROReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRORequest; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWReply; -import com.baidu.bifromq.basekv.store.proto.KVRangeRWRequest; -import com.baidu.bifromq.basekv.store.proto.ROCoProcInput; -import com.baidu.bifromq.basekv.store.proto.RWCoProcInput; -import com.baidu.bifromq.basekv.store.proto.ReplyCode; -import com.baidu.bifromq.basekv.utils.BoundaryUtil; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.retain.rpc.proto.BatchMatchRequest; -import com.baidu.bifromq.retain.rpc.proto.BatchRetainRequest; -import com.baidu.bifromq.retain.rpc.proto.GCReply; -import com.baidu.bifromq.retain.rpc.proto.GCRequest; -import com.baidu.bifromq.retain.rpc.proto.MatchParam; -import com.baidu.bifromq.retain.rpc.proto.MatchResult; -import com.baidu.bifromq.retain.rpc.proto.RetainMessage; -import com.baidu.bifromq.retain.rpc.proto.RetainParam; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceROCoProcInput; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceROCoProcOutput; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; -import com.baidu.bifromq.retain.rpc.proto.RetainServiceRWCoProcOutput; -import com.baidu.bifromq.retain.store.schema.KVSchemaUtil; -import com.baidu.bifromq.type.ClientInfo; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.basehlc.HLC; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.client.KVRangeSetting; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.basekv.store.proto.KVRangeROReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRORequest; +import org.apache.bifromq.basekv.store.proto.KVRangeRWReply; +import org.apache.bifromq.basekv.store.proto.KVRangeRWRequest; +import org.apache.bifromq.basekv.store.proto.ROCoProcInput; +import org.apache.bifromq.basekv.store.proto.RWCoProcInput; +import org.apache.bifromq.basekv.store.proto.ReplyCode; +import org.apache.bifromq.basekv.utils.BoundaryUtil; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.retain.rpc.proto.BatchMatchRequest; +import org.apache.bifromq.retain.rpc.proto.BatchRetainRequest; +import org.apache.bifromq.retain.rpc.proto.GCReply; +import org.apache.bifromq.retain.rpc.proto.GCRequest; +import org.apache.bifromq.retain.rpc.proto.MatchParam; +import org.apache.bifromq.retain.rpc.proto.MatchResult; +import org.apache.bifromq.retain.rpc.proto.RetainMessage; +import org.apache.bifromq.retain.rpc.proto.RetainParam; +import org.apache.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.retain.rpc.proto.RetainServiceROCoProcInput; +import org.apache.bifromq.retain.rpc.proto.RetainServiceROCoProcOutput; +import org.apache.bifromq.retain.rpc.proto.RetainServiceRWCoProcInput; +import org.apache.bifromq.retain.rpc.proto.RetainServiceRWCoProcOutput; +import org.apache.bifromq.retain.store.schema.KVSchemaUtil; +import org.apache.bifromq.type.ClientInfo; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessage; import com.google.protobuf.ByteString; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/StatsTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/StatsTest.java similarity index 88% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/StatsTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/StatsTest.java index 56071d8f5..cb17c3b87 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/StatsTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/StatsTest.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import static com.baidu.bifromq.metrics.TenantMetric.MqttRetainSpaceGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttRetainSpaceGauge; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertEquals; -import com.baidu.bifromq.retain.rpc.proto.RetainResult; -import com.baidu.bifromq.type.TopicMessage; +import org.apache.bifromq.retain.rpc.proto.RetainResult; +import org.apache.bifromq.type.TopicMessage; import io.micrometer.core.instrument.Meter; import lombok.SneakyThrows; import org.testng.annotations.BeforeMethod; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/TenantRetainSetTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/TenantRetainSetTest.java similarity index 83% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/TenantRetainSetTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/TenantRetainSetTest.java index f20611f4b..68fdbeefa 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/TenantRetainSetTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/TenantRetainSetTest.java @@ -11,22 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.intersect; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.toBoundary; -import static com.baidu.bifromq.basekv.utils.BoundaryUtil.upperBound; -import static com.baidu.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.FULL_BOUNDARY; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.intersect; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.toBoundary; +import static org.apache.bifromq.basekv.utils.BoundaryUtil.upperBound; +import static org.apache.bifromq.retain.store.schema.KVSchemaUtil.tenantBeginKey; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/TenantsStateTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/TenantsStateTest.java similarity index 95% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/TenantsStateTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/TenantsStateTest.java index edb491b63..f3072afa4 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/TenantsStateTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/TenantsStateTest.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store; +package org.apache.bifromq.retain.store; import static org.mockito.Mockito.mock; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.basekv.store.api.IKVReader; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; +import org.apache.bifromq.basekv.store.api.IKVReader; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; diff --git a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/index/RetainTopicIndexTest.java b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/index/RetainTopicIndexTest.java similarity index 99% rename from bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/index/RetainTopicIndexTest.java rename to bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/index/RetainTopicIndexTest.java index d5cd525dd..272f79975 100644 --- a/bifromq-retain/bifromq-retain-store/src/test/java/com/baidu/bifromq/retain/store/index/RetainTopicIndexTest.java +++ b/bifromq-retain/bifromq-retain-store/src/test/java/org/apache/bifromq/retain/store/index/RetainTopicIndexTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.retain.store.index; +package org.apache.bifromq.retain.store.index; import static org.testng.Assert.assertEquals; diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionDictClient.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/ISessionDictClient.java similarity index 69% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionDictClient.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/ISessionDictClient.java index a50e06b7a..def78036a 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionDictClient.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/ISessionDictClient.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; - -import com.baidu.bifromq.baserpc.client.IConnectable; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckRequest; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.sessiondict.rpc.proto.GetReply; -import com.baidu.bifromq.sessiondict.rpc.proto.GetRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.rpc.proto.SubReply; -import com.baidu.bifromq.sessiondict.rpc.proto.SubRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubReply; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubRequest; -import com.baidu.bifromq.type.ClientInfo; +package org.apache.bifromq.sessiondict.client; + +import org.apache.bifromq.baserpc.client.IConnectable; import jakarta.annotation.Nullable; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckRequest; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.sessiondict.rpc.proto.GetReply; +import org.apache.bifromq.sessiondict.rpc.proto.GetRequest; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.rpc.proto.SubReply; +import org.apache.bifromq.sessiondict.rpc.proto.SubRequest; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubReply; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubRequest; +import org.apache.bifromq.type.ClientInfo; public interface ISessionDictClient extends IConnectable, AutoCloseable { diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionRegistration.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/ISessionRegistration.java similarity index 93% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionRegistration.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/ISessionRegistration.java index a4006fd1c..db0e62a02 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/ISessionRegistration.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/ISessionRegistration.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; public interface ISessionRegistration { void stop(); diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClient.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionDictClient.java similarity index 85% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClient.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionDictClient.java index ac4467daf..100bbe830 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClient.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionDictClient.java @@ -11,27 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.sessiondict.SessionRegisterKeyUtil; -import com.baidu.bifromq.sessiondict.client.scheduler.IOnlineCheckScheduler; -import com.baidu.bifromq.sessiondict.client.scheduler.OnlineCheckScheduler; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckRequest; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.sessiondict.rpc.proto.GetReply; -import com.baidu.bifromq.sessiondict.rpc.proto.GetRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.sessiondict.rpc.proto.SubReply; -import com.baidu.bifromq.sessiondict.rpc.proto.SubRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubReply; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubRequest; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.base.Strings; @@ -42,6 +24,24 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.SessionRegisterKeyUtil; +import org.apache.bifromq.sessiondict.client.scheduler.IOnlineCheckScheduler; +import org.apache.bifromq.sessiondict.client.scheduler.OnlineCheckScheduler; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckRequest; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.sessiondict.rpc.proto.GetReply; +import org.apache.bifromq.sessiondict.rpc.proto.GetRequest; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllRequest; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillRequest; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.sessiondict.rpc.proto.SubReply; +import org.apache.bifromq.sessiondict.rpc.proto.SubRequest; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubReply; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubRequest; +import org.apache.bifromq.type.ClientInfo; @Slf4j final class SessionDictClient implements ISessionDictClient { diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClientBuilder.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionDictClientBuilder.java similarity index 86% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClientBuilder.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionDictClientBuilder.java index 336c00178..d2fa0495d 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionDictClientBuilder.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionDictClientBuilder.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.sessiondict.RPCBluePrint; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; import io.netty.channel.EventLoopGroup; import io.netty.handler.ssl.SslContext; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; +import org.apache.bifromq.sessiondict.RPCBluePrint; /** * The builder for building Session Dict Client. diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionRegister.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionRegister.java similarity index 89% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionRegister.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionRegister.java index da6208506..a39d47c1f 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionRegister.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionRegister.java @@ -11,14 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.baserpc.client.IRPCClient.IMessageStream; -import com.baidu.bifromq.sessiondict.rpc.proto.Quit; -import com.baidu.bifromq.sessiondict.rpc.proto.Session; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; +import org.apache.bifromq.baserpc.client.IRPCClient.IMessageStream; import java.lang.ref.Cleaner; import java.lang.ref.Cleaner.Cleanable; import java.util.Collections; @@ -26,6 +22,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.rpc.proto.Quit; +import org.apache.bifromq.sessiondict.rpc.proto.Session; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.type.ClientInfo; @Slf4j class SessionRegister { diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionRegistration.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionRegistration.java similarity index 95% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionRegistration.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionRegistration.java index 081da66d5..a38ddf279 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/SessionRegistration.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/SessionRegistration.java @@ -11,22 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; -import com.baidu.bifromq.type.ClientInfo; import java.util.concurrent.atomic.AtomicReference; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.type.ClientInfo; @Slf4j class SessionRegistration implements ISessionRegistration { - private enum State { - Registered, Kicked, Quit - } - private final AtomicReference state; private final ClientInfo owner; private final SessionRegister register; - SessionRegistration(ClientInfo owner, ISessionDictClient.IKillListener killListener, SessionRegister register) { this.owner = owner; this.register = register; @@ -53,4 +48,8 @@ public void stop() { register.unreg(owner); state.set(State.Quit); } + + private enum State { + Registered, Kicked, Quit + } } diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java similarity index 75% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java index 582b6e780..72f0d51f1 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/BatchSessionExistCall.java @@ -11,24 +11,25 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client.scheduler; +package org.apache.bifromq.sessiondict.client.scheduler; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.ICallTask; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckRequest; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.sessiondict.rpc.proto.ExistReply; +import org.apache.bifromq.baserpc.client.IRPCClient; import java.util.LinkedList; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.ICallTask; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckRequest; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.sessiondict.rpc.proto.ExistReply; +import org.apache.bifromq.sessiondict.rpc.proto.ExistRequest; @Slf4j class BatchSessionExistCall implements IBatchCall { - private final IRPCClient.IRequestPipeline ppln; + private final IRPCClient.IRequestPipeline ppln; private final LinkedList> batchedTasks = new LinkedList<>(); - public BatchSessionExistCall(IRPCClient.IRequestPipeline ppln) { + public BatchSessionExistCall(IRPCClient.IRequestPipeline ppln) { this.ppln = ppln; } @@ -44,9 +45,9 @@ public void reset() { @Override public CompletableFuture execute() { - com.baidu.bifromq.sessiondict.rpc.proto.ExistRequest.Builder reqBuilder = com.baidu.bifromq.sessiondict.rpc.proto.ExistRequest.newBuilder().setReqId(System.nanoTime()); + ExistRequest.Builder reqBuilder = ExistRequest.newBuilder().setReqId(System.nanoTime()); batchedTasks.forEach(task -> - reqBuilder.addClient(com.baidu.bifromq.sessiondict.rpc.proto.ExistRequest.Client.newBuilder() + reqBuilder.addClient(ExistRequest.Client.newBuilder() .setUserId(task.call().userId()) .setClientId(task.call().clientId()) .build())); diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java similarity index 75% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java index a42858806..07e1b2121 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/IOnlineCheckScheduler.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client.scheduler; +package org.apache.bifromq.sessiondict.client.scheduler; -import com.baidu.bifromq.basescheduler.IBatchCallScheduler; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckRequest; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.basescheduler.IBatchCallScheduler; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckRequest; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; /** * Scheduler for the session exist call. diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java similarity index 66% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java index e40c8e2a3..60bf0f700 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/scheduler/OnlineCheckScheduler.java @@ -11,23 +11,24 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client.scheduler; - -import static com.baidu.bifromq.sessiondict.SessionRegisterKeyUtil.parseTenantId; - -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.basescheduler.BatchCallScheduler; -import com.baidu.bifromq.basescheduler.IBatchCall; -import com.baidu.bifromq.basescheduler.IBatchCallBuilder; -import com.baidu.bifromq.sessiondict.SessionRegisterKeyUtil; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckRequest; -import com.baidu.bifromq.sessiondict.client.type.OnlineCheckResult; -import com.baidu.bifromq.sessiondict.rpc.proto.ExistReply; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; +package org.apache.bifromq.sessiondict.client.scheduler; + +import static org.apache.bifromq.sessiondict.SessionRegisterKeyUtil.parseTenantId; + +import org.apache.bifromq.baserpc.client.IRPCClient; import java.time.Duration; import java.util.Collections; import java.util.Optional; +import org.apache.bifromq.basescheduler.BatchCallScheduler; +import org.apache.bifromq.basescheduler.IBatchCall; +import org.apache.bifromq.basescheduler.IBatchCallBuilder; +import org.apache.bifromq.sessiondict.SessionRegisterKeyUtil; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckRequest; +import org.apache.bifromq.sessiondict.client.type.OnlineCheckResult; +import org.apache.bifromq.sessiondict.rpc.proto.ExistReply; +import org.apache.bifromq.sessiondict.rpc.proto.ExistRequest; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.sysprops.props.DataPlaneMaxBurstLatencyMillis; /** * Scheduler for checking the online status of a session. @@ -37,7 +38,7 @@ public class OnlineCheckScheduler extends BatchCallScheduler new IBatchCallBuilder<>() { - private final IRPCClient.IRequestPipeline ppln + private final IRPCClient.IRequestPipeline ppln = rpcClient.createRequestPipeline(parseTenantId(batcherKey), null, batcherKey, Collections.emptyMap(), SessionDictServiceGrpc.getExistMethod()); diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/type/OnlineCheckRequest.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/type/OnlineCheckRequest.java similarity index 93% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/type/OnlineCheckRequest.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/type/OnlineCheckRequest.java index 57a018ff8..149426488 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/type/OnlineCheckRequest.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/type/OnlineCheckRequest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client.type; +package org.apache.bifromq.sessiondict.client.type; public record OnlineCheckRequest(String tenantId, String userId, String clientId) { } diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/type/OnlineCheckResult.java b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/type/OnlineCheckResult.java similarity index 93% rename from bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/type/OnlineCheckResult.java rename to bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/type/OnlineCheckResult.java index 99a4a2426..8a3844597 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/main/java/com/baidu/bifromq/sessiondict/client/type/OnlineCheckResult.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/main/java/org/apache/bifromq/sessiondict/client/type/OnlineCheckResult.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client.type; +package org.apache.bifromq.sessiondict.client.type; /** * The result of the session exist call. diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/test/java/com/baidu/bifromq/sessiondict/client/KillTest.java b/bifromq-session-dict/bifromq-session-dict-client/src/test/java/org/apache/bifromq/sessiondict/client/KillTest.java similarity index 96% rename from bifromq-session-dict/bifromq-session-dict-client/src/test/java/com/baidu/bifromq/sessiondict/client/KillTest.java rename to bifromq-session-dict/bifromq-session-dict-client/src/test/java/org/apache/bifromq/sessiondict/client/KillTest.java index 1d33f621f..074454f84 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/test/java/com/baidu/bifromq/sessiondict/client/KillTest.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/test/java/org/apache/bifromq/sessiondict/client/KillTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; @@ -22,17 +22,17 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; import com.google.common.collect.Maps; import io.reactivex.rxjava3.core.Observable; import java.util.HashMap; import java.util.concurrent.CompletableFuture; import lombok.SneakyThrows; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.type.ClientInfo; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -41,9 +41,9 @@ import org.testng.annotations.Test; public class KillTest { - private AutoCloseable closeable; @Mock IRPCClient rpcClient; + private AutoCloseable closeable; @BeforeMethod public void setup() { diff --git a/bifromq-session-dict/bifromq-session-dict-client/src/test/java/com/baidu/bifromq/sessiondict/client/SessionRegisterTest.java b/bifromq-session-dict/bifromq-session-dict-client/src/test/java/org/apache/bifromq/sessiondict/client/SessionRegisterTest.java similarity index 91% rename from bifromq-session-dict/bifromq-session-dict-client/src/test/java/com/baidu/bifromq/sessiondict/client/SessionRegisterTest.java rename to bifromq-session-dict/bifromq-session-dict-client/src/test/java/org/apache/bifromq/sessiondict/client/SessionRegisterTest.java index b28e8315b..869fab3a3 100644 --- a/bifromq-session-dict/bifromq-session-dict-client/src/test/java/com/baidu/bifromq/sessiondict/client/SessionRegisterTest.java +++ b/bifromq-session-dict/bifromq-session-dict-client/src/test/java/org/apache/bifromq/sessiondict/client/SessionRegisterTest.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.client; +package org.apache.bifromq.sessiondict.client; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; @@ -29,14 +29,14 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.baserpc.client.IRPCClient; -import com.baidu.bifromq.sessiondict.rpc.proto.Quit; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.rpc.proto.Session; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.client.IRPCClient; import java.util.function.Consumer; import lombok.SneakyThrows; +import org.apache.bifromq.sessiondict.rpc.proto.Quit; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.rpc.proto.Session; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.type.ClientInfo; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -45,14 +45,6 @@ import org.testng.annotations.Test; public class SessionRegisterTest { - private AutoCloseable closeable; - @Mock - private ISessionDictClient.IKillListener killListener; - @Mock - private IRPCClient rpcClient; - @Mock - private IRPCClient.IMessageStream messageStream; - private SessionRegister regPipeline; private final String tenantId = "tenantId"; private final String registryKey = "registryKey"; private final String userId = "userId"; @@ -63,6 +55,14 @@ public class SessionRegisterTest { .putMetadata(MQTT_USER_ID_KEY, userId) .putMetadata(MQTT_CLIENT_ID_KEY, clientId) .build(); + private AutoCloseable closeable; + @Mock + private ISessionDictClient.IKillListener killListener; + @Mock + private IRPCClient rpcClient; + @Mock + private IRPCClient.IMessageStream messageStream; + private SessionRegister regPipeline; @BeforeMethod public void setup() { diff --git a/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/com/baidu/bifromq/sessiondict/RPCBluePrint.java b/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/org/apache/bifromq/sessiondict/RPCBluePrint.java similarity index 84% rename from bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/com/baidu/bifromq/sessiondict/RPCBluePrint.java rename to bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/org/apache/bifromq/sessiondict/RPCBluePrint.java index 076fc1327..f5cb64b0e 100644 --- a/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/com/baidu/bifromq/sessiondict/RPCBluePrint.java +++ b/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/org/apache/bifromq/sessiondict/RPCBluePrint.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict; +package org.apache.bifromq.sessiondict; -import com.baidu.bifromq.baserpc.BluePrint; -import com.baidu.bifromq.sessiondict.rpc.proto.GetRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.KillRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.sessiondict.rpc.proto.SubRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubRequest; +import org.apache.bifromq.baserpc.BluePrint; +import org.apache.bifromq.sessiondict.rpc.proto.GetRequest; +import org.apache.bifromq.sessiondict.rpc.proto.KillRequest; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.sessiondict.rpc.proto.SubRequest; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubRequest; public class RPCBluePrint { public static final BluePrint INSTANCE = BluePrint.builder() diff --git a/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/com/baidu/bifromq/sessiondict/SessionRegisterKeyUtil.java b/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/org/apache/bifromq/sessiondict/SessionRegisterKeyUtil.java similarity index 83% rename from bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/com/baidu/bifromq/sessiondict/SessionRegisterKeyUtil.java rename to bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/org/apache/bifromq/sessiondict/SessionRegisterKeyUtil.java index 0c415c5ae..c64f0db98 100644 --- a/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/com/baidu/bifromq/sessiondict/SessionRegisterKeyUtil.java +++ b/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/java/org/apache/bifromq/sessiondict/SessionRegisterKeyUtil.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict; +package org.apache.bifromq.sessiondict; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import com.baidu.bifromq.sysprops.props.SessionRegisterNumber; -import com.baidu.bifromq.type.ClientInfo; import java.util.Objects; +import org.apache.bifromq.sysprops.props.SessionRegisterNumber; +import org.apache.bifromq.type.ClientInfo; public class SessionRegisterKeyUtil { private static final int SESSION_REGISTER_NUM = SessionRegisterNumber.INSTANCE.get(); diff --git a/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/proto/sessiondict/SessionDictService.proto b/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/proto/sessiondict/SessionDictService.proto index 831c7cd11..3de87ffdd 100644 --- a/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/proto/sessiondict/SessionDictService.proto +++ b/bifromq-session-dict/bifromq-session-dict-rpc-definition/src/main/proto/sessiondict/SessionDictService.proto @@ -6,7 +6,7 @@ import "commontype/ClientInfo.proto"; package sessiondict; option java_multiple_files = true; -option java_package = "com.baidu.bifromq.sessiondict.rpc.proto"; +option java_package = "org.apache.bifromq.sessiondict.rpc.proto"; option java_outer_classname = "SessionDictServiceProtos"; option optimize_for = SPEED; diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionDictServer.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionDictServer.java similarity index 94% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionDictServer.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionDictServer.java index 154fb1918..6902400a5 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionDictServer.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionDictServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; public interface ISessionDictServer { static SessionDictServerBuilder builder() { diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionRegister.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionRegister.java similarity index 85% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionRegister.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionRegister.java index 3e8bc33ea..ef773b56a 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionRegister.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionRegister.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; public interface ISessionRegister { - interface IRegistrationListener { - void on(ClientInfo sessionOwner, boolean reg, ISessionRegister register); - } - void kick(String tenantId, ClientInfo sessionOwner, ClientInfo kicker, ServerRedirection serverRedirection); + + interface IRegistrationListener { + void on(ClientInfo sessionOwner, boolean reg, ISessionRegister register); + } } diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionRegistry.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionRegistry.java similarity index 90% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionRegistry.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionRegistry.java index 98a55d1b9..03dcd91ed 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/ISessionRegistry.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/ISessionRegistry.java @@ -11,22 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; import java.util.Optional; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; /** * Registry for MQTT Sessions. */ interface ISessionRegistry { - record SessionRegistration(ClientInfo sessionOwner, ISessionRegister register) { - void stop(ClientInfo kicker, ServerRedirection serverRedirection) { - register.kick(sessionOwner.getTenantId(), sessionOwner, kicker, serverRedirection); - } - } - void add(ClientInfo sessionOwner, ISessionRegister register); void remove(ClientInfo sessionOwner, ISessionRegister register); @@ -40,4 +34,10 @@ void stop(ClientInfo kicker, ServerRedirection serverRedirection) { Iterable findRegistrations(String tenantId); void close(); + + record SessionRegistration(ClientInfo sessionOwner, ISessionRegister register) { + void stop(ClientInfo kicker, ServerRedirection serverRedirection) { + register.kick(sessionOwner.getTenantId(), sessionOwner, kicker, serverRedirection); + } + } } diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/MqttClientKey.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/MqttClientKey.java similarity index 79% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/MqttClientKey.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/MqttClientKey.java index 6e8e25435..c0577ed8c 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/MqttClientKey.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/MqttClientKey.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.type.ClientInfo; record MqttClientKey(String userId, String clientId) { static MqttClientKey from(ClientInfo clientInfo) { diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictServer.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictServer.java similarity index 93% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictServer.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictServer.java index a08469747..303d1e249 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictServer.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictServer.java @@ -11,10 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sessiondict.RPCBluePrint; import com.google.common.util.concurrent.MoreExecutors; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics; @@ -23,6 +21,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sessiondict.RPCBluePrint; @Slf4j class SessionDictServer implements ISessionDictServer { diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictServerBuilder.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictServerBuilder.java similarity index 89% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictServerBuilder.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictServerBuilder.java index 74e758589..8d54d3b5a 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictServerBuilder.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictServerBuilder.java @@ -11,10 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.mqtt.inbox.IMqttBrokerClient; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; import com.google.common.base.Preconditions; import java.util.HashMap; import java.util.HashSet; @@ -24,6 +23,7 @@ import lombok.NoArgsConstructor; import lombok.Setter; import lombok.experimental.Accessors; +import org.apache.bifromq.mqtt.inbox.IMqttBrokerClient; /** * The builder for building Session Dict Server. diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictService.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictService.java similarity index 84% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictService.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictService.java index 972c2ac81..dec598b91 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionDictService.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionDictService.java @@ -11,33 +11,33 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import static com.baidu.bifromq.baserpc.server.UnaryResponse.response; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; +import static org.apache.bifromq.baserpc.server.UnaryResponse.response; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_BROKER_KEY; -import com.baidu.bifromq.mqtt.inbox.IMqttBrokerClient; -import com.baidu.bifromq.sessiondict.rpc.proto.ExistReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ExistRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.GetReply; -import com.baidu.bifromq.sessiondict.rpc.proto.GetRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillAllRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.KillReply; -import com.baidu.bifromq.sessiondict.rpc.proto.KillRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.Quit; -import com.baidu.bifromq.sessiondict.rpc.proto.Session; -import com.baidu.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; -import com.baidu.bifromq.sessiondict.rpc.proto.SubReply; -import com.baidu.bifromq.sessiondict.rpc.proto.SubRequest; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubReply; -import com.baidu.bifromq.sessiondict.rpc.proto.UnsubRequest; -import com.baidu.bifromq.type.ClientInfo; import io.grpc.stub.StreamObserver; import java.util.Optional; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.mqtt.inbox.IMqttBrokerClient; +import org.apache.bifromq.sessiondict.rpc.proto.ExistReply; +import org.apache.bifromq.sessiondict.rpc.proto.ExistRequest; +import org.apache.bifromq.sessiondict.rpc.proto.GetReply; +import org.apache.bifromq.sessiondict.rpc.proto.GetRequest; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillAllRequest; +import org.apache.bifromq.sessiondict.rpc.proto.KillReply; +import org.apache.bifromq.sessiondict.rpc.proto.KillRequest; +import org.apache.bifromq.sessiondict.rpc.proto.Quit; +import org.apache.bifromq.sessiondict.rpc.proto.Session; +import org.apache.bifromq.sessiondict.rpc.proto.SessionDictServiceGrpc; +import org.apache.bifromq.sessiondict.rpc.proto.SubReply; +import org.apache.bifromq.sessiondict.rpc.proto.SubRequest; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubReply; +import org.apache.bifromq.sessiondict.rpc.proto.UnsubRequest; +import org.apache.bifromq.type.ClientInfo; @Slf4j class SessionDictService extends SessionDictServiceGrpc.SessionDictServiceImplBase { diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionExistPipeline.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionExistPipeline.java similarity index 85% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionExistPipeline.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionExistPipeline.java index b5391ac4c..8a756d493 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionExistPipeline.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionExistPipeline.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import com.baidu.bifromq.baserpc.server.ResponsePipeline; -import com.baidu.bifromq.sessiondict.rpc.proto.ExistReply; -import com.baidu.bifromq.sessiondict.rpc.proto.ExistRequest; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.server.ResponsePipeline; import io.grpc.stub.StreamObserver; import java.util.Optional; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.sessiondict.rpc.proto.ExistReply; +import org.apache.bifromq.sessiondict.rpc.proto.ExistRequest; +import org.apache.bifromq.type.ClientInfo; class SessionExistPipeline extends ResponsePipeline { private final ISessionRegistry sessionRegistry; diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionRegister.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionRegister.java similarity index 89% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionRegister.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionRegister.java index fad2afc44..784c7fa14 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionRegister.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionRegister.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import com.baidu.bifromq.baserpc.server.AckStream; -import com.baidu.bifromq.sessiondict.rpc.proto.Quit; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.rpc.proto.Session; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.server.AckStream; import com.google.common.collect.Sets; import io.grpc.stub.StreamObserver; import io.reactivex.rxjava3.disposables.Disposable; import java.util.Set; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.sessiondict.rpc.proto.Quit; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.rpc.proto.Session; +import org.apache.bifromq.type.ClientInfo; @Slf4j class SessionRegister extends AckStream implements ISessionRegister { diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionRegistry.java b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionRegistry.java similarity index 92% rename from bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionRegistry.java rename to bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionRegistry.java index 8a416b8d6..5ed5ff80c 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/main/java/com/baidu/bifromq/sessiondict/server/SessionRegistry.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/main/java/org/apache/bifromq/sessiondict/server/SessionRegistry.java @@ -11,18 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import static com.baidu.bifromq.metrics.ITenantMeter.gauging; -import static com.baidu.bifromq.metrics.ITenantMeter.stopGauging; -import static com.baidu.bifromq.metrics.TenantMetric.MqttConnectionGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttLivePersistentSessionGauge; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_P_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_T_VALUE; +import static org.apache.bifromq.metrics.ITenantMeter.gauging; +import static org.apache.bifromq.metrics.ITenantMeter.stopGauging; +import static org.apache.bifromq.metrics.TenantMetric.MqttConnectionGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttLivePersistentSessionGauge; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_P_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_T_VALUE; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Maps; import java.util.Comparator; @@ -33,6 +31,8 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; class SessionRegistry implements ISessionRegistry { private static final ServerRedirection NO_MOVE = diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/test/java/com/baidu/bifromq/sessiondict/server/SessionRegisterTest.java b/bifromq-session-dict/bifromq-session-dict-server/src/test/java/org/apache/bifromq/sessiondict/server/SessionRegisterTest.java similarity index 90% rename from bifromq-session-dict/bifromq-session-dict-server/src/test/java/com/baidu/bifromq/sessiondict/server/SessionRegisterTest.java rename to bifromq-session-dict/bifromq-session-dict-server/src/test/java/org/apache/bifromq/sessiondict/server/SessionRegisterTest.java index 5c5fe3819..20a410945 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/test/java/com/baidu/bifromq/sessiondict/server/SessionRegisterTest.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/test/java/org/apache/bifromq/sessiondict/server/SessionRegisterTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; +package org.apache.bifromq.sessiondict.server; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_TYPE_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.argThat; @@ -28,19 +28,19 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.baserpc.RPCContext; -import com.baidu.bifromq.baserpc.metrics.IRPCMeter; -import com.baidu.bifromq.baserpc.metrics.RPCMetric; -import com.baidu.bifromq.sessiondict.rpc.proto.Quit; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.sessiondict.rpc.proto.Session; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.baserpc.RPCContext; +import org.apache.bifromq.baserpc.metrics.IRPCMeter; +import org.apache.bifromq.baserpc.metrics.RPCMetric; import io.grpc.Context; import io.grpc.stub.ServerCallStreamObserver; import io.micrometer.core.instrument.Timer; import java.util.Collections; import java.util.UUID; import lombok.SneakyThrows; +import org.apache.bifromq.sessiondict.rpc.proto.Quit; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.sessiondict.rpc.proto.Session; +import org.apache.bifromq.type.ClientInfo; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -49,7 +49,6 @@ import org.testng.annotations.Test; public class SessionRegisterTest { - private AutoCloseable closeable; private final String tenantId = "tenantId"; private final String userId = "userId"; private final String clientId = "clientId"; @@ -60,9 +59,8 @@ public class SessionRegisterTest { .putMetadata(MQTT_CLIENT_ID_KEY, clientId) .putMetadata(MQTT_CHANNEL_ID_KEY, UUID.randomUUID().toString()) .build(); - private final ClientInfo killer = ClientInfo.newBuilder().setTenantId(tenantId).setType("killer").build(); - + private AutoCloseable closeable; @Mock private ISessionRegister.IRegistrationListener listener; diff --git a/bifromq-session-dict/bifromq-session-dict-server/src/test/java/com/baidu/bifromq/sessiondict/server/SessionRegistryTest.java b/bifromq-session-dict/bifromq-session-dict-server/src/test/java/org/apache/bifromq/sessiondict/server/SessionRegistryTest.java similarity index 93% rename from bifromq-session-dict/bifromq-session-dict-server/src/test/java/com/baidu/bifromq/sessiondict/server/SessionRegistryTest.java rename to bifromq-session-dict/bifromq-session-dict-server/src/test/java/org/apache/bifromq/sessiondict/server/SessionRegistryTest.java index 2bdca707f..f66a5dfef 100644 --- a/bifromq-session-dict/bifromq-session-dict-server/src/test/java/com/baidu/bifromq/sessiondict/server/SessionRegistryTest.java +++ b/bifromq-session-dict/bifromq-session-dict-server/src/test/java/org/apache/bifromq/sessiondict/server/SessionRegistryTest.java @@ -11,26 +11,22 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sessiondict.server; - -import static com.baidu.bifromq.metrics.ITenantMeter.stopGauging; -import static com.baidu.bifromq.metrics.TenantMetric.MqttConnectionGauge; -import static com.baidu.bifromq.metrics.TenantMetric.MqttLivePersistentSessionGauge; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_P_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_T_VALUE; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +package org.apache.bifromq.sessiondict.server; + +import static org.apache.bifromq.metrics.ITenantMeter.stopGauging; +import static org.apache.bifromq.metrics.TenantMetric.MqttConnectionGauge; +import static org.apache.bifromq.metrics.TenantMetric.MqttLivePersistentSessionGauge; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CHANNEL_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_P_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_CLIENT_SESSION_TYPE_T_VALUE; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static org.mockito.ArgumentMatchers.eq; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.metrics.ITenantMeter; -import com.baidu.bifromq.metrics.TenantMetric; -import com.baidu.bifromq.sessiondict.rpc.proto.ServerRedirection; -import com.baidu.bifromq.type.ClientInfo; import io.micrometer.core.instrument.Gauge; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; @@ -39,6 +35,10 @@ import java.util.List; import java.util.Optional; import lombok.SneakyThrows; +import org.apache.bifromq.metrics.ITenantMeter; +import org.apache.bifromq.metrics.TenantMetric; +import org.apache.bifromq.sessiondict.rpc.proto.ServerRedirection; +import org.apache.bifromq.type.ClientInfo; import org.mockito.Mockito; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -47,8 +47,8 @@ public class SessionRegistryTest { private SimpleMeterRegistry meterRegistry; private SessionRegistry sessionRegistry; - private String tenantId1 = "tenant1"; - private String tenantId2 = "tenant2"; + private final String tenantId1 = "tenant1"; + private final String tenantId2 = "tenant2"; @BeforeMethod public void setUp() { diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/BifroMQSysProp.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/BifroMQSysProp.java similarity index 96% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/BifroMQSysProp.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/BifroMQSysProp.java index 732364d6c..ac0bee727 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/BifroMQSysProp.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/BifroMQSysProp.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops; +package org.apache.bifromq.sysprops; -import com.baidu.bifromq.sysprops.parser.PropParser; +import org.apache.bifromq.sysprops.parser.PropParser; import lombok.extern.slf4j.Slf4j; /** diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/BooleanParser.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/BooleanParser.java similarity index 97% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/BooleanParser.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/BooleanParser.java index f75818efb..fd687b3ad 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/BooleanParser.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/BooleanParser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/DoubleParser.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/DoubleParser.java similarity index 97% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/DoubleParser.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/DoubleParser.java index fca5f854b..9937d58e8 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/DoubleParser.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/DoubleParser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; public class DoubleParser implements PropParser { private final double lowBound; diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/IntegerParser.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/IntegerParser.java similarity index 97% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/IntegerParser.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/IntegerParser.java index d967f4fc7..aef0807c4 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/IntegerParser.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/IntegerParser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; public class IntegerParser implements PropParser { public static final IntegerParser POSITIVE = new IntegerParser(1, Integer.MAX_VALUE); diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/LongParser.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/LongParser.java similarity index 97% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/LongParser.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/LongParser.java index e5aa6b2bc..6b2599eb9 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/LongParser.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/LongParser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; public class LongParser implements PropParser { public static final LongParser POSITIVE = new LongParser(1, Long.MAX_VALUE); diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/PropParser.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/PropParser.java similarity index 94% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/PropParser.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/PropParser.java index db9486613..296e5bebc 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/PropParser.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/PropParser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; /** * Parser interface for parsing system properties' string value. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/SysPropParseException.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/SysPropParseException.java similarity index 94% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/SysPropParseException.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/SysPropParseException.java index 4a0054ef5..c8c28205e 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/parser/SysPropParseException.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/parser/SysPropParseException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; public class SysPropParseException extends RuntimeException { public SysPropParseException(String message) { diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java index c0f8f11d2..5923a46f2 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ClientRedirectCheckIntervalSeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The client redirect check interval seconds. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java index 5963a08ea..eb63e1b5e 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ClusterDomainResolveTimeoutSeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The system property used to configure the timeout for resolving the cluster domain. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java index c7bf7e567..f748968dc 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/ControlPlaneMaxBurstLatencyMillis.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The max latency tolerated during the control plane burst. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java index 9c385315e..6947ac7a2 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DataPlaneMaxBurstLatencyMillis.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The max latency tolerated during the data plane burst. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DeliverersPerMqttServer.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DeliverersPerMqttServer.java similarity index 83% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DeliverersPerMqttServer.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DeliverersPerMqttServer.java index 3f76658e3..49c8e653c 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DeliverersPerMqttServer.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DeliverersPerMqttServer.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The number of deliverers per mqtt server. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistFanOutParallelism.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistFanOutParallelism.java similarity index 84% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistFanOutParallelism.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistFanOutParallelism.java index 27d055e0e..021d85045 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistFanOutParallelism.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistFanOutParallelism.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The system property for the number of dist executors for fanout subscription. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistInlineFanOutThreshold.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistInlineFanOutThreshold.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistInlineFanOutThreshold.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistInlineFanOutThreshold.java index f03b8a84c..f720a8b68 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistInlineFanOutThreshold.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistInlineFanOutThreshold.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The system property for the threshold of 'inline' fan-out scale. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistMatchParallelism.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistMatchParallelism.java similarity index 84% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistMatchParallelism.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistMatchParallelism.java index c10bd3dbf..4195ea877 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistMatchParallelism.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistMatchParallelism.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The system property for the parallelism of dist worker match. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java index 8fce426a7..cdcdf428b 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistMaxCachedRoutesPerTenant.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The system property for the maximum number of cached routes per tenant. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java index 399528ba9..48a7568b0 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistTopicMatchExpirySeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The system property for the expiry seconds of dist topic match. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerCallQueueNum.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerCallQueueNum.java similarity index 84% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerCallQueueNum.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerCallQueueNum.java index 9e1881e5a..fc6a172b5 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerCallQueueNum.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerCallQueueNum.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The system property for the number of DistWorker call queues. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java index 5d4885e34..b938ffecd 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerFanOutSplitThreshold.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The fan-out routes threshold for splitting range in dist worker. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java index 45b839b83..09bdc8bc6 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/DistWorkerLoadEstimationWindowSeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The window seconds for load estimation in dist worker. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxCheckQueuesPerRange.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxCheckQueuesPerRange.java similarity index 86% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxCheckQueuesPerRange.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxCheckQueuesPerRange.java index 376299ae0..885871258 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxCheckQueuesPerRange.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxCheckQueuesPerRange.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The number of inbox check queues per range. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxDelivererNum.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxDelivererNum.java similarity index 86% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxDelivererNum.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxDelivererNum.java index a13f82362..7864e04e3 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxDelivererNum.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxDelivererNum.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The number of inbox deliverers per tenant. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxFetchQueuesPerRange.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxFetchQueuesPerRange.java similarity index 84% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxFetchQueuesPerRange.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxFetchQueuesPerRange.java index 96650fb6f..be5051858 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxFetchQueuesPerRange.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxFetchQueuesPerRange.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The number of inbox fetch queues per range. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java index 70cca11e0..b2e228d2b 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxStoreLoadEstimationWindowSeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The window size in seconds for estimating the load of the inbox store. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxTouchQueuesPerRange.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxTouchQueuesPerRange.java similarity index 84% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxTouchQueuesPerRange.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxTouchQueuesPerRange.java index c6a69b046..7b2930abf 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/InboxTouchQueuesPerRange.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/InboxTouchQueuesPerRange.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The number of inbox touch queues per range. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java similarity index 88% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java index f4edf675a..294225fc8 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/IngressSlowDownDirectMemoryUsage.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.DoubleParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.DoubleParser; /** * The system property used to configure the direct memory usage threshold for slowing down the ingress mqtt traffic. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java similarity index 88% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java index cb4a98dc0..a07a9ea2d 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/IngressSlowDownHeapMemoryUsage.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.DoubleParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.DoubleParser; /** * * The system property used to configure the heap memory usage threshold for slowing down the ingress mqtt traffic. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java similarity index 86% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java index d8bd6d40f..141600a43 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxMqtt3ClientIdLength.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The maximum length of the MQTT 3.1,3.1.1 client ID. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java similarity index 86% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java index 1d363a03e..a004aa313 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxMqtt5ClientIdLength.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The maximum length of the MQTT 5.0 client ID. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java similarity index 86% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java index eae9aef1e..9a40cf6fb 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/MaxSlowDownTimeoutSeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The maximum time to wait for the slow-down operation to complete. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java similarity index 88% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java index e73fcff20..d07522849 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/PersistentSessionDetachTimeoutSecond.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The timeout seconds to consider persistent session is probably detached from mqtt client. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java index 020f38649..4cd6dd372 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/RetainStoreLoadEstimationWindowSeconds.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.LongParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.LongParser; /** * The window size in seconds for estimating the load of the retain store. diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/SanityCheckMqttUtf8String.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/SanityCheckMqttUtf8String.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/SanityCheckMqttUtf8String.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/SanityCheckMqttUtf8String.java index 8caef73ad..a53e4c0cc 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/SanityCheckMqttUtf8String.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/SanityCheckMqttUtf8String.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.BooleanParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.BooleanParser; /** * further check if utf8 string contains any control character or non character according to [MQTT-1.5.3] diff --git a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/SessionRegisterNumber.java b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/SessionRegisterNumber.java similarity index 87% rename from bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/SessionRegisterNumber.java rename to bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/SessionRegisterNumber.java index 87d20108c..68204d322 100644 --- a/bifromq-sysprops/src/main/java/com/baidu/bifromq/sysprops/props/SessionRegisterNumber.java +++ b/bifromq-sysprops/src/main/java/org/apache/bifromq/sysprops/props/SessionRegisterNumber.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.props; +package org.apache.bifromq.sysprops.props; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.parser.IntegerParser; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.parser.IntegerParser; /** * The number of session registers which is controlling the internal rpc parallelism in SessionDictService. diff --git a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/BifroMQSysPropTest.java b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/BifroMQSysPropTest.java similarity index 95% rename from bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/BifroMQSysPropTest.java rename to bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/BifroMQSysPropTest.java index f2dc6f0d5..fa93e15ed 100644 --- a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/BifroMQSysPropTest.java +++ b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/BifroMQSysPropTest.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops; +package org.apache.bifromq.sysprops; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.sysprops.props.ClusterDomainResolveTimeoutSeconds; +import org.apache.bifromq.sysprops.props.ClusterDomainResolveTimeoutSeconds; import java.util.HashSet; import java.util.Set; import org.reflections.Reflections; diff --git a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/BooleanParserTest.java b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/BooleanParserTest.java similarity index 96% rename from bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/BooleanParserTest.java rename to bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/BooleanParserTest.java index 2003e5cc8..bb256c0c0 100644 --- a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/BooleanParserTest.java +++ b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/BooleanParserTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/DoubleParserTest.java b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/DoubleParserTest.java similarity index 96% rename from bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/DoubleParserTest.java rename to bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/DoubleParserTest.java index 12b60c36c..f19e7ce4d 100644 --- a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/DoubleParserTest.java +++ b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/DoubleParserTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; import static org.testng.Assert.assertTrue; diff --git a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/IntegerParserTest.java b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/IntegerParserTest.java similarity index 95% rename from bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/IntegerParserTest.java rename to bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/IntegerParserTest.java index c02b06b72..0863d8c9a 100644 --- a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/IntegerParserTest.java +++ b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/IntegerParserTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; import static org.testng.Assert.assertTrue; diff --git a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/LongParserTest.java b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/LongParserTest.java similarity index 95% rename from bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/LongParserTest.java rename to bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/LongParserTest.java index 659a2e3b3..02acbd9b1 100644 --- a/bifromq-sysprops/src/test/java/com/baidu/bifromq/sysprops/parser/LongParserTest.java +++ b/bifromq-sysprops/src/test/java/org/apache/bifromq/sysprops/parser/LongParserTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.sysprops.parser; +package org.apache.bifromq.sysprops.parser; import static org.testng.Assert.assertTrue; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/BSUtil.java b/bifromq-util/src/main/java/org/apache/bifromq/util/BSUtil.java similarity index 98% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/BSUtil.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/BSUtil.java index 6dbdb2b4a..9efceae7a 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/BSUtil.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/BSUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; import static com.google.protobuf.UnsafeByteOperations.unsafeWrap; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/SizeUtil.java b/bifromq-util/src/main/java/org/apache/bifromq/util/SizeUtil.java similarity index 90% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/SizeUtil.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/SizeUtil.java index d742766e1..fffa66acb 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/SizeUtil.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/SizeUtil.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; -import com.baidu.bifromq.type.Message; -import com.baidu.bifromq.type.TopicMessagePack; +import org.apache.bifromq.type.Message; +import org.apache.bifromq.type.TopicMessagePack; public class SizeUtil { public static int estSizeOf(TopicMessagePack topicMsgPack) { diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/TopicConst.java b/bifromq-util/src/main/java/org/apache/bifromq/util/TopicConst.java similarity index 97% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/TopicConst.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/TopicConst.java index 027b61951..eb820993f 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/TopicConst.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/TopicConst.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; /** * The constant elements in MQTT Topics and TopicFilters. diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/TopicUtil.java b/bifromq-util/src/main/java/org/apache/bifromq/util/TopicUtil.java similarity index 93% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/TopicUtil.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/TopicUtil.java index e67fe5316..08867b638 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/TopicUtil.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/TopicUtil.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; -import static com.baidu.bifromq.util.TopicConst.DELIMITER; -import static com.baidu.bifromq.util.TopicConst.DELIMITER_CHAR; -import static com.baidu.bifromq.util.TopicConst.MULTIPLE_WILDCARD_CHAR; -import static com.baidu.bifromq.util.TopicConst.MULTI_WILDCARD; -import static com.baidu.bifromq.util.TopicConst.NUL; -import static com.baidu.bifromq.util.TopicConst.NUL_CHAR; -import static com.baidu.bifromq.util.TopicConst.ORDERED_SHARE; -import static com.baidu.bifromq.util.TopicConst.SINGLE_WILDCARD_CHAR; -import static com.baidu.bifromq.util.TopicConst.UNORDERED_SHARE; +import static org.apache.bifromq.util.TopicConst.DELIMITER; +import static org.apache.bifromq.util.TopicConst.DELIMITER_CHAR; +import static org.apache.bifromq.util.TopicConst.MULTIPLE_WILDCARD_CHAR; +import static org.apache.bifromq.util.TopicConst.MULTI_WILDCARD; +import static org.apache.bifromq.util.TopicConst.NUL; +import static org.apache.bifromq.util.TopicConst.NUL_CHAR; +import static org.apache.bifromq.util.TopicConst.ORDERED_SHARE; +import static org.apache.bifromq.util.TopicConst.SINGLE_WILDCARD_CHAR; +import static org.apache.bifromq.util.TopicConst.UNORDERED_SHARE; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/UTF8Util.java b/bifromq-util/src/main/java/org/apache/bifromq/util/UTF8Util.java similarity index 98% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/UTF8Util.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/UTF8Util.java index 5d2335456..9e5a3b71e 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/UTF8Util.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/UTF8Util.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/Branch.java b/bifromq-util/src/main/java/org/apache/bifromq/util/index/Branch.java similarity index 97% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/index/Branch.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/index/Branch.java index 8d0aa2135..535fa37e3 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/Branch.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/index/Branch.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util.index; +package org.apache.bifromq.util.index; import java.util.Set; import org.pcollections.HashTreePSet; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/CNode.java b/bifromq-util/src/main/java/org/apache/bifromq/util/index/CNode.java similarity index 98% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/index/CNode.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/index/CNode.java index 2ab23c2a2..7aedc6a40 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/CNode.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/index/CNode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util.index; +package org.apache.bifromq.util.index; import java.util.List; import org.pcollections.HashTreePMap; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/INode.java b/bifromq-util/src/main/java/org/apache/bifromq/util/index/INode.java similarity index 96% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/index/INode.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/index/INode.java index 9b073bd10..044ea616a 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/INode.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/index/INode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util.index; +package org.apache.bifromq.util.index; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/MainNode.java b/bifromq-util/src/main/java/org/apache/bifromq/util/index/MainNode.java similarity index 95% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/index/MainNode.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/index/MainNode.java index be631adcc..54305a942 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/MainNode.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/index/MainNode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util.index; +package org.apache.bifromq.util.index; public class MainNode { final CNode cNode; diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/TNode.java b/bifromq-util/src/main/java/org/apache/bifromq/util/index/TNode.java similarity index 94% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/index/TNode.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/index/TNode.java index 23438fa38..f7c150d72 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/TNode.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/index/TNode.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util.index; +package org.apache.bifromq.util.index; public class TNode { } diff --git a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/TopicLevelTrie.java b/bifromq-util/src/main/java/org/apache/bifromq/util/index/TopicLevelTrie.java similarity index 99% rename from bifromq-util/src/main/java/com/baidu/bifromq/util/index/TopicLevelTrie.java rename to bifromq-util/src/main/java/org/apache/bifromq/util/index/TopicLevelTrie.java index 16b482581..2e24aa764 100644 --- a/bifromq-util/src/main/java/com/baidu/bifromq/util/index/TopicLevelTrie.java +++ b/bifromq-util/src/main/java/org/apache/bifromq/util/index/TopicLevelTrie.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util.index; +package org.apache.bifromq.util.index; import static java.util.Collections.emptySet; diff --git a/bifromq-util/src/test/java/com/baidu/bifromq/util/TopicUtilsTest.java b/bifromq-util/src/test/java/org/apache/bifromq/util/TopicUtilsTest.java similarity index 96% rename from bifromq-util/src/test/java/com/baidu/bifromq/util/TopicUtilsTest.java rename to bifromq-util/src/test/java/org/apache/bifromq/util/TopicUtilsTest.java index 996ea698c..4b1579760 100644 --- a/bifromq-util/src/test/java/com/baidu/bifromq/util/TopicUtilsTest.java +++ b/bifromq-util/src/test/java/org/apache/bifromq/util/TopicUtilsTest.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; -import static com.baidu.bifromq.util.TopicUtil.escape; -import static com.baidu.bifromq.util.TopicUtil.from; -import static com.baidu.bifromq.util.TopicUtil.isWildcardTopicFilter; -import static com.baidu.bifromq.util.TopicUtil.parse; +import static org.apache.bifromq.util.TopicUtil.escape; +import static org.apache.bifromq.util.TopicUtil.from; +import static org.apache.bifromq.util.TopicUtil.isWildcardTopicFilter; +import static org.apache.bifromq.util.TopicUtil.parse; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.type.RouteMatcher; +import org.apache.bifromq.type.RouteMatcher; import java.util.List; import org.testng.annotations.Test; diff --git a/bifromq-util/src/test/java/com/baidu/bifromq/util/UTF8UtilTest.java b/bifromq-util/src/test/java/org/apache/bifromq/util/UTF8UtilTest.java similarity index 98% rename from bifromq-util/src/test/java/com/baidu/bifromq/util/UTF8UtilTest.java rename to bifromq-util/src/test/java/org/apache/bifromq/util/UTF8UtilTest.java index 67d05d557..717ddbed8 100644 --- a/bifromq-util/src/test/java/com/baidu/bifromq/util/UTF8UtilTest.java +++ b/bifromq-util/src/test/java/org/apache/bifromq/util/UTF8UtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.util; +package org.apache.bifromq.util; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; diff --git a/build/build-bifromq-starters/bin/standalone.bat b/build/build-bifromq-starters/bin/standalone.bat index 29518a492..30e5e7b1b 100755 --- a/build/build-bifromq-starters/bin/standalone.bat +++ b/build/build-bifromq-starters/bin/standalone.bat @@ -26,7 +26,7 @@ set LOG_DIR=%BASE_DIR%\logs set SCRIPT=%0 set COMMAND=%1 set FOREGROUND=%2 -set NAME=com.baidu.bifromq.starter.StandaloneStarter +set NAME=org.apache.bifromq.starter.StandaloneStarter if "start" == "%COMMAND%" ( call "%~dp0bifromq-start.bat" -c %NAME% -f standalone.yml %FOREGROUND% ) else if "stop" == "%COMMAND%" ( diff --git a/build/build-bifromq-starters/bin/standalone.sh b/build/build-bifromq-starters/bin/standalone.sh index dca1f5677..bdfacb84c 100755 --- a/build/build-bifromq-starters/bin/standalone.sh +++ b/build/build-bifromq-starters/bin/standalone.sh @@ -28,10 +28,10 @@ COMMAND=$1 shift if [ $COMMAND = "start" ]; then - exec "$BASE_DIR/bin/bifromq-start.sh" -c com.baidu.bifromq.starter.StandaloneStarter -f standalone.yml "$@" + exec "$BASE_DIR/bin/bifromq-start.sh" -c org.apache.bifromq.starter.StandaloneStarter -f standalone.yml "$@" elif [ $COMMAND = "stop" ]; then exec "$BASE_DIR/bin/bifromq-stop.sh" StandaloneStarter elif [ $COMMAND = "restart" ]; then sh "$BASE_DIR/bin/bifromq-stop.sh" StandaloneStarter - "$BASE_DIR/bin/bifromq-start.sh" -c com.baidu.bifromq.starter.StandaloneStarter -f standalone.yml "$@" + "$BASE_DIR/bin/bifromq-start.sh" -c org.apache.bifromq.starter.StandaloneStarter -f standalone.yml "$@" fi diff --git a/build/build-bifromq-starters/conf/logback.xml b/build/build-bifromq-starters/conf/logback.xml index dd4499927..e7f0a0bfc 100644 --- a/build/build-bifromq-starters/conf/logback.xml +++ b/build/build-bifromq-starters/conf/logback.xml @@ -243,7 +243,7 @@ - + @@ -251,19 +251,19 @@ - + - + - + - + diff --git a/build/build-bifromq-starters/conf/standalone.yml b/build/build-bifromq-starters/conf/standalone.yml index e6565ea4a..d07edb5de 100644 --- a/build/build-bifromq-starters/conf/standalone.yml +++ b/build/build-bifromq-starters/conf/standalone.yml @@ -5,15 +5,15 @@ # Enabling custom auth provider, specify the Fully Qualified Name of the auth provider class from your plugin. # or experiment with the built-in auth provider which is a simple webhook based implementation. -# authProviderFQN: "com.baidu.demo.plugin.DemoAuthProvider" +# authProviderFQN: "org.apache.bifromq.demo.plugin.DemoAuthProvider" # Enabling runtime throttling at tenant-level, specify the Fully Qualified Name of the resource throttler class from your plugin. # or experiment with the built-in resource throttler which is a simple webhook based implementation. -# resourceThrottlerFQN: "com.baidu.demo.plugin.DemoResourceThrottler" +# resourceThrottlerFQN: "org.apache.bifromq.demo.plugin.DemoResourceThrottler" # Enabling runtime setting at tenant-level, specify the Fully Qualified Name of the setting provider class from your plugin. # or experiment with the built-in setting provider which is a simple webhook based implementation. -# settingProviderFQN: "com.baidu.demo.plugin.DemoSettingProvider" +# settingProviderFQN: "org.apache.bifromq.demo.plugin.DemoSettingProvider" mqttServiceConfig: server: diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/ServiceBootstrapper.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/ServiceBootstrapper.java similarity index 90% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/ServiceBootstrapper.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/ServiceBootstrapper.java index f1564ff8c..9009f046d 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/ServiceBootstrapper.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/ServiceBootstrapper.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter; +package org.apache.bifromq.starter; -import com.baidu.bifromq.apiserver.IAPIServer; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.server.IDistServer; -import com.baidu.bifromq.dist.worker.IDistWorker; -import com.baidu.bifromq.inbox.server.IInboxServer; -import com.baidu.bifromq.inbox.store.IInboxStore; -import com.baidu.bifromq.mqtt.IMQTTBroker; -import com.baidu.bifromq.retain.server.IRetainServer; -import com.baidu.bifromq.retain.store.IRetainStore; -import com.baidu.bifromq.sessiondict.server.ISessionDictServer; -import com.baidu.bifromq.starter.module.ServiceInjector; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.retain.server.IRetainServer; +import org.apache.bifromq.retain.store.IRetainStore; +import org.apache.bifromq.starter.module.ServiceInjector; import com.google.inject.Inject; import java.util.Optional; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.apiserver.IAPIServer; +import org.apache.bifromq.dist.server.IDistServer; +import org.apache.bifromq.dist.worker.IDistWorker; +import org.apache.bifromq.inbox.server.IInboxServer; +import org.apache.bifromq.inbox.store.IInboxStore; +import org.apache.bifromq.mqtt.IMQTTBroker; +import org.apache.bifromq.sessiondict.server.ISessionDictServer; @Slf4j class ServiceBootstrapper { diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/StandaloneStarter.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/StandaloneStarter.java similarity index 87% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/StandaloneStarter.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/StandaloneStarter.java index e4ed25e40..73e30eb45 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/StandaloneStarter.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/StandaloneStarter.java @@ -11,37 +11,36 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter; +package org.apache.bifromq.starter; -import static com.baidu.bifromq.starter.utils.ClusterDomainUtil.resolve; -import static com.baidu.bifromq.starter.utils.ConfigFileUtil.build; -import static com.baidu.bifromq.starter.utils.ConfigFileUtil.serialize; +import static org.apache.bifromq.starter.utils.ClusterDomainUtil.resolve; +import static org.apache.bifromq.starter.utils.ConfigFileUtil.build; +import static org.apache.bifromq.starter.utils.ConfigFileUtil.serialize; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.baseenv.MemUsage; -import com.baidu.bifromq.plugin.settingprovider.Setting; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.StandaloneConfigConsolidator; -import com.baidu.bifromq.starter.metrics.netty.PooledByteBufAllocator; -import com.baidu.bifromq.starter.module.APIServerModule; -import com.baidu.bifromq.starter.module.ConfigModule; -import com.baidu.bifromq.starter.module.CoreServiceModule; -import com.baidu.bifromq.starter.module.DistServiceModule; -import com.baidu.bifromq.starter.module.ExecutorsModule; -import com.baidu.bifromq.starter.module.InboxServiceModule; -import com.baidu.bifromq.starter.module.MQTTServiceModule; -import com.baidu.bifromq.starter.module.PluginModule; -import com.baidu.bifromq.starter.module.RPCClientSSLContextModule; -import com.baidu.bifromq.starter.module.RPCServerBuilderModule; -import com.baidu.bifromq.starter.module.RetainServiceModule; -import com.baidu.bifromq.starter.module.ServiceInjectorModule; -import com.baidu.bifromq.starter.module.SessionDictServiceModule; -import com.baidu.bifromq.starter.module.SharedResourcesHolder; -import com.baidu.bifromq.sysprops.BifroMQSysProp; -import com.baidu.bifromq.sysprops.props.ClusterDomainResolveTimeoutSeconds; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.MemUsage; +import org.apache.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.StandaloneConfigConsolidator; +import org.apache.bifromq.starter.metrics.netty.PooledByteBufAllocator; +import org.apache.bifromq.starter.module.APIServerModule; +import org.apache.bifromq.starter.module.ConfigModule; +import org.apache.bifromq.starter.module.CoreServiceModule; +import org.apache.bifromq.starter.module.DistServiceModule; +import org.apache.bifromq.starter.module.ExecutorsModule; +import org.apache.bifromq.starter.module.InboxServiceModule; +import org.apache.bifromq.starter.module.MQTTServiceModule; +import org.apache.bifromq.starter.module.PluginModule; +import org.apache.bifromq.starter.module.RPCClientSSLContextModule; +import org.apache.bifromq.starter.module.RPCServerBuilderModule; +import org.apache.bifromq.starter.module.RetainServiceModule; +import org.apache.bifromq.starter.module.ServiceInjectorModule; +import org.apache.bifromq.starter.module.SessionDictServiceModule; +import org.apache.bifromq.starter.module.SharedResourcesHolder; +import org.apache.bifromq.sysprops.BifroMQSysProp; +import org.apache.bifromq.sysprops.props.ClusterDomainResolveTimeoutSeconds; import com.google.common.base.Strings; -import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Injector; import io.micrometer.core.instrument.Gauge; @@ -76,7 +75,6 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.reflections.Reflections; -import org.slf4j.Logger; @Slf4j public class StandaloneStarter { diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/StandaloneConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/StandaloneConfig.java similarity index 74% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/StandaloneConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/StandaloneConfig.java index 9d153bf4c..0b8f16ea5 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/StandaloneConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/StandaloneConfig.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config; - -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.starter.config.model.ClusterConfig; -import com.baidu.bifromq.starter.config.model.RPCConfig; -import com.baidu.bifromq.starter.config.model.api.APIServerConfig; -import com.baidu.bifromq.starter.config.model.dict.SessionDictServiceConfig; -import com.baidu.bifromq.starter.config.model.dist.DistServiceConfig; -import com.baidu.bifromq.starter.config.model.inbox.InboxServiceConfig; -import com.baidu.bifromq.starter.config.model.mqtt.MQTTServiceConfig; -import com.baidu.bifromq.starter.config.model.retain.RetainServiceConfig; +package org.apache.bifromq.starter.config; + +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.starter.config.model.ClusterConfig; +import org.apache.bifromq.starter.config.model.RPCConfig; +import org.apache.bifromq.starter.config.model.api.APIServerConfig; +import org.apache.bifromq.starter.config.model.dict.SessionDictServiceConfig; +import org.apache.bifromq.starter.config.model.dist.DistServiceConfig; +import org.apache.bifromq.starter.config.model.inbox.InboxServiceConfig; +import org.apache.bifromq.starter.config.model.mqtt.MQTTServiceConfig; +import org.apache.bifromq.starter.config.model.retain.RetainServiceConfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import lombok.Getter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/StandaloneConfigConsolidator.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/StandaloneConfigConsolidator.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/StandaloneConfigConsolidator.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/StandaloneConfigConsolidator.java index a74f1841d..2125a8026 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/StandaloneConfigConsolidator.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/StandaloneConfigConsolidator.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config; +package org.apache.bifromq.starter.config; -import com.baidu.bifromq.starter.config.model.ClusterConfig; -import com.baidu.bifromq.starter.config.model.RPCConfig; -import com.baidu.bifromq.starter.config.model.SSLContextConfig; -import com.baidu.bifromq.starter.config.model.ServerSSLContextConfig; -import com.baidu.bifromq.starter.config.model.api.APIServerConfig; -import com.baidu.bifromq.starter.config.model.mqtt.MQTTServerConfig; +import org.apache.bifromq.starter.config.model.ClusterConfig; +import org.apache.bifromq.starter.config.model.RPCConfig; +import org.apache.bifromq.starter.config.model.SSLContextConfig; +import org.apache.bifromq.starter.config.model.ServerSSLContextConfig; +import org.apache.bifromq.starter.config.model.api.APIServerConfig; +import org.apache.bifromq.starter.config.model.mqtt.MQTTServerConfig; import com.google.common.base.Strings; import io.netty.handler.ssl.util.SelfSignedCertificate; import java.net.InetAddress; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/BalancerOptions.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/BalancerOptions.java similarity index 98% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/BalancerOptions.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/BalancerOptions.java index 5b424db36..6ab0591f1 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/BalancerOptions.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/BalancerOptions.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ClusterConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ClusterConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ClusterConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ClusterConfig.java index 6e8628db5..80a56cfcc 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ClusterConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ClusterConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ExecutorConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ExecutorConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ExecutorConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ExecutorConfig.java index 04b185b53..0968d5d01 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ExecutorConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ExecutorConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/InMemEngineConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/InMemEngineConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/InMemEngineConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/InMemEngineConfig.java index a41e0b55b..aed57cb7d 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/InMemEngineConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/InMemEngineConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; public class InMemEngineConfig extends StorageEngineConfig { } diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/RPCConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/RPCConfig.java similarity index 96% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/RPCConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/RPCConfig.java index 7b45a3c57..61d21c1c4 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/RPCConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/RPCConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/RocksDBEngineConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/RocksDBEngineConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/RocksDBEngineConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/RocksDBEngineConfig.java index 1732e9280..f55cfd576 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/RocksDBEngineConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/RocksDBEngineConfig.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import static java.lang.Math.max; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/SSLContextConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/SSLContextConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/SSLContextConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/SSLContextConfig.java index b6bb1ade6..4a6f646f9 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/SSLContextConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/SSLContextConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ServerSSLContextConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ServerSSLContextConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ServerSSLContextConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ServerSSLContextConfig.java index 09c95f5b5..2ba9d25ad 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/ServerSSLContextConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/ServerSSLContextConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import io.netty.handler.ssl.ClientAuth; import lombok.Getter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/StorageEngineConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/StorageEngineConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/StorageEngineConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/StorageEngineConfig.java index 5e02a664c..887070397 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/StorageEngineConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/StorageEngineConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model; +package org.apache.bifromq.starter.config.model; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/api/APIServerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/api/APIServerConfig.java similarity index 90% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/api/APIServerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/api/APIServerConfig.java index 1391c758a..00c1bde86 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/api/APIServerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/api/APIServerConfig.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.api; +package org.apache.bifromq.starter.config.model.api; -import com.baidu.bifromq.starter.config.model.ServerSSLContextConfig; +import org.apache.bifromq.starter.config.model.ServerSSLContextConfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import lombok.Getter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictClientConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictClientConfig.java index ca891a2bf..a4fc259ea 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dict; +package org.apache.bifromq.starter.config.model.dict; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictServerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictServerConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictServerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictServerConfig.java index fcbb57a36..66f63394b 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictServerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictServerConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dict; +package org.apache.bifromq.starter.config.model.dict; import java.util.HashMap; import java.util.HashSet; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictServiceConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictServiceConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictServiceConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictServiceConfig.java index e5f671b8a..5405a7d9c 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dict/SessionDictServiceConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dict/SessionDictServiceConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dict; +package org.apache.bifromq.starter.config.model.dict; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistClientConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistClientConfig.java index ab080d3af..d0df2ca3c 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dist; +package org.apache.bifromq.starter.config.model.dist; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistServerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistServerConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistServerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistServerConfig.java index a96d47cb8..4ff286c6f 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistServerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistServerConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dist; +package org.apache.bifromq.starter.config.model.dist; import java.util.HashMap; import java.util.HashSet; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistServiceConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistServiceConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistServiceConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistServiceConfig.java index ade97fcac..7809e1663 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistServiceConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistServiceConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dist; +package org.apache.bifromq.starter.config.model.dist; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistWorkerClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistWorkerClientConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistWorkerClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistWorkerClientConfig.java index 976fd8712..6d9392c26 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistWorkerClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistWorkerClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dist; +package org.apache.bifromq.starter.config.model.dist; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistWorkerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistWorkerConfig.java similarity index 82% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistWorkerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistWorkerConfig.java index 33c6234c3..3d5108c5f 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/dist/DistWorkerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/dist/DistWorkerConfig.java @@ -11,11 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.dist; +package org.apache.bifromq.starter.config.model.dist; -import com.baidu.bifromq.starter.config.model.BalancerOptions; -import com.baidu.bifromq.starter.config.model.RocksDBEngineConfig; -import com.baidu.bifromq.starter.config.model.StorageEngineConfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.google.protobuf.Struct; @@ -24,6 +21,9 @@ import java.util.Map; import lombok.Getter; import lombok.Setter; +import org.apache.bifromq.starter.config.model.BalancerOptions; +import org.apache.bifromq.starter.config.model.RocksDBEngineConfig; +import org.apache.bifromq.starter.config.model.StorageEngineConfig; @Getter @Setter @@ -48,9 +48,9 @@ public class DistWorkerConfig { private Map attributes = new HashMap<>(); public DistWorkerConfig() { - balanceConfig.getBalancers().put("com.baidu.bifromq.dist.worker.balance.RangeLeaderBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.dist.worker.balance.RangeLeaderBalancerFactory", Struct.getDefaultInstance()); - balanceConfig.getBalancers().put("com.baidu.bifromq.dist.worker.balance.ReplicaCntBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.dist.worker.balance.ReplicaCntBalancerFactory", Struct.newBuilder() .putFields("votersPerRange", Value.newBuilder().setNumberValue(3).build()) .putFields("learnersPerRange", Value.newBuilder().setNumberValue(-1).build()) diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxClientConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxClientConfig.java index 5808f3728..e6a904c22 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.inbox; +package org.apache.bifromq.starter.config.model.inbox; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxServerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxServerConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxServerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxServerConfig.java index 89f19e978..d5db7b022 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxServerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxServerConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.inbox; +package org.apache.bifromq.starter.config.model.inbox; import java.util.HashMap; import java.util.HashSet; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxServiceConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxServiceConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxServiceConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxServiceConfig.java index e56382e8c..eba984f8d 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxServiceConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxServiceConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.inbox; +package org.apache.bifromq.starter.config.model.inbox; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java index f3fe076c3..076c6898d 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxStoreClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.inbox; +package org.apache.bifromq.starter.config.model.inbox; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxStoreConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxStoreConfig.java similarity index 80% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxStoreConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxStoreConfig.java index 090efe306..ef156fd2e 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/inbox/InboxStoreConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/inbox/InboxStoreConfig.java @@ -11,12 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.inbox; +package org.apache.bifromq.starter.config.model.inbox; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.starter.config.model.BalancerOptions; -import com.baidu.bifromq.starter.config.model.RocksDBEngineConfig; -import com.baidu.bifromq.starter.config.model.StorageEngineConfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.google.protobuf.Struct; @@ -25,6 +21,10 @@ import java.util.Map; import lombok.Getter; import lombok.Setter; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.starter.config.model.BalancerOptions; +import org.apache.bifromq.starter.config.model.RocksDBEngineConfig; +import org.apache.bifromq.starter.config.model.StorageEngineConfig; @Getter @Setter @@ -51,11 +51,11 @@ public class InboxStoreConfig { private Map attributes = new HashMap<>(); public InboxStoreConfig() { - balanceConfig.getBalancers().put("com.baidu.bifromq.inbox.store.balance.ReplicaCntBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.inbox.store.balance.ReplicaCntBalancerFactory", Struct.newBuilder() .putFields("votersPerRange", Value.newBuilder().setNumberValue(3).build()) .build()); - balanceConfig.getBalancers().put("com.baidu.bifromq.inbox.store.balance.RangeSplitBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.inbox.store.balance.RangeSplitBalancerFactory", Struct.newBuilder() .putFields("maxRangesPerStore", Value.newBuilder().setNumberValue( (EnvProvider.INSTANCE.availableProcessors() / 4.0)).build()) @@ -63,7 +63,7 @@ public InboxStoreConfig() { .putFields("maxIODensity", Value.newBuilder().setNumberValue(100).build()) .putFields("ioNanosLimit", Value.newBuilder().setNumberValue(30_000).build()) .build()); - balanceConfig.getBalancers().put("com.baidu.bifromq.inbox.store.balance.RangeLeaderBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.inbox.store.balance.RangeLeaderBalancerFactory", Struct.getDefaultInstance()); } } diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java index e45cede13..5ffb059cf 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTBrokerClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt; +package org.apache.bifromq.starter.config.model.mqtt; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTServerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTServerConfig.java similarity index 80% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTServerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTServerConfig.java index 79aed747c..42d8f870d 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTServerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTServerConfig.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt; +package org.apache.bifromq.starter.config.model.mqtt; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.starter.config.model.mqtt.listener.TCPListenerConfig; -import com.baidu.bifromq.starter.config.model.mqtt.listener.TLSListenerConfig; -import com.baidu.bifromq.starter.config.model.mqtt.listener.WSListenerConfig; -import com.baidu.bifromq.starter.config.model.mqtt.listener.WSSListenerConfig; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.starter.config.model.mqtt.listener.TCPListenerConfig; +import org.apache.bifromq.starter.config.model.mqtt.listener.TLSListenerConfig; +import org.apache.bifromq.starter.config.model.mqtt.listener.WSListenerConfig; +import org.apache.bifromq.starter.config.model.mqtt.listener.WSSListenerConfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import lombok.Getter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java index 3d3702ee0..d10ce78f9 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/MQTTServiceConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt; +package org.apache.bifromq.starter.config.model.mqtt; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java similarity index 92% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java index db35eedc7..11c208517 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/TCPListenerConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt.listener; +package org.apache.bifromq.starter.config.model.mqtt.listener; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java similarity index 86% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java index 61da78865..b1c721e74 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/TLSListenerConfig.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt.listener; +package org.apache.bifromq.starter.config.model.mqtt.listener; -import com.baidu.bifromq.starter.config.model.ServerSSLContextConfig; +import org.apache.bifromq.starter.config.model.ServerSSLContextConfig; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java index 08984103d..694d49f19 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/WSListenerConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt.listener; +package org.apache.bifromq.starter.config.model.mqtt.listener; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java similarity index 86% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java index 1e3968ba7..a86764c8e 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/mqtt/listener/WSSListenerConfig.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.mqtt.listener; +package org.apache.bifromq.starter.config.model.mqtt.listener; -import com.baidu.bifromq.starter.config.model.ServerSSLContextConfig; +import org.apache.bifromq.starter.config.model.ServerSSLContextConfig; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainClientConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainClientConfig.java index 5177f11c7..1dc9682ac 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.retain; +package org.apache.bifromq.starter.config.model.retain; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainServerConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainServerConfig.java similarity index 94% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainServerConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainServerConfig.java index 42de8e14d..bf891819b 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainServerConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainServerConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.retain; +package org.apache.bifromq.starter.config.model.retain; import java.util.HashMap; import java.util.HashSet; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainServiceConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainServiceConfig.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainServiceConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainServiceConfig.java index ac5145057..a38390057 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainServiceConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainServiceConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.retain; +package org.apache.bifromq.starter.config.model.retain; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainStoreClientConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainStoreClientConfig.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainStoreClientConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainStoreClientConfig.java index 275a1ebda..42c3ed170 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainStoreClientConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainStoreClientConfig.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.retain; +package org.apache.bifromq.starter.config.model.retain; import lombok.Getter; import lombok.Setter; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainStoreConfig.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainStoreConfig.java similarity index 83% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainStoreConfig.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainStoreConfig.java index 484173fb9..7195f0e33 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/config/model/retain/RetainStoreConfig.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/config/model/retain/RetainStoreConfig.java @@ -11,12 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.config.model.retain; +package org.apache.bifromq.starter.config.model.retain; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.starter.config.model.BalancerOptions; -import com.baidu.bifromq.starter.config.model.RocksDBEngineConfig; -import com.baidu.bifromq.starter.config.model.StorageEngineConfig; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.annotation.Nulls; import com.google.protobuf.Struct; @@ -25,6 +21,10 @@ import java.util.Map; import lombok.Getter; import lombok.Setter; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.starter.config.model.BalancerOptions; +import org.apache.bifromq.starter.config.model.RocksDBEngineConfig; +import org.apache.bifromq.starter.config.model.StorageEngineConfig; @Getter @Setter @@ -50,12 +50,12 @@ public class RetainStoreConfig { private Map attributes = new HashMap<>(); public RetainStoreConfig() { - balanceConfig.getBalancers().put("com.baidu.bifromq.retain.store.balance.ReplicaCntBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.retain.store.balance.ReplicaCntBalancerFactory", Struct.newBuilder() .putFields("votersPerRange", Value.newBuilder().setNumberValue(3).build()) .putFields("learnersPerRange", Value.newBuilder().setNumberValue(-1).build()) .build()); - balanceConfig.getBalancers().put("com.baidu.bifromq.retain.store.balance.RangeSplitBalancerFactory", + balanceConfig.getBalancers().put("org.apache.bifromq.retain.store.balance.RangeSplitBalancerFactory", Struct.newBuilder() .putFields("maxRangesPerStore", Value.newBuilder().setNumberValue( (EnvProvider.INSTANCE.availableProcessors() / 4.0)).build()) diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/metrics/netty/PooledByteBufAllocator.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/metrics/netty/PooledByteBufAllocator.java similarity index 96% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/metrics/netty/PooledByteBufAllocator.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/metrics/netty/PooledByteBufAllocator.java index 06fa50631..39bf8b49d 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/metrics/netty/PooledByteBufAllocator.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/metrics/netty/PooledByteBufAllocator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.metrics.netty; +package org.apache.bifromq.starter.metrics.netty; import io.netty.buffer.ByteBufAllocatorMetric; import io.netty.buffer.ByteBufAllocatorMetricProvider; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java index b7e8c1d02..33ec889dd 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/metrics/netty/PooledByteBufAllocatorMetric.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.metrics.netty; +package org.apache.bifromq.starter.metrics.netty; -import com.baidu.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.EnvProvider; import io.netty.buffer.ByteBufAllocatorMetric; import java.util.concurrent.Executor; import java.util.concurrent.Executors; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/APIServerModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/APIServerModule.java similarity index 78% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/APIServerModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/APIServerModule.java index b3b0eaa20..6ecd71f6c 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/APIServerModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/APIServerModule.java @@ -11,22 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.SSLUtil.buildServerSslContext; +import static org.apache.bifromq.starter.module.SSLUtil.buildServerSslContext; -import com.baidu.bifromq.apiserver.APIServer; -import com.baidu.bifromq.apiserver.IAPIServer; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.plugin.settingprovider.SettingProviderManager; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.api.APIServerConfig; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.plugin.settingprovider.SettingProviderManager; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.api.APIServerConfig; import com.google.common.base.Strings; import com.google.inject.AbstractModule; import com.google.inject.Inject; @@ -34,8 +27,22 @@ import com.google.inject.TypeLiteral; import io.netty.handler.ssl.SslContext; import java.util.Optional; +import org.apache.bifromq.apiserver.APIServer; +import org.apache.bifromq.apiserver.IAPIServer; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; public class APIServerModule extends AbstractModule { + @Override + protected void configure() { + bind(new TypeLiteral>() { + }).toProvider(APIServerProvider.class) + .asEagerSingleton(); + } + private static class APIServerProvider implements Provider> { private final StandaloneConfig config; private final ServiceInjector injector; @@ -75,11 +82,4 @@ public Optional get() { .build()); } } - - @Override - protected void configure() { - bind(new TypeLiteral>() { - }).toProvider(APIServerProvider.class) - .asEagerSingleton(); - } } diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ConfigModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ConfigModule.java similarity index 90% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ConfigModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ConfigModule.java index 6d1685bb2..123da2d31 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ConfigModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ConfigModule.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import com.baidu.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.StandaloneConfig; import com.google.inject.AbstractModule; public class ConfigModule extends AbstractModule { diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/CoreServiceModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/CoreServiceModule.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/CoreServiceModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/CoreServiceModule.java index 1918f5ec7..8249c73b0 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/CoreServiceModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/CoreServiceModule.java @@ -11,27 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; - -import com.baidu.bifromq.basecluster.AgentHostOptions; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basecrdt.service.CRDTServiceOptions; -import com.baidu.bifromq.basecrdt.service.ICRDTService; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.worker.IDistWorker; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.store.IInboxStore; -import com.baidu.bifromq.mqtt.inbox.IMqttBrokerClient; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.retain.store.IRetainStore; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.dist.DistWorkerClientConfig; -import com.baidu.bifromq.starter.config.model.inbox.InboxStoreConfig; -import com.baidu.bifromq.starter.config.model.retain.RetainStoreClientConfig; +package org.apache.bifromq.starter.module; + +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.retain.store.IRetainStore; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.dist.DistWorkerClientConfig; +import org.apache.bifromq.starter.config.model.inbox.InboxStoreConfig; +import org.apache.bifromq.starter.config.model.retain.RetainStoreClientConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; @@ -41,6 +29,18 @@ import jakarta.inject.Named; import jakarta.inject.Singleton; import java.util.Optional; +import org.apache.bifromq.basecluster.AgentHostOptions; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basecrdt.service.CRDTServiceOptions; +import org.apache.bifromq.basecrdt.service.ICRDTService; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.worker.IDistWorker; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.store.IInboxStore; +import org.apache.bifromq.mqtt.inbox.IMqttBrokerClient; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; public class CoreServiceModule extends AbstractModule { @Override diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/DistServiceModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/DistServiceModule.java similarity index 81% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/DistServiceModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/DistServiceModule.java index 39040fb8d..bd53785c6 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/DistServiceModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/DistServiceModule.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.EngineConfUtil.buildDataEngineConf; -import static com.baidu.bifromq.starter.module.EngineConfUtil.buildWALEngineConf; +import static org.apache.bifromq.starter.module.EngineConfUtil.buildDataEngineConf; +import static org.apache.bifromq.starter.module.EngineConfUtil.buildWALEngineConf; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeOptions; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.dist.server.IDistServer; -import com.baidu.bifromq.dist.worker.IDistWorker; -import com.baidu.bifromq.plugin.eventcollector.EventCollectorManager; -import com.baidu.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; -import com.baidu.bifromq.plugin.settingprovider.SettingProviderManager; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.dist.DistServerConfig; -import com.baidu.bifromq.starter.config.model.dist.DistWorkerConfig; -import com.baidu.bifromq.sysprops.props.DistWorkerLoadEstimationWindowSeconds; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeOptions; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.dist.server.IDistServer; +import org.apache.bifromq.dist.worker.IDistWorker; +import org.apache.bifromq.plugin.eventcollector.EventCollectorManager; +import org.apache.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; +import org.apache.bifromq.plugin.settingprovider.SettingProviderManager; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.dist.DistServerConfig; +import org.apache.bifromq.starter.config.model.dist.DistWorkerConfig; +import org.apache.bifromq.sysprops.props.DistWorkerLoadEstimationWindowSeconds; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Key; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/EngineConfUtil.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/EngineConfUtil.java similarity index 90% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/EngineConfUtil.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/EngineConfUtil.java index 5e0e3ff74..b7f1c9250 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/EngineConfUtil.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/EngineConfUtil.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import com.baidu.bifromq.basekv.localengine.ICPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.IWALableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; -import com.baidu.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; -import com.baidu.bifromq.starter.config.model.InMemEngineConfig; -import com.baidu.bifromq.starter.config.model.RocksDBEngineConfig; -import com.baidu.bifromq.starter.config.model.StorageEngineConfig; +import org.apache.bifromq.basekv.localengine.ICPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.IWALableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.memory.InMemKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBCPableKVEngineConfigurator; +import org.apache.bifromq.basekv.localengine.rocksdb.RocksDBWALableKVEngineConfigurator; +import org.apache.bifromq.starter.config.model.InMemEngineConfig; +import org.apache.bifromq.starter.config.model.RocksDBEngineConfig; +import org.apache.bifromq.starter.config.model.StorageEngineConfig; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ExecutorsModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ExecutorsModule.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ExecutorsModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ExecutorsModule.java index f9a553f1b..5ab9f5ce5 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ExecutorsModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ExecutorsModule.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import com.baidu.bifromq.baseenv.EnvProvider; -import com.baidu.bifromq.baseenv.NettyEnv; -import com.baidu.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.baseenv.EnvProvider; +import org.apache.bifromq.baseenv.NettyEnv; +import org.apache.bifromq.starter.config.StandaloneConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/InboxServiceModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/InboxServiceModule.java similarity index 80% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/InboxServiceModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/InboxServiceModule.java index 41dcbc76e..192a9d7a3 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/InboxServiceModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/InboxServiceModule.java @@ -11,30 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.EngineConfUtil.buildDataEngineConf; -import static com.baidu.bifromq.starter.module.EngineConfUtil.buildWALEngineConf; +import static org.apache.bifromq.starter.module.EngineConfUtil.buildDataEngineConf; +import static org.apache.bifromq.starter.module.EngineConfUtil.buildWALEngineConf; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeOptions; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.inbox.server.IInboxServer; -import com.baidu.bifromq.inbox.store.IInboxStore; -import com.baidu.bifromq.plugin.eventcollector.EventCollectorManager; -import com.baidu.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; -import com.baidu.bifromq.plugin.settingprovider.SettingProviderManager; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.inbox.InboxServerConfig; -import com.baidu.bifromq.starter.config.model.inbox.InboxStoreConfig; -import com.baidu.bifromq.sysprops.props.InboxStoreLoadEstimationWindowSeconds; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.plugin.eventcollector.EventCollectorManager; +import org.apache.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; +import org.apache.bifromq.plugin.settingprovider.SettingProviderManager; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.inbox.InboxServerConfig; +import org.apache.bifromq.starter.config.model.inbox.InboxStoreConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Key; @@ -45,6 +34,17 @@ import java.time.Duration; import java.util.Optional; import java.util.concurrent.ScheduledExecutorService; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeOptions; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.inbox.server.IInboxServer; +import org.apache.bifromq.inbox.store.IInboxStore; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; +import org.apache.bifromq.sysprops.props.InboxStoreLoadEstimationWindowSeconds; public class InboxServiceModule extends AbstractModule { @Override diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/MQTTServiceModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/MQTTServiceModule.java similarity index 82% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/MQTTServiceModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/MQTTServiceModule.java index 73e2d9a29..64415f72c 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/MQTTServiceModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/MQTTServiceModule.java @@ -11,30 +11,30 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.SSLUtil.buildServerSslContext; +import static org.apache.bifromq.starter.module.SSLUtil.buildServerSslContext; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.mqtt.IMQTTBroker; -import com.baidu.bifromq.mqtt.IMQTTBrokerBuilder; -import com.baidu.bifromq.plugin.authprovider.AuthProviderManager; -import com.baidu.bifromq.plugin.clientbalancer.ClientBalancerManager; -import com.baidu.bifromq.plugin.eventcollector.EventCollectorManager; -import com.baidu.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; -import com.baidu.bifromq.plugin.settingprovider.SettingProviderManager; -import com.baidu.bifromq.retain.client.IRetainClient; -import com.baidu.bifromq.sessiondict.client.ISessionDictClient; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.mqtt.MQTTServerConfig; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.plugin.authprovider.AuthProviderManager; +import org.apache.bifromq.plugin.clientbalancer.ClientBalancerManager; +import org.apache.bifromq.plugin.eventcollector.EventCollectorManager; +import org.apache.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; +import org.apache.bifromq.plugin.settingprovider.SettingProviderManager; +import org.apache.bifromq.retain.client.IRetainClient; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.mqtt.MQTTServerConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import jakarta.inject.Singleton; import java.util.Optional; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.mqtt.IMQTTBroker; +import org.apache.bifromq.mqtt.IMQTTBrokerBuilder; +import org.apache.bifromq.sessiondict.client.ISessionDictClient; public class MQTTServiceModule extends AbstractModule { @Override diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/PluginModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/PluginModule.java similarity index 90% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/PluginModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/PluginModule.java index 740e1653a..cc119b682 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/PluginModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/PluginModule.java @@ -11,23 +11,23 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; - -import com.baidu.bifromq.inbox.client.IInboxClient; -import com.baidu.bifromq.mqtt.inbox.IMqttBrokerClient; -import com.baidu.bifromq.plugin.authprovider.AuthProviderManager; -import com.baidu.bifromq.plugin.clientbalancer.ClientBalancerManager; -import com.baidu.bifromq.plugin.eventcollector.EventCollectorManager; -import com.baidu.bifromq.plugin.manager.BifroMQPluginManager; -import com.baidu.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; -import com.baidu.bifromq.plugin.settingprovider.SettingProviderManager; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.plugin.subbroker.SubBrokerManager; -import com.baidu.bifromq.starter.config.StandaloneConfig; +package org.apache.bifromq.starter.module; + +import org.apache.bifromq.plugin.authprovider.AuthProviderManager; +import org.apache.bifromq.plugin.clientbalancer.ClientBalancerManager; +import org.apache.bifromq.plugin.eventcollector.EventCollectorManager; +import org.apache.bifromq.plugin.manager.BifroMQPluginManager; +import org.apache.bifromq.plugin.resourcethrottler.ResourceThrottlerManager; +import org.apache.bifromq.plugin.settingprovider.SettingProviderManager; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.plugin.subbroker.SubBrokerManager; +import org.apache.bifromq.starter.config.StandaloneConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; import jakarta.inject.Singleton; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.inbox.client.IInboxClient; +import org.apache.bifromq.mqtt.inbox.IMqttBrokerClient; import org.pf4j.PluginManager; @Slf4j diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RPCClientSSLContextModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RPCClientSSLContextModule.java similarity index 90% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RPCClientSSLContextModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RPCClientSSLContextModule.java index 2758c22fd..004b74775 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RPCClientSSLContextModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RPCClientSSLContextModule.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.SSLUtil.defaultSslProvider; -import static com.baidu.bifromq.starter.utils.ResourceUtil.loadFile; +import static org.apache.bifromq.starter.module.SSLUtil.defaultSslProvider; +import static org.apache.bifromq.starter.utils.ResourceUtil.loadFile; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.SSLContextConfig; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.SSLContextConfig; import com.google.common.base.Strings; import com.google.inject.AbstractModule; import com.google.inject.Inject; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RPCServerBuilderModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RPCServerBuilderModule.java similarity index 85% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RPCServerBuilderModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RPCServerBuilderModule.java index be78fe2d0..68ee22e19 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RPCServerBuilderModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RPCServerBuilderModule.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.SSLUtil.defaultSslProvider; -import static com.baidu.bifromq.starter.module.SSLUtil.findJdkProvider; -import static com.baidu.bifromq.starter.utils.ResourceUtil.loadFile; +import static org.apache.bifromq.starter.module.SSLUtil.defaultSslProvider; +import static org.apache.bifromq.starter.module.SSLUtil.findJdkProvider; +import static org.apache.bifromq.starter.utils.ResourceUtil.loadFile; -import com.baidu.bifromq.baserpc.server.IRPCServer; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.ServerSSLContextConfig; +import org.apache.bifromq.baserpc.server.IRPCServer; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.baserpc.trafficgovernor.IRPCServiceTrafficService; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.ServerSSLContextConfig; import com.google.common.base.Strings; import com.google.inject.AbstractModule; import com.google.inject.Inject; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RetainServiceModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RetainServiceModule.java similarity index 81% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RetainServiceModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RetainServiceModule.java index b7b380076..0cd142eed 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/RetainServiceModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/RetainServiceModule.java @@ -11,26 +11,26 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.module.EngineConfUtil.buildDataEngineConf; -import static com.baidu.bifromq.starter.module.EngineConfUtil.buildWALEngineConf; +import static org.apache.bifromq.starter.module.EngineConfUtil.buildDataEngineConf; +import static org.apache.bifromq.starter.module.EngineConfUtil.buildWALEngineConf; -import com.baidu.bifromq.basecluster.IAgentHost; -import com.baidu.bifromq.basekv.client.IBaseKVStoreClient; -import com.baidu.bifromq.basekv.metaservice.IBaseKVMetaService; -import com.baidu.bifromq.basekv.store.option.KVRangeOptions; -import com.baidu.bifromq.basekv.store.option.KVRangeStoreOptions; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.dist.client.IDistClient; -import com.baidu.bifromq.plugin.settingprovider.SettingProviderManager; -import com.baidu.bifromq.plugin.subbroker.ISubBrokerManager; -import com.baidu.bifromq.retain.server.IRetainServer; -import com.baidu.bifromq.retain.store.IRetainStore; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.retain.RetainServerConfig; -import com.baidu.bifromq.starter.config.model.retain.RetainStoreConfig; -import com.baidu.bifromq.sysprops.props.RetainStoreLoadEstimationWindowSeconds; +import org.apache.bifromq.basecluster.IAgentHost; +import org.apache.bifromq.basekv.client.IBaseKVStoreClient; +import org.apache.bifromq.basekv.metaservice.IBaseKVMetaService; +import org.apache.bifromq.basekv.store.option.KVRangeOptions; +import org.apache.bifromq.basekv.store.option.KVRangeStoreOptions; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.dist.client.IDistClient; +import org.apache.bifromq.plugin.settingprovider.SettingProviderManager; +import org.apache.bifromq.plugin.subbroker.ISubBrokerManager; +import org.apache.bifromq.retain.server.IRetainServer; +import org.apache.bifromq.retain.store.IRetainStore; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.retain.RetainServerConfig; +import org.apache.bifromq.starter.config.model.retain.RetainStoreConfig; +import org.apache.bifromq.sysprops.props.RetainStoreLoadEstimationWindowSeconds; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Key; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SSLUtil.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SSLUtil.java similarity index 93% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SSLUtil.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SSLUtil.java index 0a0ba7621..992e98d76 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SSLUtil.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SSLUtil.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import static com.baidu.bifromq.starter.utils.ResourceUtil.loadFile; +import static org.apache.bifromq.starter.utils.ResourceUtil.loadFile; -import com.baidu.bifromq.starter.config.model.ServerSSLContextConfig; +import org.apache.bifromq.starter.config.model.ServerSSLContextConfig; import com.google.common.base.Strings; import io.netty.handler.ssl.OpenSsl; import io.netty.handler.ssl.SslContext; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ServiceInjector.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ServiceInjector.java similarity index 96% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ServiceInjector.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ServiceInjector.java index 937eda603..59d3e33fb 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ServiceInjector.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ServiceInjector.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; import com.google.inject.Injector; import com.google.inject.Key; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ServiceInjectorModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ServiceInjectorModule.java similarity index 95% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ServiceInjectorModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ServiceInjectorModule.java index 2ec26ad7d..4d55ced8e 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/ServiceInjectorModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/ServiceInjectorModule.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; import com.google.inject.AbstractModule; import com.google.inject.Injector; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SessionDictServiceModule.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SessionDictServiceModule.java similarity index 86% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SessionDictServiceModule.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SessionDictServiceModule.java index 9a5eb2b79..551c953f2 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SessionDictServiceModule.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SessionDictServiceModule.java @@ -11,19 +11,19 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; -import com.baidu.bifromq.baserpc.server.RPCServerBuilder; -import com.baidu.bifromq.mqtt.inbox.IMqttBrokerClient; -import com.baidu.bifromq.sessiondict.server.ISessionDictServer; -import com.baidu.bifromq.starter.config.StandaloneConfig; -import com.baidu.bifromq.starter.config.model.dict.SessionDictServerConfig; +import org.apache.bifromq.baserpc.server.RPCServerBuilder; +import org.apache.bifromq.starter.config.StandaloneConfig; +import org.apache.bifromq.starter.config.model.dict.SessionDictServerConfig; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import jakarta.inject.Singleton; import java.util.Optional; +import org.apache.bifromq.mqtt.inbox.IMqttBrokerClient; +import org.apache.bifromq.sessiondict.server.ISessionDictServer; public class SessionDictServiceModule extends AbstractModule { @Override diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SharedResourceProvider.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SharedResourceProvider.java similarity index 96% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SharedResourceProvider.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SharedResourceProvider.java index aaa7f80ad..5f07cbf5a 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SharedResourceProvider.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SharedResourceProvider.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; import com.google.inject.Provider; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SharedResourcesHolder.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SharedResourcesHolder.java similarity index 97% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SharedResourcesHolder.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SharedResourcesHolder.java index f64c567ef..7dba1ab5b 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/module/SharedResourcesHolder.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/module/SharedResourcesHolder.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.module; +package org.apache.bifromq.starter.module; import com.google.common.util.concurrent.MoreExecutors; import io.netty.util.concurrent.EventExecutorGroup; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ClusterDomainUtil.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ClusterDomainUtil.java similarity index 98% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ClusterDomainUtil.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ClusterDomainUtil.java index ad4bbd711..785af26e5 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ClusterDomainUtil.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ClusterDomainUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.utils; +package org.apache.bifromq.starter.utils; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ConfigFileUtil.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ConfigFileUtil.java similarity index 97% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ConfigFileUtil.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ConfigFileUtil.java index b2a78a770..9f5be7c98 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ConfigFileUtil.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ConfigFileUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.utils; +package org.apache.bifromq.starter.utils; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ResourceUtil.java b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ResourceUtil.java similarity index 98% rename from build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ResourceUtil.java rename to build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ResourceUtil.java index b799236a3..de9ad6813 100644 --- a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/utils/ResourceUtil.java +++ b/build/build-bifromq-starters/src/main/java/org/apache/bifromq/starter/utils/ResourceUtil.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.utils; +package org.apache.bifromq.starter.utils; import java.io.File; import java.io.FileNotFoundException; diff --git a/build/build-bifromq-starters/src/test/java/com/baidu/bifromq/starter/utils/ClusterDomainUtilTest.java b/build/build-bifromq-starters/src/test/java/org/apache/bifromq/starter/utils/ClusterDomainUtilTest.java similarity index 97% rename from build/build-bifromq-starters/src/test/java/com/baidu/bifromq/starter/utils/ClusterDomainUtilTest.java rename to build/build-bifromq-starters/src/test/java/org/apache/bifromq/starter/utils/ClusterDomainUtilTest.java index 71d38b38c..fa562ab61 100644 --- a/build/build-bifromq-starters/src/test/java/com/baidu/bifromq/starter/utils/ClusterDomainUtilTest.java +++ b/build/build-bifromq-starters/src/test/java/org/apache/bifromq/starter/utils/ClusterDomainUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.utils; +package org.apache.bifromq.starter.utils; import static org.testng.Assert.assertThrows; import static org.testng.Assert.assertTrue; diff --git a/build/build-bifromq-starters/src/test/java/com/baidu/bifromq/starter/utils/ResourceUtilTest.java b/build/build-bifromq-starters/src/test/java/org/apache/bifromq/starter/utils/ResourceUtilTest.java similarity index 98% rename from build/build-bifromq-starters/src/test/java/com/baidu/bifromq/starter/utils/ResourceUtilTest.java rename to build/build-bifromq-starters/src/test/java/org/apache/bifromq/starter/utils/ResourceUtilTest.java index 5e385873d..c6a5bcd5b 100644 --- a/build/build-bifromq-starters/src/test/java/com/baidu/bifromq/starter/utils/ResourceUtilTest.java +++ b/build/build-bifromq-starters/src/test/java/org/apache/bifromq/starter/utils/ResourceUtilTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.starter.utils; +package org.apache.bifromq.starter.utils; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPluginContext.java b/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPluginContext.java deleted file mode 100644 index 2190f6dc9..000000000 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPluginContext.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.baidu.demo.plugin; - -import com.baidu.bifromq.plugin.BifroMQPluginContext; -import com.baidu.bifromq.plugin.BifroMQPluginDescriptor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -public class DemoPluginContext extends BifroMQPluginContext { - public DemoPluginContext(BifroMQPluginDescriptor descriptor) { - super(descriptor); - } - - @Override - public void init() { - log.info("Init Demo Plugin Context"); - } - - @Override - public void close() { - log.info("Close Demo Plugin Context"); - } -} diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoAuthProvider.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoAuthProvider.java similarity index 86% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoAuthProvider.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoAuthProvider.java index a8c6f78fb..06ba94222 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoAuthProvider.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoAuthProvider.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.type.ClientInfo; import java.net.URI; import java.util.concurrent.CompletableFuture; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.type.ClientInfo; import org.pf4j.Extension; @Slf4j diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPlugin.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPlugin.java similarity index 93% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPlugin.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPlugin.java index dd96ca267..370595b97 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoPlugin.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPlugin.java @@ -11,10 +11,11 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; + +import static org.apache.bifromq.demo.plugin.util.VariableUtil.getContext; +import static org.apache.bifromq.demo.plugin.util.VariableUtil.getPort; -import com.baidu.bifromq.plugin.BifroMQPlugin; -import com.baidu.bifromq.plugin.BifroMQPluginDescriptor; import com.sun.net.httpserver.HttpServer; import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Metrics; @@ -27,9 +28,8 @@ import java.net.InetSocketAddress; import java.time.Duration; import lombok.extern.slf4j.Slf4j; - -import static com.baidu.demo.plugin.util.VariableUtil.getContext; -import static com.baidu.demo.plugin.util.VariableUtil.getPort; +import org.apache.bifromq.plugin.BifroMQPlugin; +import org.apache.bifromq.plugin.BifroMQPluginDescriptor; @Slf4j public class DemoPlugin extends BifroMQPlugin { diff --git a/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPluginContext.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPluginContext.java new file mode 100644 index 000000000..cc064b8bc --- /dev/null +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoPluginContext.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2025. The BifroMQ Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package org.apache.bifromq.demo.plugin; + +import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.plugin.BifroMQPluginContext; +import org.apache.bifromq.plugin.BifroMQPluginDescriptor; + +@Slf4j +public class DemoPluginContext extends BifroMQPluginContext { + public DemoPluginContext(BifroMQPluginDescriptor descriptor) { + super(descriptor); + } + + @Override + public void init() { + log.info("Init Demo Plugin Context"); + } + + @Override + public void close() { + log.info("Close Demo Plugin Context"); + } +} diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoResourceThrottler.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoResourceThrottler.java similarity index 90% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoResourceThrottler.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoResourceThrottler.java index 67337601f..3342f37ed 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoResourceThrottler.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoResourceThrottler.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; import java.net.URI; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; import org.pf4j.Extension; @Slf4j diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoSettingProvider.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoSettingProvider.java similarity index 93% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoSettingProvider.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoSettingProvider.java index 03aa3f4aa..0adbffbcd 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/DemoSettingProvider.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/DemoSettingProvider.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; import java.net.URI; import java.util.EnumMap; import lombok.extern.slf4j.Slf4j; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; import org.pf4j.Extension; @Slf4j diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/EventLogger.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/EventLogger.java similarity index 82% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/EventLogger.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/EventLogger.java index 4acd11759..8cdf48f01 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/EventLogger.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/EventLogger.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.baidu.bifromq.plugin.eventcollector.Event; -import com.baidu.bifromq.plugin.eventcollector.IEventCollector; -import com.baidu.bifromq.plugin.eventcollector.OutOfTenantResource; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelClosedEvent; -import com.baidu.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ClientDisconnectEvent; +import org.apache.bifromq.plugin.eventcollector.Event; +import org.apache.bifromq.plugin.eventcollector.IEventCollector; +import org.apache.bifromq.plugin.eventcollector.OutOfTenantResource; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.channelclosed.ChannelClosedEvent; +import org.apache.bifromq.plugin.eventcollector.mqttbroker.clientdisconnect.ClientDisconnectEvent; import org.pf4j.Extension; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedAuthProvider.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedAuthProvider.java similarity index 91% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedAuthProvider.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedAuthProvider.java index ea0807b14..e91346e0f 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedAuthProvider.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedAuthProvider.java @@ -11,16 +11,10 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; -import com.baidu.bifromq.plugin.authprovider.IAuthProvider; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Reject; -import com.baidu.bifromq.type.ClientInfo; import com.google.protobuf.util.JsonFormat; import java.net.URI; import java.net.http.HttpClient; @@ -28,6 +22,12 @@ import java.net.http.HttpResponse; import java.time.Duration; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.plugin.authprovider.IAuthProvider; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Reject; +import org.apache.bifromq.type.ClientInfo; class WebHookBasedAuthProvider implements IAuthProvider { private final URI webhookURI; diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedResourceThrottler.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedResourceThrottler.java similarity index 94% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedResourceThrottler.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedResourceThrottler.java index 8591474b7..8625584ef 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedResourceThrottler.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedResourceThrottler.java @@ -11,10 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.bifromq.plugin.resourcethrottler.IResourceThrottler; -import com.bifromq.plugin.resourcethrottler.TenantResourceType; import com.github.benmanes.caffeine.cache.AsyncLoadingCache; import com.github.benmanes.caffeine.cache.Caffeine; import java.net.URI; @@ -23,14 +21,12 @@ import java.net.http.HttpResponse; import java.time.Duration; import java.util.concurrent.CompletableFuture; +import org.apache.bifromq.plugin.resourcethrottler.IResourceThrottler; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; class WebHookBasedResourceThrottler implements IResourceThrottler { - private record ResourceKey(String tenantId, TenantResourceType type) { - } - private final AsyncLoadingCache resultCache; private final HttpClient httpClient; - WebHookBasedResourceThrottler(URI webhookURI) { this.httpClient = HttpClient.newBuilder() .version(HttpClient.Version.HTTP_1_1) @@ -74,4 +70,7 @@ public boolean hasResource(String tenantId, TenantResourceType type) { } return true; } + + private record ResourceKey(String tenantId, TenantResourceType type) { + } } diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedSettingProvider.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedSettingProvider.java similarity index 94% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedSettingProvider.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedSettingProvider.java index 7434432da..848f81c69 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/WebHookBasedSettingProvider.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/WebHookBasedSettingProvider.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.baidu.bifromq.plugin.settingprovider.ISettingProvider; -import com.baidu.bifromq.plugin.settingprovider.Setting; import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.time.Duration; +import org.apache.bifromq.plugin.settingprovider.ISettingProvider; +import org.apache.bifromq.plugin.settingprovider.Setting; class WebHookBasedSettingProvider implements ISettingProvider { diff --git a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/util/VariableUtil.java b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/util/VariableUtil.java similarity index 62% rename from build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/util/VariableUtil.java rename to build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/util/VariableUtil.java index 313e6acd3..47bab4975 100644 --- a/build/build-plugin-demo/src/main/java/com/baidu/demo/plugin/util/VariableUtil.java +++ b/build/build-plugin-demo/src/main/java/org/apache/bifromq/demo/plugin/util/VariableUtil.java @@ -1,4 +1,17 @@ -package com.baidu.demo.plugin.util; +/* + * Copyright (c) 2025. The BifroMQ Authors. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and limitations under the License. + */ + +package org.apache.bifromq.demo.plugin.util; import lombok.extern.slf4j.Slf4j; diff --git a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestAuthServer.java b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestAuthServer.java similarity index 93% rename from build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestAuthServer.java rename to build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestAuthServer.java index 5ee48fe22..a35bca198 100644 --- a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestAuthServer.java +++ b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestAuthServer.java @@ -11,13 +11,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin; +package org.apache.bifromq.demo.plugin; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.Ok; -import com.baidu.bifromq.plugin.authprovider.type.Reject; import com.google.protobuf.util.JsonFormat; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; @@ -29,12 +24,17 @@ import java.util.HashSet; import java.util.Set; import lombok.SneakyThrows; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.Ok; +import org.apache.bifromq.plugin.authprovider.type.Reject; public class TestAuthServer { private static final Set authedUsers = new HashSet<>(); private static final Set permittedPubTopics = new HashSet<>(); private static final Set permittedSubTopicFilters = new HashSet<>(); - private HttpServer server; + private final HttpServer server; @SneakyThrows public TestAuthServer() { @@ -44,6 +44,23 @@ public TestAuthServer() { server.setExecutor(null); } + private static void sendJson(HttpExchange exchange, String response) throws IOException { + sendResponse(exchange, "application/json", response, 200); + } + + private static void sendText(HttpExchange exchange, String response) throws IOException { + sendResponse(exchange, "text/plain", response, 200); + } + + private static void sendResponse(HttpExchange exchange, String contentType, String response, int statusCode) + throws IOException { + exchange.getResponseHeaders().add("Content-Type", contentType); + exchange.sendResponseHeaders(statusCode, response.getBytes().length); + OutputStream os = exchange.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } + public void start() { server.start(); } @@ -121,21 +138,4 @@ public void handle(HttpExchange exchange) throws IOException { } } } - - private static void sendJson(HttpExchange exchange, String response) throws IOException { - sendResponse(exchange, "application/json", response, 200); - } - - private static void sendText(HttpExchange exchange, String response) throws IOException { - sendResponse(exchange, "text/plain", response, 200); - } - - private static void sendResponse(HttpExchange exchange, String contentType, String response, int statusCode) - throws IOException { - exchange.getResponseHeaders().add("Content-Type", contentType); - exchange.sendResponseHeaders(statusCode, response.getBytes().length); - OutputStream os = exchange.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } } diff --git a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestSettingServer.java b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestSettingServer.java similarity index 96% rename from build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestSettingServer.java rename to build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestSettingServer.java index 28bf310e9..5969fac82 100644 --- a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestSettingServer.java +++ b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestSettingServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin;/* +package org.apache.bifromq.demo.plugin;/* * Copyright (c) 2024. The BifroMQ Authors. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,6 @@ * See the License for the specific language governing permissions and limitations under the License. */ -import com.baidu.bifromq.plugin.settingprovider.Setting; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; @@ -35,10 +34,11 @@ import java.util.HashMap; import java.util.Map; import lombok.SneakyThrows; +import org.apache.bifromq.plugin.settingprovider.Setting; public class TestSettingServer { private static final Map settingMap = new HashMap<>(); - private HttpServer server; + private final HttpServer server; @SneakyThrows public TestSettingServer() { @@ -47,6 +47,18 @@ public TestSettingServer() { server.setExecutor(null); } + private static void sendResponse(HttpExchange exchange, String response) throws IOException { + sendResponse(exchange, response, 200); + } + + private static void sendResponse(HttpExchange exchange, String response, int statusCode) throws IOException { + exchange.getResponseHeaders().add("Content-Type", "text/plain"); + exchange.sendResponseHeaders(statusCode, response.getBytes().length); + OutputStream os = exchange.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } + public void start() { server.start(); } @@ -64,7 +76,6 @@ public void provide(String tenantId, Setting setting, Object value) { settingMap.put(tenantId + setting.name(), value); } - static class QueryHandler implements HttpHandler { @Override public void handle(HttpExchange exchange) throws IOException { @@ -83,16 +94,4 @@ public void handle(HttpExchange exchange) throws IOException { } } } - - private static void sendResponse(HttpExchange exchange, String response) throws IOException { - sendResponse(exchange, response, 200); - } - - private static void sendResponse(HttpExchange exchange, String response, int statusCode) throws IOException { - exchange.getResponseHeaders().add("Content-Type", "text/plain"); - exchange.sendResponseHeaders(statusCode, response.getBytes().length); - OutputStream os = exchange.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } } diff --git a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestThrottlerServer.java b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestThrottlerServer.java similarity index 96% rename from build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestThrottlerServer.java rename to build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestThrottlerServer.java index 8ceb735f2..e7572acb4 100644 --- a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/TestThrottlerServer.java +++ b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/TestThrottlerServer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin;/* +package org.apache.bifromq.demo.plugin;/* * Copyright (c) 2024. The BifroMQ Authors. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,6 @@ * See the License for the specific language governing permissions and limitations under the License. */ -import com.bifromq.plugin.resourcethrottler.TenantResourceType; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; @@ -35,10 +34,11 @@ import java.util.HashMap; import java.util.Map; import lombok.SneakyThrows; +import org.apache.bifromq.plugin.resourcethrottler.TenantResourceType; public class TestThrottlerServer { private static final Map hasResourceMap = new HashMap<>(); - private HttpServer server; + private final HttpServer server; @SneakyThrows public TestThrottlerServer() { @@ -47,6 +47,18 @@ public TestThrottlerServer() { server.setExecutor(null); } + private static void sendResponse(HttpExchange exchange, String response) throws IOException { + sendResponse(exchange, response, 200); + } + + private static void sendResponse(HttpExchange exchange, String response, int statusCode) throws IOException { + exchange.getResponseHeaders().add("Content-Type", "text/plain"); + exchange.sendResponseHeaders(statusCode, response.getBytes().length); + OutputStream os = exchange.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } + public void start() { server.start(); } @@ -82,16 +94,4 @@ public void handle(HttpExchange exchange) throws IOException { } } } - - private static void sendResponse(HttpExchange exchange, String response) throws IOException { - sendResponse(exchange, response, 200); - } - - private static void sendResponse(HttpExchange exchange, String response, int statusCode) throws IOException { - exchange.getResponseHeaders().add("Content-Type", "text/plain"); - exchange.sendResponseHeaders(statusCode, response.getBytes().length); - OutputStream os = exchange.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } } diff --git a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedAuthProviderTest.java b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedAuthProviderTest.java similarity index 86% rename from build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedAuthProviderTest.java rename to build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedAuthProviderTest.java index c9a8da82e..1a72d7d17 100644 --- a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedAuthProviderTest.java +++ b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedAuthProviderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin;/* +package org.apache.bifromq.demo.plugin;/* * Copyright (c) 2024. The BifroMQ Authors. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,16 +24,16 @@ * See the License for the specific language governing permissions and limitations under the License. */ -import static com.baidu.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; +import static org.apache.bifromq.type.MQTTClientInfoConstants.MQTT_USER_ID_KEY; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthData; -import com.baidu.bifromq.plugin.authprovider.type.MQTT3AuthResult; -import com.baidu.bifromq.plugin.authprovider.type.MQTTAction; -import com.baidu.bifromq.plugin.authprovider.type.PubAction; -import com.baidu.bifromq.plugin.authprovider.type.SubAction; -import com.baidu.bifromq.type.ClientInfo; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthData; +import org.apache.bifromq.plugin.authprovider.type.MQTT3AuthResult; +import org.apache.bifromq.plugin.authprovider.type.MQTTAction; +import org.apache.bifromq.plugin.authprovider.type.PubAction; +import org.apache.bifromq.plugin.authprovider.type.SubAction; +import org.apache.bifromq.type.ClientInfo; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedResourceThrottlerTest.java b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedResourceThrottlerTest.java similarity index 94% rename from build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedResourceThrottlerTest.java rename to build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedResourceThrottlerTest.java index 38fbc9ac1..0b0cb5992 100644 --- a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedResourceThrottlerTest.java +++ b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedResourceThrottlerTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin;/* +package org.apache.bifromq.demo.plugin;/* * Copyright (c) 2024. The BifroMQ Authors. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,7 +24,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -import static com.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnections; +import static org.apache.bifromq.plugin.resourcethrottler.TenantResourceType.TotalConnections; import static org.awaitility.Awaitility.await; import static org.testng.Assert.assertTrue; diff --git a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedSettingProviderTest.java b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedSettingProviderTest.java similarity index 96% rename from build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedSettingProviderTest.java rename to build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedSettingProviderTest.java index 36538a2c7..f945a8553 100644 --- a/build/build-plugin-demo/src/test/java/com/baidu/demo/plugin/WebHookBasedSettingProviderTest.java +++ b/build/build-plugin-demo/src/test/java/org/apache/bifromq/demo/plugin/WebHookBasedSettingProviderTest.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.demo.plugin;/* +package org.apache.bifromq.demo.plugin;/* * Copyright (c) 2024. The BifroMQ Authors. All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,7 +27,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; -import com.baidu.bifromq.plugin.settingprovider.Setting; +import org.apache.bifromq.plugin.settingprovider.Setting; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/pom.xml b/pom.xml index 7cd939b49..bdb9509ba 100644 --- a/pom.xml +++ b/pom.xml @@ -980,11 +980,11 @@ ${project.basedir}/target/jacoco.exec true - com/baidu/bifromq/type/*.class + org/apache/bifromq/type/*.class **/proto/*.class io/grpc/**/*.class - com/baidu/bifromq/baserpc/**/*.class - com/baidu/bifromq/plugin/authprovider/type/*.class + org/apache/bifromq/baserpc/**/*.class + org/apache/bifromq/plugin/authprovider/type/*.class diff --git a/testsuites/CoverageTests.xml b/testsuites/CoverageTests.xml index 4a2b2d392..707fe4251 100644 --- a/testsuites/CoverageTests.xml +++ b/testsuites/CoverageTests.xml @@ -1,12 +1,12 @@ - - + + - + \ No newline at end of file diff --git a/testsuites/IntegrationTests.xml b/testsuites/IntegrationTests.xml index 9de727b23..2d319aec5 100644 --- a/testsuites/IntegrationTests.xml +++ b/testsuites/IntegrationTests.xml @@ -1,8 +1,8 @@ - - + + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/testsuites/UnitTests.xml b/testsuites/UnitTests.xml index 75c93ed0c..ddba84b36 100644 --- a/testsuites/UnitTests.xml +++ b/testsuites/UnitTests.xml @@ -1,8 +1,8 @@ - - + + @@ -11,7 +11,7 @@ - + \ No newline at end of file diff --git a/testsuites/src/main/java/com/baidu/bifromq/test/RetryAnalyser.java b/testsuites/src/main/java/org/apache/bifromq/test/RetryAnalyser.java similarity index 96% rename from testsuites/src/main/java/com/baidu/bifromq/test/RetryAnalyser.java rename to testsuites/src/main/java/org/apache/bifromq/test/RetryAnalyser.java index 40cf83a4d..d5660b712 100644 --- a/testsuites/src/main/java/com/baidu/bifromq/test/RetryAnalyser.java +++ b/testsuites/src/main/java/org/apache/bifromq/test/RetryAnalyser.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.test; +package org.apache.bifromq.test; import org.testng.IRetryAnalyzer; import org.testng.ITestResult; diff --git a/testsuites/src/main/java/com/baidu/bifromq/test/RetryListener.java b/testsuites/src/main/java/org/apache/bifromq/test/RetryListener.java similarity index 98% rename from testsuites/src/main/java/com/baidu/bifromq/test/RetryListener.java rename to testsuites/src/main/java/org/apache/bifromq/test/RetryListener.java index 3e9073afc..af154116d 100644 --- a/testsuites/src/main/java/com/baidu/bifromq/test/RetryListener.java +++ b/testsuites/src/main/java/org/apache/bifromq/test/RetryListener.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.test; +package org.apache.bifromq.test; import java.util.HashSet; import java.util.Set; diff --git a/testsuites/src/main/java/com/baidu/bifromq/test/RetryTransformer.java b/testsuites/src/main/java/org/apache/bifromq/test/RetryTransformer.java similarity index 97% rename from testsuites/src/main/java/com/baidu/bifromq/test/RetryTransformer.java rename to testsuites/src/main/java/org/apache/bifromq/test/RetryTransformer.java index e2b6e55f8..4e0a7b19e 100644 --- a/testsuites/src/main/java/com/baidu/bifromq/test/RetryTransformer.java +++ b/testsuites/src/main/java/org/apache/bifromq/test/RetryTransformer.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.baidu.bifromq.test; +package org.apache.bifromq.test; import java.lang.reflect.Constructor; import java.lang.reflect.Method;