This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-188
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-188 by this push:
new c7c180f FREEMARKER-188 Cleanup code
c7c180f is described below
commit c7c180fd10e1a66eea8d272f96898dfab659c1cf
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Sat Sep 11 15:42:50 2021 +0200
FREEMARKER-188 Cleanup code
---
freemarker-generator-cli/pom.xml | 6 +++--
.../examples/templates/javafaker/csv/testdata.ftl | 2 +-
.../generator/tools/system/SystemTool.java | 28 +++++++++++++++++++---
.../generator/tools/system/SystemToolTest.java | 8 +++----
4 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/freemarker-generator-cli/pom.xml b/freemarker-generator-cli/pom.xml
index 8ad0df4..72ffafc 100644
--- a/freemarker-generator-cli/pom.xml
+++ b/freemarker-generator-cli/pom.xml
@@ -48,9 +48,11 @@
<repositoryName>lib</repositoryName>
<!--
See
https://ryanharrison.co.uk/2018/04/29/faster-java-startup-time.html
- "-Xverify:none -XX:TieredStopAtLevel=1" improves
startup time by 40%
+ "-Xverify:none -XX:TieredStopAtLevel=1" improves
startup time by 50%
+ See https://www.eclipse.org/openj9/docs/xverify/
+ "-Xverifiy:none" is deprecated in Java 13
-->
- <extraJvmArguments>-Xms64m -Xmx512m -Xverify:none
-XX:TieredStopAtLevel=1</extraJvmArguments>
+ <extraJvmArguments>-Xms64m -Xmx512m
-XX:TieredStopAtLevel=1</extraJvmArguments>
<endorsedDir>endorsed</endorsedDir>
<useWildcardClassPath>true</useWildcardClassPath>
<configurationDirectory>config</configurationDirectory>
diff --git
a/freemarker-generator-cli/src/app/examples/templates/javafaker/csv/testdata.ftl
b/freemarker-generator-cli/src/app/examples/templates/javafaker/csv/testdata.ftl
index 1976644..0c6418e 100644
---
a/freemarker-generator-cli/src/app/examples/templates/javafaker/csv/testdata.ftl
+++
b/freemarker-generator-cli/src/app/examples/templates/javafaker/csv/testdata.ftl
@@ -16,7 +16,7 @@
-->
<#-- Get a localized JavaFaker instance -->
<#assign faker = tools.javafaker.getFaker("de_DE")>
-<#assign nrOfRecords = tools.system.getString("NR_OF_RECORDS","100")>
+<#assign nrOfRecords = tools.system.getProperty("NR_OF_RECORDS","100")>
<#assign days = tools.javafaker.timeUnits["DAYS"]>
<#assign csvTargetFormat =
tools.csv.formats["DEFAULT"].withFirstRecordAsHeader()>
<#assign csvPrinter = tools.csv.printer(csvTargetFormat)>
diff --git
a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/system/SystemTool.java
b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/system/SystemTool.java
index 36a8139..1fac36a 100644
---
a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/system/SystemTool.java
+++
b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/system/SystemTool.java
@@ -95,18 +95,40 @@ public class SystemTool {
return System.getProperties();
}
+ /**
+ * Get the value of a user-supplied parameter.
+ *
+ * @param name name of the parameter
+ * @return value or null
+ */
public String getParameter(String name) {
return parameters.get(name);
}
+ /**
+ * Get the value of a user-supplied parameter.
+ *
+ * @param name name of the parameter
+ * @return value or default value
+ */
public String getParameter(String name, String def) {
return parameters.getOrDefault(name, def);
}
+ /**
+ * Get the map of user-supplied parameters.
+ *
+ * @return map of parameters
+ */
public Map<String, String> getParameters() {
return parameters;
}
+ /**
+ * Get the list of system properties provided by the caller.
+ *
+ * @return list of user-supplied system properties
+ */
public Properties getUserSystemProperties() {
return userSystemProperties;
}
@@ -132,7 +154,7 @@ public class SystemTool {
* @param name name of the configuration parameter
* @return value of null
*/
- public String getString(String name) {
+ public String getProperty(String name) {
return StringUtils.firstNonEmpty(
getParameter(name),
System.getProperty(name),
@@ -148,8 +170,8 @@ public class SystemTool {
* @param def default value
* @return value of null
*/
- public String getString(String name, String def) {
- return StringUtils.firstNonEmpty(getString(name), def);
+ public String getProperty(String name, String def) {
+ return StringUtils.firstNonEmpty(getProperty(name), def);
}
public String getHostName() {
diff --git
a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/system/SystemToolTest.java
b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/system/SystemToolTest.java
index 23d90ee..de55318 100644
---
a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/system/SystemToolTest.java
+++
b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/system/SystemToolTest.java
@@ -36,13 +36,13 @@ public class SystemToolTest {
}
@Test
- public void shouldGetString() {
- assertEquals(USER, systemTool().getString("USER"));
+ public void shouldGetProperty() {
+ assertEquals(USER, systemTool().getProperty("USER"));
}
@Test
- public void shouldGetStringWithDefault() {
- assertEquals("foo", systemTool().getString("_DOES_NOT_EXIST_", "foo"));
+ public void shouldGetPropertyWithDefault() {
+ assertEquals("foo", systemTool().getProperty("_DOES_NOT_EXIST_",
"foo"));
}
@Test
