rename "handler-client" to "plugin-client" for clarity

VEuPathDB · May 17, 2024 · 8831f53 · 8831f53
1 parent 2697ae1
commit 8831f53
Show file tree

Hide file tree

Showing 61 changed files with 18 additions and 18 deletions.
diff --git a/docs/1.0/readme.adoc b/docs/1.0/readme.adoc
@@ -184,7 +184,7 @@ The dataset-reinstaller component exposes an API for reinstalling datasets that
 have been marked as "ready-for-reinstall".
 
 Handler Client::
-The handler-client component exposes an API for interacting with the VDI plugin
+The plugin-client component exposes an API for interacting with the VDI plugin
 services over HTTP.
 
 Install Cleanup::

diff --git a/lib/async/src/main/kotlin/vdi/component/async/Trigger.kt b/lib/async/src/main/kotlin/vdi/component/async/Trigger.kt
@@ -13,14 +13,14 @@ class Trigger {
   private var triggered = false
 
   suspend fun trigger() {
-    mutex.withLock(this) { triggered = true }
+    mutex.withLock { triggered = true }
     tryRelease()
   }
 
-  suspend fun isTriggered() = mutex.withLock(this) { triggered }
+  suspend fun isTriggered() = mutex.withLock { triggered }
 
   suspend fun await() {
-    mutex.withLock(this) {
+    mutex.withLock {
       if (triggered)
         return release()
     }
@@ -33,7 +33,7 @@ class Trigger {
   }
 
   private suspend fun tryRelease() {
-    mutex.withLock(this) {
+    mutex.withLock {
       if (triggered)
         release()
     }

diff --git a/lib/dataset-reinstaller/build.gradle.kts b/lib/dataset-reinstaller/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
   implementation(project(":lib:app-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:plugin-mapping"))
   implementation(project(":lib:s3"))

diff --git a/lib/install-cleanup/build.gradle.kts b/lib/install-cleanup/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:plugin-mapping"))
 
   implementation("org.veupathdb.vdi:vdi-component-common")

diff --git a/lib/handler-client/build.gradle.kts → lib/plugin-client/build.gradle.kts b/lib/handler-client/build.gradle.kts → lib/plugin-client/build.gradle.kts
diff --git a/...di/component/plugin/client/ContentType.kt → ...di/component/plugin/client/ContentType.kt b/...di/component/plugin/client/ContentType.kt → ...di/component/plugin/client/ContentType.kt
diff --git a/.../kotlin/vdi/component/plugin/client/EP.kt → .../kotlin/vdi/component/plugin/client/EP.kt b/.../kotlin/vdi/component/plugin/client/EP.kt → .../kotlin/vdi/component/plugin/client/EP.kt
diff --git a/.../vdi/component/plugin/client/FieldName.kt → .../vdi/component/plugin/client/FieldName.kt b/.../vdi/component/plugin/client/FieldName.kt → .../vdi/component/plugin/client/FieldName.kt
diff --git a/...lin/vdi/component/plugin/client/Header.kt → ...lin/vdi/component/plugin/client/Header.kt b/...lin/vdi/component/plugin/client/Header.kt → ...lin/vdi/component/plugin/client/Header.kt
diff --git a/.../component/plugin/client/ImportCounter.kt → .../component/plugin/client/ImportCounter.kt b/.../component/plugin/client/ImportCounter.kt → .../component/plugin/client/ImportCounter.kt
diff --git a/...nent/plugin/client/PluginHandlerClient.kt → ...nent/plugin/client/PluginHandlerClient.kt b/...nent/plugin/client/PluginHandlerClient.kt → ...nent/plugin/client/PluginHandlerClient.kt
diff --git a/...lugin/client/PluginHandlerClientConfig.kt → ...lugin/client/PluginHandlerClientConfig.kt b/...lugin/client/PluginHandlerClientConfig.kt → ...lugin/client/PluginHandlerClientConfig.kt
diff --git a/.../plugin/client/PluginHandlerClientImpl.kt → .../plugin/client/PluginHandlerClientImpl.kt b/.../plugin/client/PluginHandlerClientImpl.kt → .../plugin/client/PluginHandlerClientImpl.kt
diff --git a/...gin/client/PluginHandlerClientResponse.kt → ...gin/client/PluginHandlerClientResponse.kt b/...gin/client/PluginHandlerClientResponse.kt → ...gin/client/PluginHandlerClientResponse.kt
diff --git a/...tlin/vdi/component/plugin/client/index.kt → ...tlin/vdi/component/plugin/client/index.kt b/...tlin/vdi/component/plugin/client/index.kt → ...tlin/vdi/component/plugin/client/index.kt
diff --git a/.../response/imp/ImportBadRequestResponse.kt → .../response/imp/ImportBadRequestResponse.kt b/.../response/imp/ImportBadRequestResponse.kt → .../response/imp/ImportBadRequestResponse.kt
diff --git a/...ponse/imp/ImportBadRequestResponseImpl.kt → ...ponse/imp/ImportBadRequestResponseImpl.kt b/...ponse/imp/ImportBadRequestResponseImpl.kt → ...ponse/imp/ImportBadRequestResponseImpl.kt
diff --git a/...gin/client/response/imp/ImportResponse.kt → ...gin/client/response/imp/ImportResponse.kt b/...gin/client/response/imp/ImportResponse.kt → ...gin/client/response/imp/ImportResponse.kt
diff --git a/...client/response/imp/ImportResponseType.kt → ...client/response/imp/ImportResponseType.kt b/...client/response/imp/ImportResponseType.kt → ...client/response/imp/ImportResponseType.kt
diff --git a/...ent/response/imp/ImportSuccessResponse.kt → ...ent/response/imp/ImportSuccessResponse.kt b/...ent/response/imp/ImportSuccessResponse.kt → ...ent/response/imp/ImportSuccessResponse.kt
diff --git a/...response/imp/ImportSuccessResponseImpl.kt → ...response/imp/ImportSuccessResponseImpl.kt b/...response/imp/ImportSuccessResponseImpl.kt → ...response/imp/ImportSuccessResponseImpl.kt
diff --git a/...ponse/imp/ImportUnhandledErrorResponse.kt → ...ponse/imp/ImportUnhandledErrorResponse.kt b/...ponse/imp/ImportUnhandledErrorResponse.kt → ...ponse/imp/ImportUnhandledErrorResponse.kt
diff --git a/...e/imp/ImportUnhandledErrorResponseImpl.kt → ...e/imp/ImportUnhandledErrorResponseImpl.kt b/...e/imp/ImportUnhandledErrorResponseImpl.kt → ...e/imp/ImportUnhandledErrorResponseImpl.kt
diff --git a/...onse/imp/ImportValidationErrorResponse.kt → ...onse/imp/ImportValidationErrorResponse.kt b/...onse/imp/ImportValidationErrorResponse.kt → ...onse/imp/ImportValidationErrorResponse.kt
diff --git a/.../imp/ImportValidationErrorResponseImpl.kt → .../imp/ImportValidationErrorResponseImpl.kt b/.../imp/ImportValidationErrorResponseImpl.kt → .../imp/ImportValidationErrorResponseImpl.kt
diff --git a/...onse/ind/InstallDataBadRequestResponse.kt → ...onse/ind/InstallDataBadRequestResponse.kt b/...onse/ind/InstallDataBadRequestResponse.kt → ...onse/ind/InstallDataBadRequestResponse.kt
diff --git a/.../ind/InstallDataBadRequestResponseImpl.kt → .../ind/InstallDataBadRequestResponseImpl.kt b/.../ind/InstallDataBadRequestResponseImpl.kt → .../ind/InstallDataBadRequestResponseImpl.kt
diff --git a/...InstallDataMissingDependenciesResponse.kt → ...InstallDataMissingDependenciesResponse.kt b/...InstallDataMissingDependenciesResponse.kt → ...InstallDataMissingDependenciesResponse.kt
diff --git a/...allDataMissingDependenciesResponseImpl.kt → ...allDataMissingDependenciesResponseImpl.kt b/...allDataMissingDependenciesResponseImpl.kt → ...allDataMissingDependenciesResponseImpl.kt
diff --git a/...lient/response/ind/InstallDataResponse.kt → ...lient/response/ind/InstallDataResponse.kt b/...lient/response/ind/InstallDataResponse.kt → ...lient/response/ind/InstallDataResponse.kt
diff --git a/...t/response/ind/InstallDataResponseType.kt → ...t/response/ind/InstallDataResponseType.kt b/...t/response/ind/InstallDataResponseType.kt → ...t/response/ind/InstallDataResponseType.kt
diff --git a/...esponse/ind/InstallDataSuccessResponse.kt → ...esponse/ind/InstallDataSuccessResponse.kt b/...esponse/ind/InstallDataSuccessResponse.kt → ...esponse/ind/InstallDataSuccessResponse.kt
diff --git a/...nse/ind/InstallDataSuccessResponseImpl.kt → ...nse/ind/InstallDataSuccessResponseImpl.kt b/...nse/ind/InstallDataSuccessResponseImpl.kt → ...nse/ind/InstallDataSuccessResponseImpl.kt
diff --git a/...ind/InstallDataUnexpectedErrorResponse.kt → ...ind/InstallDataUnexpectedErrorResponse.kt b/...ind/InstallDataUnexpectedErrorResponse.kt → ...ind/InstallDataUnexpectedErrorResponse.kt
diff --git a/...InstallDataUnexpectedErrorResponseImpl.kt → ...InstallDataUnexpectedErrorResponseImpl.kt b/...InstallDataUnexpectedErrorResponseImpl.kt → ...InstallDataUnexpectedErrorResponseImpl.kt
diff --git a/...d/InstallDataValidationFailureResponse.kt → ...d/InstallDataValidationFailureResponse.kt b/...d/InstallDataValidationFailureResponse.kt → ...d/InstallDataValidationFailureResponse.kt
diff --git a/...stallDataValidationFailureResponseImpl.kt → ...stallDataValidationFailureResponseImpl.kt b/...stallDataValidationFailureResponseImpl.kt → ...stallDataValidationFailureResponseImpl.kt
diff --git a/...onse/inm/InstallMetaBadRequestResponse.kt → ...onse/inm/InstallMetaBadRequestResponse.kt b/...onse/inm/InstallMetaBadRequestResponse.kt → ...onse/inm/InstallMetaBadRequestResponse.kt
diff --git a/.../inm/InstallMetaBadRequestResponseImpl.kt → .../inm/InstallMetaBadRequestResponseImpl.kt b/.../inm/InstallMetaBadRequestResponseImpl.kt → .../inm/InstallMetaBadRequestResponseImpl.kt
diff --git a/...lient/response/inm/InstallMetaResponse.kt → ...lient/response/inm/InstallMetaResponse.kt b/...lient/response/inm/InstallMetaResponse.kt → ...lient/response/inm/InstallMetaResponse.kt
diff --git a/...t/response/inm/InstallMetaResponseType.kt → ...t/response/inm/InstallMetaResponseType.kt b/...t/response/inm/InstallMetaResponseType.kt → ...t/response/inm/InstallMetaResponseType.kt
diff --git a/...esponse/inm/InstallMetaSuccessResponse.kt → ...esponse/inm/InstallMetaSuccessResponse.kt b/...esponse/inm/InstallMetaSuccessResponse.kt → ...esponse/inm/InstallMetaSuccessResponse.kt
diff --git a/...nse/inm/InstallMetaSuccessResponseImpl.kt → ...nse/inm/InstallMetaSuccessResponseImpl.kt b/...nse/inm/InstallMetaSuccessResponseImpl.kt → ...nse/inm/InstallMetaSuccessResponseImpl.kt
diff --git a/...inm/InstallMetaUnexpectedErrorResponse.kt → ...inm/InstallMetaUnexpectedErrorResponse.kt b/...inm/InstallMetaUnexpectedErrorResponse.kt → ...inm/InstallMetaUnexpectedErrorResponse.kt
diff --git a/...InstallMetaUnexpectedErrorResponseImpl.kt → ...InstallMetaUnexpectedErrorResponseImpl.kt b/...InstallMetaUnexpectedErrorResponseImpl.kt → ...InstallMetaUnexpectedErrorResponseImpl.kt
diff --git a/...sponse/uni/UninstallBadRequestResponse.kt → ...sponse/uni/UninstallBadRequestResponse.kt b/...sponse/uni/UninstallBadRequestResponse.kt → ...sponse/uni/UninstallBadRequestResponse.kt
diff --git a/...se/uni/UninstallBadRequestResponseImpl.kt → ...se/uni/UninstallBadRequestResponseImpl.kt b/...se/uni/UninstallBadRequestResponseImpl.kt → ...se/uni/UninstallBadRequestResponseImpl.kt
diff --git a/.../client/response/uni/UninstallResponse.kt → .../client/response/uni/UninstallResponse.kt b/.../client/response/uni/UninstallResponse.kt → .../client/response/uni/UninstallResponse.kt
diff --git a/...ent/response/uni/UninstallResponseType.kt → ...ent/response/uni/UninstallResponseType.kt b/...ent/response/uni/UninstallResponseType.kt → ...ent/response/uni/UninstallResponseType.kt
diff --git a/.../response/uni/UninstallSuccessResponse.kt → .../response/uni/UninstallSuccessResponse.kt b/.../response/uni/UninstallSuccessResponse.kt → .../response/uni/UninstallSuccessResponse.kt
diff --git a/...ponse/uni/UninstallSuccessResponseImpl.kt → ...ponse/uni/UninstallSuccessResponseImpl.kt b/...ponse/uni/UninstallSuccessResponseImpl.kt → ...ponse/uni/UninstallSuccessResponseImpl.kt
diff --git a/...e/uni/UninstallUnexpectedErrorResponse.kt → ...e/uni/UninstallUnexpectedErrorResponse.kt b/...e/uni/UninstallUnexpectedErrorResponse.kt → ...e/uni/UninstallUnexpectedErrorResponse.kt
diff --git a/...i/UninstallUnexpectedErrorResponseImpl.kt → ...i/UninstallUnexpectedErrorResponseImpl.kt b/...i/UninstallUnexpectedErrorResponseImpl.kt → ...i/UninstallUnexpectedErrorResponseImpl.kt
diff --git a/lib/plugin-mapping/build.gradle.kts b/lib/plugin-mapping/build.gradle.kts
@@ -6,7 +6,7 @@ dependencies {
   implementation(platform(project(":platform")))
 
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
 
   implementation("org.veupathdb.vdi:vdi-component-common")
 

diff --git a/readme.adoc b/readme.adoc
@@ -161,20 +161,20 @@ service, and/or the bootstrapper.
 
 * link:lib/app-db/[App DB Client]
 * link:lib/async/[Async Utilities]
+* link:lib/install-cleanup/[Broken Install Cleanup]
 * link:lib/cache-db/[Cache DB Client]
 * link:https://github.com/VEuPathDB/vdi-component-common[Commons]
+* link:lib/pruner[Dataset Pruner]
 * link:lib/dataset-reinstaller/[Dataset Reinstaller]
-* link:lib/env/[Shared Env Constants & Utilities]
-* link:lib/handler-client[Plugin Server Client]
-* link:lib/install-cleanup/[Broken Install Cleanup]
 * link:https://github.com/VEuPathDB/vdi-component-json[JSON Utilities]
 * link:lib/kafka[Kafka Client]
 * link:lib/ldap[LDAP Utilities]
 * link:lib/module-core/[Module Core]
+* link:lib/plugin-client[Plugin Server Client]
 * link:lib/plugin-mapping[Plugin Mapping]
-* link:lib/pruner[Dataset Pruner]
 * link:lib/rabbit[Rabbit Client]
 * link:lib/s3[S3 Utilities]
+* link:lib/env/[Shared Env Constants & Utilities]
 * link:lib/test-utils[Unit Test Utilities]
 
 === Daemons

diff --git a/service/daemon/reconciler/build.gradle.kts b/service/daemon/reconciler/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))

diff --git a/service/lane/import/build.gradle.kts b/service/lane/import/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
 
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))

diff --git a/service/lane/install/build.gradle.kts b/service/lane/install/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))

diff --git a/service/lane/soft-delete/build.gradle.kts b/service/lane/soft-delete/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))

diff --git a/service/lane/update-meta/build.gradle.kts b/service/lane/update-meta/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
   implementation(project(":lib:app-db"))
   implementation(project(":lib:cache-db"))
   implementation(project(":lib:env"))
-  implementation(project(":lib:handler-client"))
+  implementation(project(":lib:plugin-client"))
   implementation(project(":lib:kafka"))
   implementation(project(":lib:metrics"))
   implementation(project(":lib:module-core"))

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -44,10 +44,10 @@ include(":lib:async")
 include(":lib:cache-db")
 include(":lib:dataset-reinstaller")
 include(":lib:env")
-include(":lib:handler-client")
 include(":lib:install-cleanup")
 include(":lib:kafka")
 include(":lib:ldap")
+include(":lib:plugin-client")
 include(":lib:plugin-mapping")
 include(":lib:metrics")
 include(":lib:module-core")