Moved project package from org.eclipse.moquette to io.moquette

2015-11-20 21:30:59 +01:00
parent f438ef7f49
commit 371c740321
175 changed files with 629 additions and 669 deletions
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2012-2015 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+package io.moquette.server.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.text.ParseException;
+import java.util.Properties;
+
+/**
+ * Configuration that loads file from the classpath
+ *
+ * @author andrea
+ */
+public class ClasspathConfig implements IConfig {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ClasspathConfig.class);
+
+    private final Properties m_properties;
+
+    public ClasspathConfig() {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        InputStream is = classLoader.getResourceAsStream("config/moquette.conf");
+        if (is == null) {
+            throw new RuntimeException("Can't locate the resourse \"config/moquette.conf\"");
+        }
+        Reader configReader = new InputStreamReader(is);
+        ConfigurationParser confParser = new ConfigurationParser();
+        try {
+            confParser.parse(configReader);
+        } catch (ParseException pex) {
+            LOG.warn("An error occurred in parsing configuration, fallback on default configuration", pex);
+        }
+        m_properties = confParser.getProperties();
+    }
+
+    @Override
+    public void setProperty(String name, String value) {
+        m_properties.setProperty(name, value);
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return m_properties.getProperty(name);
+    }
+
+    @Override
+    public String getProperty(String name, String defaultValue) {
+        return m_properties.getProperty(name, defaultValue);
+    }
+}
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2012-2015 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+package io.moquette.server.config;
+
+import io.moquette.commons.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.text.ParseException;
+import java.util.Properties;
+
+/**
+ * Mosquitto configuration parser.
+ * 
+ * A line that at the very first has # is a comment
+ * Each line has key value format, where the separator used it the space.
+ * 
+ * @author andrea
+ */
+class ConfigurationParser {
+    
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigurationParser.class);
+    
+    private Properties m_properties = new Properties();
+    
+    ConfigurationParser() {
+    	createDefaults();
+    }
+
+    private void createDefaults() {
+        m_properties.put(Constants.PORT_PROPERTY_NAME, Integer.toString(Constants.PORT));
+        m_properties.put(Constants.HOST_PROPERTY_NAME, Constants.HOST);
+        m_properties.put(Constants.WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(Constants.WEBSOCKET_PORT));
+        m_properties.put(Constants.PASSWORD_FILE_PROPERTY_NAME, "");
+        m_properties.put(Constants.PERSISTENT_STORE_PROPERTY_NAME, Constants.DEFAULT_PERSISTENT_PATH);
+        m_properties.put(Constants.ALLOW_ANONYMOUS_PROPERTY_NAME, true);
+        m_properties.put(Constants.AUTHENTICATOR_CLASS_NAME, "");
+        m_properties.put(Constants.AUTHORIZATOR_CLASS_NAME, "");
+    }
+    
+    /**
+     * Parse the configuration from file.
+     */
+    void parse(File file) throws ParseException {
+        if (file == null) {
+            LOG.warn("parsing NULL file, so fallback on default configuration!");
+            return;
+        }
+        if (!file.exists()) {
+            LOG.warn(String.format("parsing not existing file %s, so fallback on default configuration!", file.getAbsolutePath()));
+            return;
+        }
+        try {
+            FileReader reader = new FileReader(file);
+            parse(reader);
+        } catch (FileNotFoundException fex) {
+            LOG.warn(String.format("parsing not existing file %s, so fallback on default configuration!", file.getAbsolutePath()), fex);
+            return;
+        }
+    }
+    
+    /**
+     * Parse the configuration 
+     * 
+     * @throws ParseException if the format is not compliant.
+     */
+    void parse(Reader reader) throws ParseException {
+        if (reader == null) {
+            //just log and return default properties
+            LOG.warn("parsing NULL reader, so fallback on default configuration!");
+            return;
+        }
+        
+        BufferedReader br = new BufferedReader(reader);
+        String line;
+        try {
+            while ((line = br.readLine()) != null) {
+                int commentMarker = line.indexOf('#');
+                if (commentMarker != -1) {
+                    if (commentMarker == 0) {
+                        //skip its a comment
+                        continue;
+                    } else {
+                        //it's a malformed comment
+                        throw new ParseException(line, commentMarker);
+                    }
+                } else {
+                    if (line.isEmpty() || line.matches("^\\s*$")) {
+                        //skip it's a black line
+                        continue;
+                    }
+                    
+                    //split till the first space
+                    int delimiterIdx = line.indexOf(' ');
+                    String key = line.substring(0, delimiterIdx).trim();
+                    String value = line.substring(delimiterIdx).trim();
+                    
+                    m_properties.put(key, value);
+                }
+            }
+        } catch (IOException ex) {
+            throw new ParseException("Failed to read", 1);
+        }
+    }
+    
+    Properties getProperties() {
+        return m_properties;
+    }
+}
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2012-2015 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+package io.moquette.server.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.text.ParseException;
+import java.util.Properties;
+
+/**
+ * Configuration that loads file from the file system
+ *
+ * @author andrea
+ */
+public class FilesystemConfig implements IConfig {
+    private static final Logger LOG = LoggerFactory.getLogger(FilesystemConfig.class);
+
+    private final Properties m_properties;
+
+    public FilesystemConfig(File file) {
+        ConfigurationParser confParser = new ConfigurationParser();
+        try {
+            confParser.parse(file);
+        } catch (ParseException pex) {
+            LOG.warn("An error occurred in parsing configuration, fallback on default configuration", pex);
+        }
+        m_properties = confParser.getProperties();
+    }
+
+    public FilesystemConfig() {
+        this(defaultConfigFile());
+    }
+
+    private static File defaultConfigFile() {
+        String configPath = System.getProperty("moquette.path", null);
+        return new File(configPath, "config/moquette.conf");
+    }
+
+    @Override
+    public void setProperty(String name, String value) {
+        m_properties.setProperty(name, value);
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return m_properties.getProperty(name);
+    }
+
+    @Override
+    public String getProperty(String name, String defaultValue) {
+        return m_properties.getProperty(name, defaultValue);
+    }
+}
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012-2015 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+package io.moquette.server.config;
+
+/**
+ * Base interface for all configuration implementations (filesystem, memory or classpath)
+ *
+ * @author andrea
+ */
+public interface IConfig {
+    void setProperty(String name, String value);
+
+    String getProperty(String name);
+
+    String getProperty(String name, String defaultValue);
+}
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2012-2015 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+package io.moquette.server.config;
+
+import io.moquette.commons.Constants;
+
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Configuration backed by memory.
+ *
+ * @author andrea
+ */
+public class MemoryConfig implements IConfig {
+
+    private final Properties m_properties = new Properties();
+
+    public MemoryConfig(Properties properties) {
+        createDefaults();
+        for (Map.Entry<Object, Object> entrySet : properties.entrySet()) {
+            m_properties.put(entrySet.getKey(), entrySet.getValue());
+        }
+    }
+
+    private void createDefaults() {
+        m_properties.put(Constants.PORT_PROPERTY_NAME, Integer.toString(Constants.PORT));
+        m_properties.put(Constants.HOST_PROPERTY_NAME, Constants.HOST);
+        m_properties.put(Constants.WEB_SOCKET_PORT_PROPERTY_NAME, Integer.toString(Constants.WEBSOCKET_PORT));
+        m_properties.put(Constants.PASSWORD_FILE_PROPERTY_NAME, "");
+        m_properties.put(Constants.PERSISTENT_STORE_PROPERTY_NAME, Constants.DEFAULT_PERSISTENT_PATH);
+        m_properties.put(Constants.ALLOW_ANONYMOUS_PROPERTY_NAME, true);
+        m_properties.put(Constants.AUTHENTICATOR_CLASS_NAME, "");
+        m_properties.put(Constants.AUTHORIZATOR_CLASS_NAME, "");
+    }
+
+    @Override
+    public void setProperty(String name, String value) {
+        m_properties.setProperty(name, value);
+    }
+
+    @Override
+    public String getProperty(String name) {
+        return m_properties.getProperty(name);
+    }
+
+    @Override
+    public String getProperty(String name, String defaultValue) {
+        return m_properties.getProperty(name, defaultValue);
+    }
+}