diff --git a/pom.xml b/pom.xml
index 7a9df99..b2445f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,8 @@
${dockerImagePrefix}${dockerHubOrganization}${dockerOrgSeperator}
${dockerVersionSeperator}${project.version}
worker-languagedetection-${project.version}.project-registries.local
+ 8.2.0-US922349-SNAPSHOT
+ 3.1.0-US922349-SNAPSHOT
@@ -285,62 +287,67 @@
com.github.workerframework
standard-worker-container
pom
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
util-rabbitmq
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-api
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-configs
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-core
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-default-configs
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-queue-rabbit
- 8.1.0-1251
+ ${worker.framework.version}
+
+
+ com.github.workerframework
+ worker-queue-sqs
+ ${worker.framework.version}
com.github.workerframework
worker-store-fs
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-store-http
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework
worker-tracking-report
- 8.1.0-1251
+ ${worker.framework.version}
com.github.workerframework.testing
workerframework-testing-integration
- 3.0.0-205
+ ${worker.framework.testing.version}
com.github.workerframework.testing
workerframework-testing-util
- 3.0.0-205
+ ${worker.framework.testing.version}
com.google.code.findbugs
@@ -925,6 +932,10 @@
${dockerHubPublic}/library/rabbitmq
3-management
+
+ ${dockerHubPublic}/localstack/localstack
+ latest
+
diff --git a/worker-languagedetection-container/pom.xml b/worker-languagedetection-container/pom.xml
index 2d535b2..f5272de 100644
--- a/worker-languagedetection-container/pom.xml
+++ b/worker-languagedetection-container/pom.xml
@@ -145,26 +145,56 @@
maven-failsafe-plugin
+ sqs-implementation-testing
integration-test
verify
+
+ false
+
+
+ ${sqs.ctrl.port}
+ sqs
+
+
+ test/sqs-worker-languagedetection
+
+ sqs
+
+
+
+ rabbitmq-implementation-testing
+
+ integration-test
+ verify
+
+
+ false
+
+
+ ${worker.restport}
+ ${worker.adminport}
+ ${rabbitmq.node.port}
+ ${rabbitmq.ctrl.port}
+ rabbitmq
+
+
+ test/rabbitmq-worker-languagedetection
+
+ rabbitmq
+
${docker.host.address}
- ${worker.restport}
- ${worker.adminport}
- ${rabbitmq.node.port}
- ${rabbitmq.ctrl.port}
${test.data}
${test.data}
false
true
- test/worker-languagedetection
${test.configs}
\\${docker.host.address}@${webdav.apache.port}\webdav
http://${docker.host.address}:${webdav.apache.port}/webdav
@@ -172,6 +202,7 @@
+
+
+ sqs
+ ${projectDockerRegistry}/localstack/localstack
+
+
+ ${sqs.ctrl.port}:4566
+
+
+
+ warn
+
+
+ Ready.
+
+ 500
+
+
+ true
+
+
+
+
config
@@ -298,9 +352,7 @@
-
- worker-languagedetection
${dockerCafDataProcessingOrg}worker-languagedetection${dockerProjectVersion}
${projectDockerRegistry}/cafapi/oraclelinux-jre21
@@ -353,14 +405,21 @@
+
+
+
+
+ rabbitmq-worker-languagedetection
+ ${dockerCafDataProcessingOrg}worker-languagedetection${dockerProjectVersion}
${worker.restport}:8080
${worker.adminport}:8081
- test/worker-languagedetection
+ test/rabbitmq-worker-languagedetection
/config
+ rabbitmq
@@ -384,6 +443,42 @@
+
+
+ sqs-worker-languagedetection
+ ${dockerCafDataProcessingOrg}worker-languagedetection${dockerProjectVersion}
+
+
+ ${sqs.worker.restport}:8080
+ ${sqs.worker.adminport}:8081
+
+
+ test/sqs-worker-languagedetection
+ /config
+ sqs
+ 0
+
+
+
+ config
+ webdav
+
+
+
+ sqs
+
+
+ true
+
+
+
+ http://${docker.host.address}:${sqs.worker.restport}/health-check?type=READY
+
+
+ 500
+
+
+
@@ -425,6 +520,9 @@
28080
8080
8081
+ 8082
+ 8083
+ 14566
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~DocumentWorkerConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~DocumentWorkerConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~DocumentWorkerConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~DocumentWorkerConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~FileSystemDataStoreConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~FileSystemDataStoreConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~FileSystemDataStoreConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~FileSystemDataStoreConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~HealthConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~HealthConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~HealthConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~HealthConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~HttpDataStoreConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~HttpDataStoreConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~HttpDataStoreConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~HttpDataStoreConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~LanguageDetectionWorkerConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~LanguageDetectionWorkerConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~LanguageDetectionWorkerConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~LanguageDetectionWorkerConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~MessageSystemConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~MessageSystemConfiguration
new file mode 100644
index 0000000..e8df564
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~MessageSystemConfiguration
@@ -0,0 +1,3 @@
+{
+ "implementation": "${CAF_MESSAGING_IMPLEMENTATION:-this_should_get_ignored}"
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~RabbitConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~RabbitConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~RabbitConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~RabbitConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~RabbitWorkerQueueConfiguration b/worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~RabbitWorkerQueueConfiguration
similarity index 100%
rename from worker-languagedetection-container/test-configs/cfg~test~worker-languagedetection~RabbitWorkerQueueConfiguration
rename to worker-languagedetection-container/test-configs/cfg~test~rabbitmq-worker-languagedetection~RabbitWorkerQueueConfiguration
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~DocumentWorkerConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~DocumentWorkerConfiguration
new file mode 100644
index 0000000..c197113
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~DocumentWorkerConfiguration
@@ -0,0 +1,8 @@
+{
+ "workerName": "LanguageDetectionWorker",
+ "workerVersion": "2.3.1",
+ "outputQueue": "LanguageDetectionWorker-output-1",
+ "threads": 1,
+ "maxBatchSize": 2,
+ "maxBatchTime": 5000
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~FileSystemDataStoreConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~FileSystemDataStoreConfiguration
new file mode 100644
index 0000000..f9291c3
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~FileSystemDataStoreConfiguration
@@ -0,0 +1,3 @@
+{
+ "dataDir": "${CAF_INTEGRATIONTESTS_FS_PATH:-/srv/common/webdav}"
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~HealthConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~HealthConfiguration
new file mode 100644
index 0000000..caab249
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~HealthConfiguration
@@ -0,0 +1,12 @@
+{
+ "livenessInitialDelaySeconds": 15,
+ "livenessCheckIntervalSeconds": 60,
+ "livenessDowntimeIntervalSeconds": 60,
+ "livenessSuccessAttempts": 1,
+ "livenessFailureAttempts": 3,
+ "readinessInitialDelaySeconds": 15,
+ "readinessCheckIntervalSeconds": 60,
+ "readinessDowntimeIntervalSeconds": 60,
+ "readinessSuccessAttempts": 1,
+ "readinessFailureAttempts": 3
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~HttpDataStoreConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~HttpDataStoreConfiguration
new file mode 100644
index 0000000..5f6e02c
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~HttpDataStoreConfiguration
@@ -0,0 +1,3 @@
+{
+ "url": "${CAF_WORKER_HTTP_DATASTORE_URL}"
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~LanguageDetectionWorkerConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~LanguageDetectionWorkerConfiguration
new file mode 100644
index 0000000..0658936
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~LanguageDetectionWorkerConfiguration
@@ -0,0 +1,3 @@
+{
+ "resultFormat": "SIMPLE"
+}
\ No newline at end of file
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~MessageSystemConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~MessageSystemConfiguration
new file mode 100644
index 0000000..e8df564
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~MessageSystemConfiguration
@@ -0,0 +1,3 @@
+{
+ "implementation": "${CAF_MESSAGING_IMPLEMENTATION:-this_should_get_ignored}"
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~SQSConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~SQSConfiguration
new file mode 100644
index 0000000..4447ecc
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~SQSConfiguration
@@ -0,0 +1,8 @@
+{
+ "sqsProtocol": "http",
+ "sqsHost": "sqs",
+ "sqsPort": 4566,
+ "sqsRegion": "us-east-1",
+ "sqsAccessKey": "x",
+ "sqsSecretAccessKey": "x"
+}
diff --git a/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~SQSWorkerQueueConfiguration b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~SQSWorkerQueueConfiguration
new file mode 100644
index 0000000..522e52a
--- /dev/null
+++ b/worker-languagedetection-container/test-configs/cfg~test~sqs-worker-languagedetection~SQSWorkerQueueConfiguration
@@ -0,0 +1,13 @@
+{
+ "inputQueue": "LanguageDetectionWorker-input-1",
+ "retryQueue": "LanguageDetectionWorker-input-1",
+ "pausedQueue": "LanguageDetectionWorker-paused-1",
+ "rejectedQueue": "worker-rejected",
+ "longPollInterval": 20,
+ "maxNumberOfMessages": 10,
+ "visibilityTimeout": 300,
+ "messageRetentionPeriod": 1000,
+ "maxDeliveries": 1000,
+ "maxInflightMessages": 120000,
+ "publisherWaitTimeout": 0
+}