[sling-org-apache-sling-commons-clam] branch master updated: SLING-9668 Make clamd service a content analyzer

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-clam.git


The following commit(s) were added to refs/heads/master by this push:
     new 51889a0  SLING-9668 Make clamd service a content analyzer
51889a0 is described below

commit 51889a06041f3e640d336f444e45cb19c20b64a4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Nov 10 12:50:56 2020 +0100

    SLING-9668 Make clamd service a content analyzer
    
    make operation and provider configurable
---
 .../org/apache/sling/commons/clam/internal/ClamdService.java |  5 +----
 .../commons/clam/internal/ClamdServiceConfiguration.java     | 12 ++++++++++++
 .../apache/sling/commons/clam/it/tests/ClamdServiceIT.java   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java b/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java
index 80da576..9753126 100644
--- a/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java
+++ b/src/main/java/org/apache/sling/commons/clam/internal/ClamdService.java
@@ -49,10 +49,7 @@ import org.slf4j.LoggerFactory;
 @Component(
     property = {
         Constants.SERVICE_DESCRIPTION + "=Sling Commons Clamd Service",
-        Constants.SERVICE_VENDOR + "=The Apache Software Foundation",
-        "operation=malware detection",
-        "provider=clam",
-        "provider=clamd",
+        Constants.SERVICE_VENDOR + "=The Apache Software Foundation"
     }
 )
 @Designate(
diff --git a/src/main/java/org/apache/sling/commons/clam/internal/ClamdServiceConfiguration.java b/src/main/java/org/apache/sling/commons/clam/internal/ClamdServiceConfiguration.java
index c6d8b19..99a62a0 100644
--- a/src/main/java/org/apache/sling/commons/clam/internal/ClamdServiceConfiguration.java
+++ b/src/main/java/org/apache/sling/commons/clam/internal/ClamdServiceConfiguration.java
@@ -52,4 +52,16 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
     )
     int chunk_length() default 2048;
 
+    @AttributeDefinition(
+        name = "content analyzer operation",
+        description = "operation(s) this analyzer performs"
+    )
+    String[] content_analyzer_operation() default {"malware detection"};
+
+    @AttributeDefinition(
+        name = "content analyzer provider",
+        description = "provider which performs the operation(s)"
+    )
+    String[] content_analyzer_provider() default {"clam", "clamd"};
+
 }
diff --git a/src/test/java/org/apache/sling/commons/clam/it/tests/ClamdServiceIT.java b/src/test/java/org/apache/sling/commons/clam/it/tests/ClamdServiceIT.java
index e17b5a1..d3204ed 100644
--- a/src/test/java/org/apache/sling/commons/clam/it/tests/ClamdServiceIT.java
+++ b/src/test/java/org/apache/sling/commons/clam/it/tests/ClamdServiceIT.java
@@ -53,7 +53,7 @@ public class ClamdServiceIT extends ClamTestSupport {
     private ClamService clamService;
 
     @Inject
-    @Filter(value = "(&(operation=malware detection)(provider=clamd))")
+    @Filter(value = "(&(content.analyzer.operation=malware detection)(content.analyzer.provider=clamd))")
     private ContentAnalyzer contentAnalyzer;
 
     private static final String INSTREAM_SIZE_LIMIT_EXCEEDED_ERROR_MESSAGE = "INSTREAM size limit exceeded. ERROR";