You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/02/02 17:40:53 UTC

karaf-decanter git commit: [KARAF-4303] Use marshaller in jdbc appender and refactor

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 70eda3b16 -> 9e0a2215d


[KARAF-4303] Use marshaller in jdbc appender and refactor


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/9e0a2215
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/9e0a2215
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/9e0a2215

Branch: refs/heads/master
Commit: 9e0a2215d2556c934c829ac9dc7ce3efdb645e81
Parents: 70eda3b
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Tue Feb 2 17:40:48 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Tue Feb 2 17:40:48 2016 +0100

----------------------------------------------------------------------
 appender/jdbc/pom.xml                           |  15 ++
 .../karaf/decanter/appender/jdbc/Activator.java | 187 ++++++++------
 .../decanter/appender/jdbc/JdbcAppender.java    | 255 ++++---------------
 .../appender/jdbc/TestJdbcAppender.java         |  82 ++++++
 pom.xml                                         |  10 +
 5 files changed, 269 insertions(+), 280 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/9e0a2215/appender/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/appender/jdbc/pom.xml b/appender/jdbc/pom.xml
index 029d547..d990fc7 100644
--- a/appender/jdbc/pom.xml
+++ b/appender/jdbc/pom.xml
@@ -38,6 +38,21 @@
             <groupId>javax.json</groupId>
             <artifactId>javax.json-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.decanter</groupId>
+            <artifactId>org.apache.karaf.decanter.api</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.decanter.marshaller</groupId>
+            <artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/9e0a2215/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/Activator.java
----------------------------------------------------------------------
diff --git a/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/Activator.java b/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/Activator.java
index 5ab204c..5ebea74 100644
--- a/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/Activator.java
+++ b/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/Activator.java
@@ -16,86 +16,125 @@
  */
 package org.apache.karaf.decanter.appender.jdbc;
 
-import org.osgi.framework.*;
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import javax.sql.DataSource;
+
+import org.apache.karaf.decanter.api.marshaller.Marshaller;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.cm.ConfigurationException;
 import org.osgi.service.cm.ManagedService;
 import org.osgi.service.event.EventConstants;
 import org.osgi.service.event.EventHandler;
-import org.slf4j.LoggerFactory;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.Dictionary;
-import java.util.Hashtable;
-
+@SuppressWarnings("rawtypes")
 public class Activator implements BundleActivator {
-
-	private final static Logger LOGGER = LoggerFactory.getLogger(Activator.class);
-
-	private static final String CONFIG_PID = "org.apache.karaf.decanter.appender.jdbc";
-
-	private ServiceRegistration serviceRegistration;
-
-	@Override
-	public void start(final BundleContext bundleContext) throws Exception {
-		LOGGER.debug("Starting Decanter JDBC appender");
-
-		ConfigUpdater configUpdater = new ConfigUpdater(bundleContext);
-
-		Dictionary<String, String> properties = new Hashtable<>();
-		properties.put(Constants.SERVICE_PID, CONFIG_PID);
-		serviceRegistration = bundleContext.registerService(ManagedService.class.getName(), configUpdater, properties);
-	}
-
-	@Override
-	public void stop(BundleContext bundleContext) throws Exception {
-		LOGGER.debug("Stopping Decanter JDBC appender");
-
-		if (serviceRegistration != null) {
-			serviceRegistration.unregister();
-		}
-	}
-
-	private final class ConfigUpdater implements ManagedService {
-
-		private BundleContext bundleContext;
-		private ServiceRegistration registration;
-
-		public ConfigUpdater(final BundleContext bundleContext) throws Exception {
-			this.bundleContext = bundleContext;
-		}
-
-		@Override
-		public void updated(Dictionary config) throws ConfigurationException {
-			LOGGER.debug("Updating Decanter JDBC managed service");
-
-			if (registration != null) {
-				registration.unregister();
-			}
-
-			String dataSourceName = "jdbc/decanter";
-			if (config != null && config.get("datasource.name") != null) {
-				dataSourceName = (String) config.get("datasource.name");
-			}
-			String tableName = "decanter";
-			if (config != null && config.get("table.name") != null) {
-				tableName = (String) config.get("table.name");
-			}
-			String dialect = "generic";
-			if (config != null && config.get("dialect") != null) {
-				dialect = (String) config.get("dialect");
-			}
-			try {
-				JdbcAppender appender = new JdbcAppender(dataSourceName, tableName, dialect, bundleContext);
-				Dictionary<String, String> properties = new Hashtable<>();
-				properties.put(EventConstants.EVENT_TOPIC, "decanter/collect/*");
-				this.registration = bundleContext.registerService(EventHandler.class, appender, properties);
-				LOGGER.debug("Decanter JDBC appender started ({}/{})", dataSourceName, tableName);
-			} catch (Exception e) {
-				LOGGER.error("Can't start Decanter JDBC service tracker", e);
-				throw new ConfigurationException("table.name", "Can't start Decanter JDBC service tracker: " + e.getMessage());
-			}
-		}
-
-	}
+    private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class);
+    private static final String CONFIG_PID = "org.apache.karaf.decanter.appender.jdbc";
+    private ServiceTracker<Marshaller, ServiceRegistration> tracker;
+
+    @Override
+    public void start(final BundleContext bundleContext) throws Exception {
+        LOGGER.debug("Starting Decanter JDBC appender");
+        tracker = new ServiceTracker<Marshaller, ServiceRegistration>(bundleContext, Marshaller.class, null) {
+            @Override
+            public ServiceRegistration addingService(ServiceReference<Marshaller> reference) {
+                Dictionary<String, String> properties = new Hashtable<>();
+                properties.put(Constants.SERVICE_PID, CONFIG_PID);
+                Marshaller marshaller = context.getService(reference);
+                return bundleContext.registerService(ManagedService.class.getName(),
+                                                     new ConfigUpdater(bundleContext, marshaller),
+                                                     properties);
+            }
+
+            @Override
+            public void removedService(ServiceReference<Marshaller> reference, ServiceRegistration service) {
+                service.unregister();
+                super.removedService(reference, service);
+            }
+        };
+        tracker.open();
+    }
+
+    @Override
+    public void stop(BundleContext bundleContext) throws Exception {
+        LOGGER.debug("Stopping Decanter JDBC appender");
+        tracker.close();
+    }
+
+    private final class ConfigUpdater implements ManagedService {
+        private BundleContext bundleContext;
+        private Marshaller marshaller;
+        private ServiceTracker<DataSource, ServiceRegistration> dsTracker;
+
+        public ConfigUpdater(final BundleContext bundleContext, Marshaller marshaller) {
+            this.bundleContext = bundleContext;
+            this.marshaller = marshaller;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public void updated(Dictionary config) throws ConfigurationException {
+            LOGGER.debug("Updating Decanter JDBC managed service");
+            if (dsTracker != null) {
+                dsTracker.close();
+                dsTracker = null;
+            }
+            if (config == null) {
+                return;
+            }
+            final String dataSourceName = getValue(config, "datasource.name", "jdbc/decanter");
+            final String tableName = getValue(config, "table.name", "decanter");
+            final String dialect = getValue(config, "dialect", "generic");
+            final String filterSt = "(&(" + Constants.OBJECTCLASS + "=" + DataSource.class.getName() + ")"
+                + "(|(osgi.jndi.service.name=" + dataSourceName + ")(datasource=" + dataSourceName + ")(name=" + dataSourceName + ")(service.id=" + dataSourceName + ")))";
+            Filter filter;
+            try {
+                filter = bundleContext.createFilter(filterSt);
+            } catch (InvalidSyntaxException e) {
+                throw new ConfigurationException("datasource.name", "Unable to create DataSource filter " + filterSt, e);
+            }
+            LOGGER.info("Tracking DataSource " + filterSt);
+            dsTracker = new ServiceTracker<DataSource, ServiceRegistration>(bundleContext, filter, null) {
+                
+                @Override
+                public ServiceRegistration addingService(ServiceReference<DataSource> reference) {
+                    LOGGER.debug("DataSource acquired. Starting JDBC appender ({}/{})", dataSourceName, tableName);
+                    DataSource dataSource = context.getService(reference);
+                    JdbcAppender appender = new JdbcAppender(tableName, dialect, marshaller, dataSource);
+                    Dictionary<String, String> properties = new Hashtable<>();
+                    properties.put(EventConstants.EVENT_TOPIC, "decanter/collect/*");
+                    return bundleContext.registerService(EventHandler.class, appender, properties);
+                }
+
+                @Override
+                public void removedService(ServiceReference reference, ServiceRegistration serviceReg) {
+                    serviceReg.unregister();
+                    super.removedService(reference, serviceReg);
+                }
+                
+            };
+            dsTracker.open();
+            try {
+            } catch (Exception e) {
+                throw new ConfigurationException(null, "Can't start Decanter JDBC appender", e);
+            }
+        }
+
+        private String getValue(Dictionary<String, Object> config, String key, String defaultValue) {
+            String value = (String)config.get(key);
+            return (value != null) ? value :  defaultValue;
+        }
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/9e0a2215/appender/jdbc/src/main/java/org/apache/karaf/decanter/appender/jdbc/JdbcAppender.java
----------------------------------------------------------------------
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 38ab9e1..59ee194 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
@@ -16,36 +16,25 @@
  */
 package org.apache.karaf.decanter.appender.jdbc;
 
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
-import org.osgi.framework.ServiceReference;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.sql.DataSource;
+
+import org.apache.karaf.decanter.api.marshaller.Marshaller;
 import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
 import org.osgi.service.event.EventHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.json.*;
-import javax.sql.DataSource;
-import javax.sql.XADataSource;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.sql.*;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 public class JdbcAppender implements EventHandler {
-
     private final static Logger LOGGER = LoggerFactory.getLogger(JdbcAppender.class);
 
-    private final SimpleDateFormat tsFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss,SSS'Z'");
-
-    private String dataSourceName;
-    private String tableName;
-    private String dialect;
-    private BundleContext bundleContext;
-
     private final static String createTableQueryGenericTemplate =
-            "CREATE TABLE TABLENAME(timestamp INTEGER, content VARCHAR(8192))";
+            "CREATE TABLE TABLENAME(timestamp BIGINT, content VARCHAR(8192))";
     private final static String createTableQueryMySQLTemplate =
             "CREATE TABLE TABLENAME(timestamp BIGINT, content CLOB)";
     private final static String createTableQueryDerbyTemplate =
@@ -54,207 +43,61 @@ public class JdbcAppender implements EventHandler {
     private final static String insertQueryTemplate =
             "INSERT INTO TABLENAME(timestamp, content) VALUES(?,?)";
 
-    public JdbcAppender(String dataSourceName, String tableName, String dialect, BundleContext bundleContext) {
-        this.dataSourceName = dataSourceName;
-        this.tableName = tableName;
-        this.dialect = dialect;
-        this.bundleContext = bundleContext;
-    }
+    private String tableName;
+    private String dialect;
+    private Marshaller marshaller;
+    private DataSource dataSource;
 
-    private int getRank(ServiceReference<?> reference) {
-        Object rankObj = reference.getProperty(Constants.SERVICE_RANKING);
-        // If no rank, then spec says it defaults to zero.
-        rankObj = (rankObj == null) ? new Integer(0) : rankObj;
-        // If rank is not Integer, then spec says it defaults to zero.
-        return (rankObj instanceof Integer) ? (Integer) rankObj : 0;
+    public JdbcAppender(String tableName, String dialect, Marshaller marshaller, DataSource dataSource) {
+        this.tableName = tableName;
+        this.dialect = (dialect == null) ? "generic" : dialect;
+        this.marshaller = marshaller;
+        this.dataSource = dataSource;
+        try (Connection connection = dataSource.getConnection()) {
+            createTable(connection);
+        } catch (Exception e) {
+            LOGGER.debug("Error creating table " + tableName, e);
+        } 
     }
+    
+    
 
     @Override
     public void handleEvent(Event event) {
-        LOGGER.trace("Looking for the JDBC datasource");
-        ServiceReference[] references;
-        try {
-            references = bundleContext.getServiceReferences((String) null,
-                    "(&(|(" + Constants.OBJECTCLASS + "=" + DataSource.class.getName() + ")"
-                            + "(" + Constants.OBJECTCLASS + "=" + XADataSource.class.getName() + "))"
-                            + "(|(osgi.jndi.service.name=" + dataSourceName + ")(datasource=" + dataSourceName + ")(name=" + dataSourceName + ")(service.id=" + dataSourceName + ")))");
-        } catch (Exception e) {
-            throw new IllegalStateException("Can't lookup JDBC datasource " + dataSourceName, e);
-        }
-        if (references == null || references.length == 0) {
-            throw new IllegalArgumentException("No JDBC datasource found for " + dataSourceName);
-        }
-        if (references.length > 1) {
-            Arrays.sort(references);
-            if (getRank(references[references.length - 1]) == getRank(references[references.length - 2])) {
-                LOGGER.warn("Multiple JDBC datasources found with the same service ranking for " + dataSourceName);
+        try (Connection connection = dataSource.getConnection()) {
+            String jsonSt = marshaller.marshal(event);
+            String insertQuery = insertQueryTemplate.replaceAll("TABLENAME", tableName);
+            Long timestamp = (Long)event.getProperty(EventConstants.TIMESTAMP);
+            if (timestamp == null) {
+                timestamp = System.currentTimeMillis();
             }
-        }
-
-        ServiceReference ref = references[references.length - 1];
-
-        if (ref != null) {
-            DataSource dataSource = (DataSource) bundleContext.getService(ref);
-            Connection connection = null;
-            Statement createStatement = null;
-            PreparedStatement insertStatement = null;
-            try {
-                connection = dataSource.getConnection();
-
-                try {
-                    String createTableQuery;
-                    if (dialect != null && dialect.equalsIgnoreCase("mysql")) {
-                        createTableQuery = createTableQueryMySQLTemplate.replaceAll("TABLENAME", tableName);
-                    } else if (dialect != null && dialect.equalsIgnoreCase("derby")) {
-                        createTableQuery = createTableQueryDerbyTemplate.replaceAll("TABLENAME", tableName);
-                    } else {
-                        createTableQuery = createTableQueryGenericTemplate.replaceAll("TABLENAME", tableName);
-                    }
-                    createStatement = connection.createStatement();
-                    createStatement.executeUpdate(createTableQuery);
-                    LOGGER.debug("Table {} has been created", tableName);
-                } catch (SQLException e) {
-                    LOGGER.trace("Can't create table {}", e);
-                }
-
-                Long timestamp = (Long) event.getProperty("timestamp");
-                java.util.Date date = timestamp != null ? new java.util.Date(timestamp) : new java.util.Date();
-                JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
-                jsonObjectBuilder.add("@timestamp", tsFormat.format(date));
-                for (String key : event.getPropertyNames()) {
-                    Object value = event.getProperty(key);
-                    if (value instanceof Map) {
-                        jsonObjectBuilder.add(key, build((Map<String, Object>) value));
-                    } else if (value instanceof List) {
-                        jsonObjectBuilder.add(key, build((List) value));
-                    } else if (value instanceof long[] || value instanceof Long[]) {
-                        JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
-                        long[] array = (long[]) value;
-                        for (long l : array) {
-                            arrayBuilder.add(l);
-                        }
-                        jsonObjectBuilder.add(key, arrayBuilder.build());
-                    } else if (value instanceof int[] || value instanceof Integer[]) {
-                        JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
-                        int[] array = (int[]) value;
-                        for (int i : array) {
-                            arrayBuilder.add(i);
-                        }
-                        jsonObjectBuilder.add(key, arrayBuilder.build());
-                    } else if (value instanceof String[]) {
-                        JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
-                        String[] array = (String[]) value;
-                        for (String s : array) {
-                            arrayBuilder.add(s);
-                        }
-                        jsonObjectBuilder.add(key, arrayBuilder.build());
-                    } else if (value instanceof Object[]) {
-                        JsonArrayBuilder arrayBuilder = Json.createArrayBuilder();
-                        Object[] array = (Object[]) value;
-                        for (Object o : array) {
-                            arrayBuilder.add(o.toString());
-                        }
-                        jsonObjectBuilder.add(key, arrayBuilder.build());
-                    } else {
-                        addProperty(jsonObjectBuilder, key, value);
-                    }
-                }
-                JsonObject jsonObject = jsonObjectBuilder.build();
-                String jsonSt = jsonObject.toString();
-
-                String insertQuery = insertQueryTemplate.replaceAll("TABLENAME", tableName);
-                insertStatement = connection.prepareStatement(insertQuery);
-                if (timestamp == null) {
-                    timestamp = System.currentTimeMillis();
-                }
+            try (PreparedStatement insertStatement = connection.prepareStatement(insertQuery)) {
                 insertStatement.setLong(1, timestamp);
                 insertStatement.setString(2, jsonSt);
                 insertStatement.executeUpdate();
-
-                connection.commit();
                 LOGGER.trace("Data inserted into {} table", tableName);
-            } catch (Exception e) {
-                LOGGER.error("Can't store in the database", e);
-                try {
-                    if (connection != null) connection.rollback();
-                } catch (SQLException e1) {
-                    LOGGER.warn("Can't rollback", e1);
-                }
-            } finally {
-                try {
-                    if (createStatement != null) createStatement.close();
-                } catch (Exception e) {
-                    // nothing to do
-                }
-                try {
-                    if (insertStatement != null) insertStatement.close();
-                } catch (Exception e) {
-                    // nothing to do
-                }
-                try {
-                    if (connection != null) connection.close();
-                } catch (Exception e) {
-                    // nothing to do
-                }
-                if (ref != null) {
-                    bundleContext.ungetService(references[0]);
-                }
             }
+        } catch (Exception e) {
+            LOGGER.error("Can't store in the database", e);
         }
     }
 
-    private JsonObject build(Map<String, Object> value) {
-        JsonObjectBuilder innerBuilder = Json.createObjectBuilder();
-        for (Map.Entry<String, Object> innerEntrySet : value.entrySet()) {
-            addProperty(innerBuilder, innerEntrySet.getKey(), innerEntrySet.getValue());
+    private void createTable(Connection connection) {
+        String createTemplate = null;
+        if (dialect.equalsIgnoreCase("mysql")) {
+            createTemplate = createTableQueryMySQLTemplate;
+        } else if (dialect.equalsIgnoreCase("derby")) {
+            createTemplate = createTableQueryDerbyTemplate;
+        } else {
+            createTemplate = createTableQueryGenericTemplate;
         }
-        return innerBuilder.build();
-    }
-
-    private JsonArray build(List values) {
-        JsonArrayBuilder innerBuilder = Json.createArrayBuilder();
-        for (Object value : values) {
-            if (value instanceof Map) {
-                innerBuilder.add(build((Map) value));
-            } else {
-                if (value instanceof BigDecimal)
-                    innerBuilder.add((BigDecimal) value);
-                else if (value instanceof BigInteger)
-                    innerBuilder.add((BigInteger) value);
-                else if (value instanceof String)
-                    innerBuilder.add((String) value);
-                else if (value instanceof Long)
-                    innerBuilder.add((Long) value);
-                else if (value instanceof Integer)
-                    innerBuilder.add((Integer) value);
-                else if (value instanceof Float)
-                    innerBuilder.add((Float) value);
-                else if (value instanceof Double)
-                    innerBuilder.add((Double) value);
-                else if (value instanceof Boolean)
-                    innerBuilder.add((Boolean) value);
-            }
+        String createTableQuery = createTemplate.replaceAll("TABLENAME", tableName);
+        try (Statement createStatement = connection.createStatement()) {
+            createStatement.executeUpdate(createTableQuery);
+            LOGGER.debug("Table {} has been created", tableName);
+        } catch (SQLException e) {
+            LOGGER.trace("Can't create table {}", e);
         }
-        return innerBuilder.build();
-    }
-
-    private void addProperty(JsonObjectBuilder builder, String key, Object value) {
-        if (value instanceof BigDecimal)
-            builder.add(key, (BigDecimal) value);
-        else if (value instanceof BigInteger)
-            builder.add(key, (BigInteger) value);
-        else if (value instanceof String)
-            builder.add(key, (String) value);
-        else if (value instanceof Long)
-            builder.add(key, (Long) value);
-        else if (value instanceof Integer)
-            builder.add(key, (Integer) value);
-        else if (value instanceof Float)
-            builder.add(key, (Float) value);
-        else if (value instanceof Double)
-            builder.add(key, (Double) value);
-        else if (value instanceof Boolean)
-            builder.add(key, (Boolean) value);
     }
 
 }

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/9e0a2215/appender/jdbc/src/test/java/org/apache/karaf/decanter/appender/jdbc/TestJdbcAppender.java
----------------------------------------------------------------------
diff --git a/appender/jdbc/src/test/java/org/apache/karaf/decanter/appender/jdbc/TestJdbcAppender.java b/appender/jdbc/src/test/java/org/apache/karaf/decanter/appender/jdbc/TestJdbcAppender.java
new file mode 100644
index 0000000..f98700e
--- /dev/null
+++ b/appender/jdbc/src/test/java/org/apache/karaf/decanter/appender/jdbc/TestJdbcAppender.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.decanter.appender.jdbc;
+
+import java.io.StringReader;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
+
+import org.apache.derby.jdbc.EmbeddedDataSource;
+import org.apache.karaf.decanter.api.marshaller.Marshaller;
+import org.apache.karaf.decanter.marshaller.json.JsonMarshaller;
+import org.junit.Assert;
+import org.junit.Test;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventConstants;
+
+public class TestJdbcAppender {
+    private static final String TABLE_NAME = "decanter";
+    private static final String TOPIC = "decanter/collect/jmx";
+    private static final long TIMESTAMP = 1454428780634L;
+
+    @Test
+    public void testHandleEvent() throws SQLException {
+        Marshaller marshaller = new JsonMarshaller();
+        EmbeddedDataSource dataSource = new EmbeddedDataSource();
+        dataSource.setDatabaseName("target/testDB");
+        dataSource.setCreateDatabase("create");
+        
+        deleteTable(dataSource);
+        
+        JdbcAppender appender = new JdbcAppender(TABLE_NAME, "derby", marshaller, dataSource);
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(EventConstants.TIMESTAMP, TIMESTAMP);
+        Event event = new Event(TOPIC, properties);
+        appender.handleEvent(event);
+
+        try (Connection con = dataSource.getConnection(); Statement statement = con.createStatement();) {
+            ResultSet res = statement.executeQuery("select timestamp, content from " + TABLE_NAME);
+            res.next();
+            long dbTimeStamp = res.getLong(1);
+            String json = res.getString(2);
+            JsonReader reader = Json.createReader(new StringReader(json));
+            JsonObject jsonO = reader.readObject();
+            Assert.assertEquals("Timestamp db", TIMESTAMP, dbTimeStamp);
+            Assert.assertEquals("Timestamp string", "2016-02-02T15:59:40,634Z",jsonO.getString("@timestamp"));
+            Assert.assertEquals("timestamp long", TIMESTAMP, jsonO.getJsonNumber(EventConstants.TIMESTAMP).longValue());
+            Assert.assertEquals("Topic", TOPIC, jsonO.getString(EventConstants.EVENT_TOPIC));
+            Assert.assertFalse(res.next());
+        }
+    }
+
+    private void deleteTable(EmbeddedDataSource dataSource) throws SQLException {
+        try (Connection con = dataSource.getConnection(); Statement statement = con.createStatement();) {
+            statement.execute("delete from " + TABLE_NAME);
+        } catch (Exception e) {
+            // Ignore
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/9e0a2215/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b3d64ba..170a4ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,6 +236,11 @@
                 <artifactId>org.apache.karaf.decanter.api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.karaf.decanter.marshaller</groupId>
+                <artifactId>org.apache.karaf.decanter.marshaller.json</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <!-- OSGi -->
             <dependency>
@@ -278,6 +283,11 @@
                 <artifactId>johnzon-mapper</artifactId>
                 <version>0.9.2-incubating</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>10.12.1.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>