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/01 13:59:53 UTC

karaf-decanter git commit: [KARAF-4304] Cleanup elasticsearch code and build

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 2e9b72a0c -> 3e786d025


[KARAF-4304] Cleanup elasticsearch code and build


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

Branch: refs/heads/master
Commit: 3e786d02547e93efb90526df855cb6d8f82408e8
Parents: 2e9b72a
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Feb 1 13:59:38 2016 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Feb 1 13:59:38 2016 +0100

----------------------------------------------------------------------
 .../karaf/decanter/elasticsearch/Activator.java | 51 +++++++----------
 .../decanter/elasticsearch/EmbeddedNode.java    | 60 ++++++++++----------
 .../elasticsearch/TestEmbeddedNode.java         |  8 ++-
 3 files changed, 56 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/3e786d02/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/Activator.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/Activator.java b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/Activator.java
index 022e0a5..02a4833 100644
--- a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/Activator.java
+++ b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/Activator.java
@@ -18,7 +18,6 @@ package org.apache.karaf.decanter.elasticsearch;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
-import java.util.concurrent.CancellationException;
 
 import org.elasticsearch.node.Node;
 import org.osgi.framework.BundleActivator;
@@ -27,17 +26,14 @@ import org.osgi.framework.Constants;
 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.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings("rawtypes")
 public class Activator implements BundleActivator {
+    private static final String CONFIG_PID = "org.apache.karaf.decanter.elasticsearch";
+    private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class);
 
-	private static final String CONFIG_PID = "org.apache.karaf.decanter.elasticsearch";
-	
-	private final static Logger LOGGER = LoggerFactory.getLogger(Activator.class);
-	
     private EmbeddedNode node;
     private ServiceRegistration service;
     private ServiceRegistration registration;
@@ -45,7 +41,8 @@ public class Activator implements BundleActivator {
     public void start(BundleContext bundleContext) throws Exception {
         Dictionary<String, String> properties = new Hashtable<>();
         properties.put(Constants.SERVICE_PID, CONFIG_PID);
-        registration = bundleContext.registerService(ManagedService.class.getName(), new ConfigUpdater(bundleContext), properties);
+        registration = bundleContext.registerService(ManagedService.class.getName(),
+                                                     new ConfigUpdater(bundleContext), properties);
     }
 
     public void stop(BundleContext bundleContext) throws Exception {
@@ -59,7 +56,7 @@ public class Activator implements BundleActivator {
             registration.unregister();
         }
     }
-    
+
     private final class ConfigUpdater implements ManagedService {
         private BundleContext bundleContext;
 
@@ -71,33 +68,25 @@ public class Activator implements BundleActivator {
         public void updated(Dictionary<String, ?> config) throws ConfigurationException {
             if (node != null) {
                 try {
-					node.stop();
-				} catch (Exception e) {
-					String message = "Failed to stop embedded elasticsearch node";
-					LOGGER.error(message, e);
-					throw new ConfigurationException(null, message, e);
-				}
+                    node.stop();
+                } catch (Exception e) {
+                    String message = "Failed to stop embedded elasticsearch node";
+                    LOGGER.error(message, e);
+                    throw new ConfigurationException(null, message, e);
+                }
                 service.unregister();
                 node = null;
             }
-        	
-        	if (node == null) {
-                try {
-					node = new EmbeddedNode(config);
-				} catch (Exception e) {
-					String message = "Failed to create embedded elasticsearch node";
-					LOGGER.error(message, e);
-					throw new ConfigurationException(null, message, e);
-				}
+
+            try {
+                node = new EmbeddedNode(config);
+                node.start();
+            } catch (Exception e) {
+                String message = "Failed to start embedded elasticsearch node";
+                LOGGER.error(message, e);
+                throw new ConfigurationException(null, message, e);
             }
             service = bundleContext.registerService(Node.class, node.getNode(), null);
-            try {
-				node.start();
-			} catch (Exception e) {
-				String message = "Failed to starts embedded elasticsearch node";
-				LOGGER.error(message, e);
-				throw new ConfigurationException(null, message, e);
-			}
         }
     }
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/3e786d02/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
index f2cafd9..8270d12 100644
--- a/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
+++ b/elasticsearch/src/main/java/org/apache/karaf/decanter/elasticsearch/EmbeddedNode.java
@@ -21,7 +21,6 @@ import org.elasticsearch.common.settings.ImmutableSettings.Builder;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.node.internal.InternalNode;
-import org.osgi.service.cm.ManagedService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,20 +35,20 @@ public class EmbeddedNode {
     private final static Logger LOGGER = LoggerFactory.getLogger(EmbeddedNode.class);
     private static Node node;
     
-	public static String PLUGINS_DIRECTORY = "plugins.directory";
-	public static String ELASTIC_YAML_FILE = "elasticsearch.yaml";
-	
-	public static String CLUSTER_NAME = "cluster.name";
-	public static String HTTP_ENABLED = "http.enabled";
-	public static String NODE_DATA = "node.data";
-	public static String NODE_NAME = "node.name";
-	public static String NODE_MASTER = "node.master";
-	public static String PATH_DATA = "path.data";
-	public static String NETWORK_HOST = "network.host";
-	public static String CLUSTER_ROUTING_SCHEDULE = "cluster.routing.schedule";
-	public static String PATH_PLUGINS = "path.plugins";
-	public static String HTTP_CORS_ENABLED = "http.cors.enabled";
-	public static String HTTP_CORS_ALLOW_ORIGIN = "http.cors.allow-origin";
+    public static String PLUGINS_DIRECTORY = "plugins.directory";
+    public static String ELASTIC_YAML_FILE = "elasticsearch.yaml";
+
+    public static String CLUSTER_NAME = "cluster.name";
+    public static String HTTP_ENABLED = "http.enabled";
+    public static String NODE_DATA = "node.data";
+    public static String NODE_NAME = "node.name";
+    public static String NODE_MASTER = "node.master";
+    public static String PATH_DATA = "path.data";
+    public static String NETWORK_HOST = "network.host";
+    public static String CLUSTER_ROUTING_SCHEDULE = "cluster.routing.schedule";
+    public static String PATH_PLUGINS = "path.plugins";
+    public static String HTTP_CORS_ENABLED = "http.cors.enabled";
+    public static String HTTP_CORS_ALLOW_ORIGIN = "http.cors.allow-origin";
 
     public EmbeddedNode(Dictionary<String, ?> config) throws Exception {
         LOGGER.info("Starting Elasticsearch node ...");
@@ -69,17 +68,15 @@ public class EmbeddedNode {
         if (ymlFile.exists()) {
             // elasticsearch.yml is provided
             LOGGER.debug("elasticsearch.yml found for settings");
-            settings = ImmutableSettings.settingsBuilder().loadFromUrl(ymlFile.toURL()).build();
+            settings = ImmutableSettings.settingsBuilder().loadFromUrl(ymlFile.toURI().toURL()).build();
         } 
 
         // configuration will be overridden by special configurations
         LOGGER.debug("enhancing elasticsearch configuration with given configurations");
         
-        Builder settingsBuilder;
-        if (settings == null) {
-        	settingsBuilder = ImmutableSettings.settingsBuilder();
-        } else {
-        	settingsBuilder = ImmutableSettings.settingsBuilder().put(settings);
+        Builder settingsBuilder = ImmutableSettings.settingsBuilder();
+        if (settings != null) {
+            settingsBuilder = ImmutableSettings.settingsBuilder().put(settings);
         }      
 
        	settingsBuilder.put(CLUSTER_NAME, getConfig(config, settings, CLUSTER_NAME, "elasticsearch"));
@@ -87,7 +84,7 @@ public class EmbeddedNode {
        	settingsBuilder.put(PATH_DATA, getConfig(config, settings, PATH_DATA, "data"));
        	settingsBuilder.put(NODE_MASTER, getConfig(config, settings, NODE_MASTER, "true"));
        	settingsBuilder.put(NODE_DATA, getConfig(config, settings, NODE_DATA, "true"));
-       	settingsBuilder.put(NODE_NAME, getConfig(config, settings, NODE_NAME, System.getProperty("karaf.name") == null ? "decanter" : System.getProperty("karaf.name")));
+       	settingsBuilder.put(NODE_NAME, getConfig(config, settings, NODE_NAME, getNodeName()));
        	settingsBuilder.put(NETWORK_HOST, getConfig(config, settings, NETWORK_HOST, "127.0.0.1"));
        	settingsBuilder.put(CLUSTER_ROUTING_SCHEDULE, getConfig(config, settings, CLUSTER_ROUTING_SCHEDULE, "50ms"));
        	settingsBuilder.put(PATH_PLUGINS, getConfig(config, settings, PATH_PLUGINS, pluginsFile.getAbsolutePath()));
@@ -101,7 +98,11 @@ public class EmbeddedNode {
         LOGGER.info("Elasticsearch node created");
     }
 
-	public void start() throws Exception {
+    private String getNodeName() {
+        return System.getProperty("karaf.name") == null ? "decanter" : System.getProperty("karaf.name");
+    }
+
+    public void start() throws Exception {
         if (node != null) {
             node.start();
         }
@@ -124,13 +125,14 @@ public class EmbeddedNode {
         return node;
     }
     
-    private String getConfig(Dictionary<String, ?> config, Settings settings, String key, String defaultValue) {
-    	if (settings != null && settings.get(key) != null)
-    		defaultValue = settings.get(key);
+    private String getConfig(Dictionary<String, ?> config, Settings settings, String key,
+                             String defaultValue) {
+        if (settings != null && settings.get(key) != null)
+            defaultValue = settings.get(key);
         if (config == null)
             return defaultValue;
-		String value = (String) config.get(key);
-		return value != null ? value : defaultValue;
-	}
+        String value = (String)config.get(key);
+        return value != null ? value : defaultValue;
+    }
 
 }

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/3e786d02/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
----------------------------------------------------------------------
diff --git a/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java b/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
index de280f7..4ef0854 100644
--- a/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
+++ b/elasticsearch/src/test/java/org/apache/karaf/decanter/elasticsearch/TestEmbeddedNode.java
@@ -24,6 +24,7 @@ import org.elasticsearch.node.Node;
 import static org.junit.Assert.*;
 
 import java.util.Dictionary;
+import java.util.Hashtable;
 
 import org.junit.Test;
 
@@ -32,11 +33,12 @@ public class TestEmbeddedNode {
     @Test
     public void testNode() throws Exception {
 
-        System.setProperty("karaf.home", "/tmp");
+        System.setProperty("karaf.home", "target/karaf");
         System.setProperty("karaf.name", "decanter-test");
 
-        Dictionary<String, ?> configuration = null;
-		EmbeddedNode embeddedNode = new EmbeddedNode(configuration);
+        Dictionary<String, String> configuration = new Hashtable<>();
+        configuration.put(EmbeddedNode.PATH_DATA, "target/karaf/es");
+        EmbeddedNode embeddedNode = new EmbeddedNode(configuration);
         
         Node node = embeddedNode.getNode();
         embeddedNode.start();