karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf-decanter] branch master updated: [KARAF-5479] Force the json marshaller in appenders which require it
Date Tue, 09 Jan 2018 06:35:58 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf-decanter.git


The following commit(s) were added to refs/heads/master by this push:
     new 03048c7  [KARAF-5479] Force the json marshaller in appenders which require it
03048c7 is described below

commit 03048c74a0c0a7e9c2d7e5e7c5770c1bdb5508ba
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
AuthorDate: Tue Jan 9 07:35:08 2018 +0100

    [KARAF-5479] Force the json marshaller in appenders which require it
---
 .../org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java | 2 +-
 .../decanter/appender/elasticsearch/jest/ElasticsearchAppender.java     | 2 +-
 .../karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java    | 2 +-
 .../karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java    | 2 +-
 .../decanter/appender/elasticsearch/rest/ElasticsearchAppender.java     | 2 +-
 .../main/java/org/apache/karaf/decanter/appender/jdbc/JdbcAppender.java | 2 +-
 .../java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java    | 2 +-
 .../org/apache/karaf/decanter/appender/mongodb/MongoDbAppender.java     | 2 +-
 .../org/apache/karaf/decanter/appender/orientdb/OrientDBAppender.java   | 2 +-
 .../main/java/org/apache/karaf/decanter/appender/rest/RestAppender.java | 2 +-
 .../java/org/apache/karaf/decanter/appender/socket/SocketAppender.java  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
index e3e7d17..a783499 100644
--- a/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
+++ b/appender/cassandra/src/main/java/org/apache/karaf/decanter/appender/cassandra/CassandraAppender.java
@@ -135,7 +135,7 @@ public class CassandraAppender implements EventHandler {
         }
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/elasticsearch-jest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/jest/ElasticsearchAppender.java
b/appender/elasticsearch-jest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/jest/ElasticsearchAppender.java
index 8b463ca..42e85eb 100644
--- a/appender/elasticsearch-jest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/jest/ElasticsearchAppender.java
+++ b/appender/elasticsearch-jest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/jest/ElasticsearchAppender.java
@@ -148,7 +148,7 @@ public class ElasticsearchAppender implements EventHandler {
         }
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
b/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
index cb826b5..6a2dcd2 100644
--- a/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
+++ b/appender/elasticsearch-native-1.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
@@ -161,7 +161,7 @@ public class ElasticsearchAppender implements EventHandler {
         }
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
b/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
index 53a7cef..68959e5 100644
--- a/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
+++ b/appender/elasticsearch-native-2.x/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/ElasticsearchAppender.java
@@ -154,7 +154,7 @@ public class ElasticsearchAppender implements EventHandler {
         }
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
b/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
index 000a5b2..3a483a0 100644
--- a/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
+++ b/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
@@ -159,7 +159,7 @@ public class ElasticsearchAppender implements EventHandler {
         }
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/JdbcAppender.java
b/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/JdbcAppender.java
index 7ab4e4f..0c2dfa9 100644
--- a/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/JdbcAppender.java
+++ b/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/JdbcAppender.java
@@ -118,7 +118,7 @@ public class JdbcAppender implements EventHandler {
         }
     }
     
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
b/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
index a404a53..f30d3e3 100644
--- a/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
+++ b/appender/kafka/src/main/java/org/apache/karaf/decanter/appender/kafka/KafkaAppender.java
@@ -91,7 +91,7 @@ public class KafkaAppender implements EventHandler {
         producer.close();
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/mongodb/src/main/java/org/apache/karaf/decanter/appender/mongodb/MongoDbAppender.java
b/appender/mongodb/src/main/java/org/apache/karaf/decanter/appender/mongodb/MongoDbAppender.java
index 0d3056a..1c7cd5d 100644
--- a/appender/mongodb/src/main/java/org/apache/karaf/decanter/appender/mongodb/MongoDbAppender.java
+++ b/appender/mongodb/src/main/java/org/apache/karaf/decanter/appender/mongodb/MongoDbAppender.java
@@ -81,7 +81,7 @@ public class MongoDbAppender implements EventHandler {
         mongoClient.close();
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/orientdb/src/main/java/org/apache/karaf/decanter/appender/orientdb/OrientDBAppender.java
b/appender/orientdb/src/main/java/org/apache/karaf/decanter/appender/orientdb/OrientDBAppender.java
index 90ded75..1598cce 100644
--- a/appender/orientdb/src/main/java/org/apache/karaf/decanter/appender/orientdb/OrientDBAppender.java
+++ b/appender/orientdb/src/main/java/org/apache/karaf/decanter/appender/orientdb/OrientDBAppender.java
@@ -67,7 +67,7 @@ public class OrientDBAppender implements EventHandler {
         document.save();
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/rest/src/main/java/org/apache/karaf/decanter/appender/rest/RestAppender.java
b/appender/rest/src/main/java/org/apache/karaf/decanter/appender/rest/RestAppender.java
index 69e32e4..ed6dce7 100644
--- a/appender/rest/src/main/java/org/apache/karaf/decanter/appender/rest/RestAppender.java
+++ b/appender/rest/src/main/java/org/apache/karaf/decanter/appender/rest/RestAppender.java
@@ -92,7 +92,7 @@ public class RestAppender implements EventHandler {
     public void close() {
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }
diff --git a/appender/socket/src/main/java/org/apache/karaf/decanter/appender/socket/SocketAppender.java
b/appender/socket/src/main/java/org/apache/karaf/decanter/appender/socket/SocketAppender.java
index e2eea6f..02aa588 100644
--- a/appender/socket/src/main/java/org/apache/karaf/decanter/appender/socket/SocketAppender.java
+++ b/appender/socket/src/main/java/org/apache/karaf/decanter/appender/socket/SocketAppender.java
@@ -83,7 +83,7 @@ public class SocketAppender implements EventHandler {
         return (value != null) ? value :  defaultValue;
     }
 
-    @Reference
+    @Reference(target="(" + Marshaller.SERVICE_KEY_DATAFORMAT + "=json)")
     public void setMarshaller(Marshaller marshaller) {
         this.marshaller = marshaller;
     }

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

Mime
View raw message