Merge branch 'develop'

apiman · Sep 20, 2016 · e80196e · e80196e
2 parents 6e5d083 + f142530
commit e80196e
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [0.2.2] - 2016-09-20
 ### Added
-- ...
+- Adds support for XML format Java properties files.
+- Adds support for specifying multiple properties files.
 
 ## [0.2.1] - 2016-09-20
 ### Added

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
  */
 
 group 'io.apiman.cli'
-version '0.2.1'
+version '0.2.2'
 
 buildscript {
     repositories {

diff --git a/src/main/java/io/apiman/cli/core/declarative/command/ApplyCommand.java b/src/main/java/io/apiman/cli/core/declarative/command/ApplyCommand.java
@@ -75,7 +75,7 @@ public class ApplyCommand extends AbstractFinalCommand {
     private List<String> properties;
 
     @Option(name = "--propertiesFile", usage = "Properties file")
-    private Path propertiesFile;
+    private List<Path> propertiesFiles;
 
     @Option(name = "--serverVersion", aliases = {"-sv"}, usage = "Management API server version")
     private ManagementApiVersion serverVersion = ManagementApiVersion.DEFAULT_VERSION;
@@ -97,18 +97,22 @@ public void applyDeclaration() {
         final Map<String, String> parsedProperties = BeanUtil.parseReplacements(properties);
 
         // check for properties file
-        if (null != propertiesFile) {
+        ofNullable(propertiesFiles).ifPresent(propertiesFiles -> propertiesFiles.forEach(propertiesFile -> {
             LOGGER.trace("Loading properties file: {}", propertiesFile);
 
             final Properties fileProperties = new Properties();
             try (final InputStream propertiesIn = Files.newInputStream(propertiesFile, StandardOpenOption.READ)) {
-                fileProperties.load(propertiesIn);
+                if (propertiesFile.toAbsolutePath().toString().toLowerCase().endsWith(".xml")) {
+                    fileProperties.loadFromXML(propertiesIn);
+                } else {
+                    fileProperties.load(propertiesIn);
+                }
             } catch (IOException e) {
                 throw new CommandException(String.format("Error loading properties file: %s", propertiesFile), e);
             }
 
             fileProperties.forEach((key, value) -> parsedProperties.put((String) key, (String) value));
-        }
+        }));
 
         final Declaration declaration;
 
@@ -453,8 +457,8 @@ public void setProperties(List<String> properties) {
         this.properties = properties;
     }
 
-    public void setPropertiesFile(Path propertiesFile) {
-        this.propertiesFile = propertiesFile;
+    public void setPropertiesFiles(List<Path> propertiesFiles) {
+        this.propertiesFiles = propertiesFiles;
     }
 
     public void setServerAddress(String serverAddress) {

diff --git a/src/test/java/io/apiman/cli/command/DeclarativeTest.java b/src/test/java/io/apiman/cli/command/DeclarativeTest.java
@@ -87,7 +87,12 @@ public void testApplyDeclaration_Full() throws Exception {
 
     /**
      * Expect that the configuration in the declaration can be applied, resolving placeholders passed
-     * from the command line as well as from a properties file.
+     * from:
+     * <ul>
+     * <li>the command line (using '-P key=value')</li>
+     * <li>a key=value format Java properties file (.properties)</li>
+     * <li>an XML format Java properties file (.xml)</li>
+     * </ul>
      *
      * @throws Exception
      */
@@ -99,7 +104,10 @@ public void testApplyDeclaration_WithProperties() throws Exception {
 
         command.setDeclarationFile(Paths.get(DeclarativeTest.class.getResource("/simple-placeholders.yml").toURI()));
         command.setProperties(inlineProperties);
-        command.setPropertiesFile(Paths.get(DeclarativeTest.class.getResource("/declaration-test.properties").toURI()));
+        command.setPropertiesFiles(Lists.newArrayList(
+                Paths.get(DeclarativeTest.class.getResource("/placeholder-test.properties").toURI()),
+                Paths.get(DeclarativeTest.class.getResource("/placeholder-test.xml").toURI())
+        ));
 
         command.applyDeclaration();
     }

diff --git a/src/test/resources/declaration-test.properties b/src/test/resources/declaration-test.properties
diff --git a/src/test/resources/placeholder-test.properties b/src/test/resources/placeholder-test.properties
@@ -0,0 +1 @@
+gw.username=user
diff --git a/src/test/resources/placeholder-test.xml b/src/test/resources/placeholder-test.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <entry key="gw.password"><![CDATA[Pa$$word1!]]></entry>
+</properties>