テンプレートでユーザー定義の変数を使用できるように修正。

--configオプションで指定するJSONファイルで以下のように定義する。

{
    ...,
    "additionalProperties": {
        "name1": "value1",
        "name2": "value2",
        ...
    }
}

additionalProperties オブジェクトの下に定義する。
上記の例ではstring型だけだが、それ以外にも integer, number, boolean, object, array型の値を指定可能。

Author: masaru-takano

.idea/markdown-exported-files.xml

@@ -8,12 +8,12 @@
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
-import config.Config;
-import config.ConfigParser;
+import com.google.common.collect.ImmutableMap;
 import io.swagger.codegen.*;
 import io.swagger.models.*;
 import io.swagger.parser.SwaggerParser;
@@ -154,6 +154,11 @@ public static void main(String[] args) {
                             config.additionalProperties().put(langCliOption.getOpt(), genConfig.getOption(langCliOption.getOpt()));
                         }
                     }
+                    config.additionalProperties().putAll(genConfig.getAdditionalProperties());
+
+                    for (Map.Entry<String, Object> prop : config.additionalProperties().entrySet()) {
+                        LOGGER.info("Parsed additionProperties: " + prop.getKey() + "=" + prop.getValue());
+                    }
                 }
             }
             if (cmd.hasOption("t")) {
@@ -693,4 +698,66 @@ static void usage(Options options) {
         formatter.printHelp("DConnectCodegen", options);
     }
 
+    private static class Config {
+
+        private final Map<String, String> options = new HashMap<>();
+        private final Map<String, Object> additionalProperties = new HashMap<>();
+
+        Map<String, String> getOptions() {
+            return ImmutableMap.copyOf(options);
+        }
+
+        boolean hasOption(String opt) {
+            return options.containsKey(opt);
+        }
+
+        String getOption(String opt) {
+            return options.get(opt);
+        }
+
+        void setOption(String opt, String value) {
+            options.put(opt, value);
+        }
+
+        Map<String, Object> getAdditionalProperties() {
+            return ImmutableMap.copyOf(additionalProperties);
+        }
+
+        void addAdditionalProperties(final Map<String, Object> properties) {
+            additionalProperties.putAll(properties);
+        }
+    }
+
+    private static class ConfigParser {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(config.ConfigParser.class);
+
+        public static Config read(String location) {
+           ObjectMapper mapper = new ObjectMapper();
+
+            Config config = new Config();
+
+            try {
+                JsonNode rootNode = mapper.readTree(new File(location));
+                Iterator<Map.Entry<String, JsonNode>> optionNodes = rootNode.fields();
+
+                while (optionNodes.hasNext()) {
+                    Map.Entry<String, JsonNode> optionNode = optionNodes.next();
+                    if (optionNode.getValue().isValueNode()) {
+                        config.setOption(optionNode.getKey(), optionNode.getValue().asText());
+                    } else if (optionNode.getValue().isObject() && "additionalProperties".equals(optionNode.getKey())) {
+                        Map<String, Object> map = mapper.convertValue(optionNode.getValue(), new TypeReference<Map<String, Object>>() {});
+                        config.addAdditionalProperties(map);
+                    } else {
+                        LOGGER.warn("omitting non-value node " + optionNode.getKey());
+                    }
+                }
+            } catch (Exception e) {
+                LOGGER.error(e.getMessage());
+                return null;
+            }
+
+            return config;
+        }
+    }
 }

.idea/markdown-navigator.xml

@@ -19,3 +19,13 @@ Android Studio 2.2.1以上
 
 ## 関連ページ
 - [Device Connect プラグイン開発マニュアル](https://github.com/DeviceConnect/DeviceConnect-Android/wiki/DevicePlugin-Manual-for-Android-Studio-110)
+
+## テスト
+以下は config オプションのテストです。
+
+testString: {{testString}}
+testInt: {{testInt}}
+testNumber: {{testNumber}}
+testBoolean: {{testBoolean}}
+testObject: {{#testObject}}{{objKey}}{{/testObject}}
+testArray: {{#testArray}}{{.}} {{/testArray}}

.idea/markdown-navigator/profiles_settings.xml

@@ -9,6 +9,9 @@ rm -rf ./output/
 ./good-android-plugin-005-option-names.sh
 ./good-android-plugin-006-option-connection-type.sh
 ./good-android-plugin-007-option-templates.sh
+./good-android-plugin-008-event-without-interval.sh
+./good-android-plugin-009-same-name-object-props.sh
+./good-android-plugin-010-config-additional-properties.sh
 ./good-html-app-001-input-spec.sh
 ./good-html-app-002-option.sh
 ./good-html-docs-001-input-spec.sh

modules/deviceconnect-codegen/src/main/java/org/deviceconnect/codegen/DConnectCodegen.java

@@ -0,0 +1,17 @@
+{
+  "compileSdkVersion": "28",
+  "minSdkVersion": "19",
+  "targetSdkVersion": "28",
+  "deviceConnectPluginSdkVersion": "2.7.2",
+
+  "additionalProperties": {
+    "testString": "testString",
+    "testInt": 1234567890,
+    "testNumber": 1234567890.1234567890,
+    "testBoolean": true,
+    "testObject": {
+      "objKey": "testObjectChild"
+    },
+    "testArray": ["e1", "e2", "e3"]
+  }
+}

samples/templates/deviceConnectAndroidPlugin/README.md.mustache

@@ -0,0 +1,11 @@
+#!/bin/sh -x
+
+java -jar ../../bin/deviceconnect-codegen.jar \
+     --lang                  deviceConnectAndroidPlugin \
+     --template-dir templates/deviceConnectAndroidPlugin \
+     --package-name com.mydomain.testplugin010 \
+     --display-name Test009 \
+     --input-spec        profile-specs/swagger-files-android-plugin-009/ \
+     --output                output/android-plugin-010 \
+     --gradle-plugin-version 3.3.2 \
+     --config configs/android-plugin.json