This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-config. See https://gitlab.nuiton.org/nuiton/nuiton-config.git commit 20927f698ae040ea5439c9ae1f087a9b3aee183a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 7 12:05:16 2016 +0200 Add ini io implementation --- nuiton-config-io-ini/LICENSE.txt | 165 +++++++++++++++++++++ nuiton-config-io-ini/README.md | 0 nuiton-config-io-ini/pom.xml | 37 +++++ .../config/io/ini/ApplicationConfigIOIni.java | 86 +++++++++++ .../org.nuiton.config.io.ApplicationConfigIO | 1 + pom.xml | 1 + 6 files changed, 290 insertions(+) diff --git a/nuiton-config-io-ini/LICENSE.txt b/nuiton-config-io-ini/LICENSE.txt new file mode 100644 index 0000000..cca7fc2 --- /dev/null +++ b/nuiton-config-io-ini/LICENSE.txt @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/nuiton-config-io-ini/README.md b/nuiton-config-io-ini/README.md new file mode 100644 index 0000000..e69de29 diff --git a/nuiton-config-io-ini/pom.xml b/nuiton-config-io-ini/pom.xml new file mode 100644 index 0000000..7a13c3e --- /dev/null +++ b/nuiton-config-io-ini/pom.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-project</artifactId> + <version>3.1-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-config-io-ini</artifactId> + + <name>Nuiton Config :: IO Ini</name> + <description>Nuiton Config IO Ini</description> + <inceptionYear>2016</inceptionYear> + + <properties> + + </properties> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> + </dependency> + + </dependencies> + +</project> diff --git a/nuiton-config-io-ini/src/main/java/org/nuiton/config/io/ini/ApplicationConfigIOIni.java b/nuiton-config-io-ini/src/main/java/org/nuiton/config/io/ini/ApplicationConfigIOIni.java new file mode 100644 index 0000000..bfadbc3 --- /dev/null +++ b/nuiton-config-io-ini/src/main/java/org/nuiton/config/io/ini/ApplicationConfigIOIni.java @@ -0,0 +1,86 @@ +package org.nuiton.config.io.ini; + +import com.google.common.io.Files; +import org.apache.commons.configuration2.INIConfiguration; +import org.apache.commons.configuration2.SubnodeConfiguration; +import org.nuiton.config.io.ApplicationConfigIO; +import org.nuiton.config.io.ApplicationConfigReadFormat; +import org.nuiton.config.io.ApplicationConfigReadPropertiesException; +import org.nuiton.config.io.ApplicationConfigWritePropertiesException; + +import java.io.BufferedReader; +import java.io.File; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.Writer; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.Iterator; +import java.util.Properties; + +/** + * Created on 07/10/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.1 + */ +public class ApplicationConfigIOIni implements ApplicationConfigIO { + + @Override + public boolean accept(ApplicationConfigReadFormat readFormat) { + return ApplicationConfigReadFormat.ini.equals(readFormat); + } + + @Override + public Properties readProperties(URL url, String encoding) throws ApplicationConfigReadPropertiesException { + Properties properties = new Properties(); + INIConfiguration iniConfiguration = new INIConfiguration(); + try (Reader reader = new BufferedReader(new InputStreamReader(url.openStream(), encoding))) { + iniConfiguration.read(reader); + } catch (Exception e) { + throw new ApplicationConfigReadPropertiesException("Can't read ini file: " + url, e); + } + + Iterator<String> keysIterator = iniConfiguration.getKeys(); + while (keysIterator.hasNext()) { + String key = keysIterator.next(); + properties.put(key, iniConfiguration.getProperty(key)); + } + for (String sectionName : iniConfiguration.getSections()) { + + if (sectionName == null) { + continue; + } + + SubnodeConfiguration section = iniConfiguration.getSection(sectionName); + + Iterator<String> sectionKeysIterator = section.getKeys(); + while (sectionKeysIterator.hasNext()) { + String key = sectionKeysIterator.next(); + properties.put(sectionName + "." + key, section.getProperty(key)); + } + + } + + return properties; + } + + @Override + public void writeProperties(Properties properties, File file, String encoding, String comment) throws ApplicationConfigWritePropertiesException { + + INIConfiguration iniConfiguration = new INIConfiguration(); + + //FIXME See how to manage sections ? guess them from keys ? + for (String key : properties.stringPropertyNames()) { + iniConfiguration.addProperty(key, properties.getProperty(key, null)); + } + + try (Writer writer = Files.newWriter(file, Charset.forName(encoding))) { + iniConfiguration.write(writer); + } catch (Exception e) { + throw new ApplicationConfigWritePropertiesException("Can't write ini file: " + file, e); + } + + } + +} diff --git a/nuiton-config-io-ini/src/main/resources/services/org.nuiton.config.io.ApplicationConfigIO b/nuiton-config-io-ini/src/main/resources/services/org.nuiton.config.io.ApplicationConfigIO new file mode 100644 index 0000000..3ef7454 --- /dev/null +++ b/nuiton-config-io-ini/src/main/resources/services/org.nuiton.config.io.ApplicationConfigIO @@ -0,0 +1 @@ +org.nuiton.config.io.ini.ApplicationConfigIOIni \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8e3e7e..ce56d29 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,7 @@ <modules> <module>nuiton-config</module> + <module>nuiton-config-io-ini</module> <module>nuiton-config-maven-plugin</module> <module>nuiton-config-example</module> </modules> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.