[
https://issues.apache.org/jira/browse/KARAF-5575?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16337623#comment-16337623
]
ASF GitHub Bot commented on KARAF-5575:
---------------------------------------
jbonofre closed pull request #25: [KARAF-5575] Define the marshaller by
configuration for the file appender
URL: https://github.com/apache/karaf-decanter/pull/25
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/appender/file/src/main/cfg/org.apache.karaf.decanter.appender.file.cfg
b/appender/file/src/main/cfg/org.apache.karaf.decanter.appender.file.cfg
index 3b1a313..ee487cb 100644
--- a/appender/file/src/main/cfg/org.apache.karaf.decanter.appender.file.cfg
+++ b/appender/file/src/main/cfg/org.apache.karaf.decanter.appender.file.cfg
@@ -3,4 +3,7 @@
######################################
# File
-#filename=${karaf.data}/decanter
\ No newline at end of file
+#filename=${karaf.data}/decanter
+
+# Marshaller
+marshaller.target=(dataFormat=csv)
\ No newline at end of file
diff --git
a/appender/file/src/main/java/org/apache/karaf/decanter/appender/file/FileAppender.java
b/appender/file/src/main/java/org/apache/karaf/decanter/appender/file/FileAppender.java
index 4256a07..f916eff 100644
---
a/appender/file/src/main/java/org/apache/karaf/decanter/appender/file/FileAppender.java
+++
b/appender/file/src/main/java/org/apache/karaf/decanter/appender/file/FileAppender.java
@@ -38,7 +38,9 @@
)
public class FileAppender implements EventHandler {
- private Marshaller marshaller;
+ @Reference
+ public Marshaller marshaller;
+
private BufferedWriter writer;
@Activate
@@ -73,9 +75,4 @@ public void deactivate() throws Exception {
this.writer.close();
}
- @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=csv)")
- public void setMarshaller(Marshaller marshaller) {
- this.marshaller = marshaller;
- }
-
}
diff --git
a/appender/file/src/test/java/org/apache/karaf/decanter/appender/file/TestFileAppender.java
b/appender/file/src/test/java/org/apache/karaf/decanter/appender/file/TestFileAppender.java
index a4b0cec..255327b 100644
---
a/appender/file/src/test/java/org/apache/karaf/decanter/appender/file/TestFileAppender.java
+++
b/appender/file/src/test/java/org/apache/karaf/decanter/appender/file/TestFileAppender.java
@@ -32,7 +32,7 @@
@Test
public void testAppender() throws Exception {
FileAppender fileAppender = new FileAppender();
- fileAppender.setMarshaller(new CsvMarshaller());
+ fileAppender.marshaller = new CsvMarshaller();
fileAppender.open("target/test-classes/decanter");
Map<String, String> map = new HashMap<>();
map.put("a", "b");
diff --git a/manual/src/main/asciidoc/user-guide/appenders.adoc
b/manual/src/main/asciidoc/user-guide/appenders.adoc
index 3ff507a..1e10e76 100644
--- a/manual/src/main/asciidoc/user-guide/appenders.adoc
+++ b/manual/src/main/asciidoc/user-guide/appenders.adoc
@@ -776,6 +776,9 @@ karaf@root()> feature:install decanter-appender-file
By default, the file appender stores the collected data in
`${karaf.data}/decanter` file. You can change the file where to store the data
using the `filename` property in
`etc/org.apache.karaf.decanter.appender.file.cfg` configuration file.
+You can also change the marshaller to use. By default, the marshaller used is
the CSV one. But you can switch to the JSON one
+using the `marshaller.target` property in
`etc/org.apache.karaf.decanter.appender.file.cfg` configuration file.
+
==== JDBC
The Decanter JDBC appender allows your to store the data (coming from the
collectors) into a database.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Upgrade file appender to use SCR config property
> ------------------------------------------------
>
> Key: KARAF-5575
> URL: https://issues.apache.org/jira/browse/KARAF-5575
> Project: Karaf
> Issue Type: Improvement
> Components: decanter
> Reporter: Jean-Baptiste Onofré
> Assignee: Jean-Baptiste Onofré
> Priority: Major
> Fix For: decanter-2.0.0
>
>
> Now we upgraded to OSGi Compendium 6.0.0 with updated SCR version, we can use
> DS Config Property to in {{@Reference}}.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
