diff --git a/broker/src/main/java/io/moquette/server/config/ConfigurationParser.java b/broker/src/main/java/io/moquette/server/config/ConfigurationParser.java index bbc3d912..3b95573f 100644 --- a/broker/src/main/java/io/moquette/server/config/ConfigurationParser.java +++ b/broker/src/main/java/io/moquette/server/config/ConfigurationParser.java @@ -13,11 +13,11 @@ * * 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.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -29,18 +29,18 @@ 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. - * + * + * 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(); - + /** * Parse the configuration from file. */ @@ -50,30 +50,38 @@ class ConfigurationParser { return; } if (!file.exists()) { - LOG.warn(String.format("parsing not existing file %s, so fallback on default configuration!", file.getAbsolutePath())); + 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); + 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. + * 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 + // 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 { @@ -81,39 +89,37 @@ class ConfigurationParser { int commentMarker = line.indexOf('#'); if (commentMarker != -1) { if (commentMarker == 0) { - //skip its a comment + // skip its a comment continue; } else { - //it's a malformed comment + // it's a malformed comment throw new ParseException(line, commentMarker); } } else { if (line.isEmpty() || line.matches("^\\s*$")) { - //skip it's a black line + // skip it's a black line continue; } - - //split till the first space + + // 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); - } - finally { + } finally { try { reader.close(); - } - catch (IOException e) { + } catch (IOException e) { // ignore } } } - + Properties getProperties() { return m_properties; }