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 07e3d5b FREEMARKER-188 Cleanup code
07e3d5b is described below
commit 07e3d5b2ed3a5e3bfbe79c8c4830620e4defbfbe
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Wed Sep 8 22:06:44 2021 +0200
FREEMARKER-188 Cleanup code
---
.../generator/base/file/RecursiveFileSupplier.java | 24 +++++++++++++---------
.../freemarker/generator/cli/config/Settings.java | 11 +++++-----
.../output/DataSourceSeedingOutputMapper.java | 2 +-
.../tools/dataframe/impl/CSVConverter.java | 2 +-
4 files changed, 21 insertions(+), 18 deletions(-)
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
index bc89df3..fb4b9b7 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/file/RecursiveFileSupplier.java
@@ -16,11 +16,14 @@
*/
package org.apache.freemarker.generator.base.file;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.AndFileFilter;
+import org.apache.commons.io.filefilter.HiddenFileFilter;
import org.apache.commons.io.filefilter.IOFileFilter;
import org.apache.commons.io.filefilter.NotFileFilter;
import org.apache.commons.io.filefilter.OrFileFilter;
import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.freemarker.generator.base.util.StringUtils;
import java.io.File;
import java.util.ArrayList;
@@ -32,10 +35,6 @@ import java.util.function.Supplier;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static java.util.stream.Collectors.toList;
-import static org.apache.commons.io.FileUtils.listFiles;
-import static org.apache.commons.io.filefilter.HiddenFileFilter.HIDDEN;
-import static org.apache.commons.io.filefilter.HiddenFileFilter.VISIBLE;
-import static org.apache.freemarker.generator.base.util.StringUtils.isEmpty;
/**
* Resolve a list of files or directories recursively.
@@ -94,7 +93,7 @@ public class RecursiveFileSupplier implements
Supplier<List<File>> {
}
private List<File> resolveDirectory(File directory) {
- return new ArrayList<>(listFiles(directory, fileFilter,
directoryFilter));
+ return new ArrayList<>(FileUtils.listFiles(directory, fileFilter,
directoryFilter));
}
private static IOFileFilter fileFilter(Collection<String> includes,
Collection<String> excludes) {
@@ -113,7 +112,10 @@ public class RecursiveFileSupplier implements
Supplier<List<File>> {
}
private static IOFileFilter includeFilter(String include) {
- return isEmpty(include) ? VISIBLE : new AndFileFilter(new
WildcardFileFilter(include), VISIBLE);
+ return StringUtils.isEmpty(include) ?
+ HiddenFileFilter.VISIBLE :
+ new AndFileFilter(
+ new WildcardFileFilter(include),
HiddenFileFilter.VISIBLE);
}
private static List<IOFileFilter> excludeFilters(Collection<String>
excludes) {
@@ -125,12 +127,14 @@ public class RecursiveFileSupplier implements
Supplier<List<File>> {
}
private static IOFileFilter excludeFilter(String exclude) {
- return isEmpty(exclude) ?
- VISIBLE :
- new NotFileFilter(new OrFileFilter(new
WildcardFileFilter(exclude), HIDDEN));
+ return StringUtils.isEmpty(exclude) ?
+ HiddenFileFilter.VISIBLE :
+ new NotFileFilter(
+ new OrFileFilter(
+ new WildcardFileFilter(exclude),
HiddenFileFilter.HIDDEN));
}
private static IOFileFilter directoryFilter() {
- return VISIBLE;
+ return HiddenFileFilter.VISIBLE;
}
}
diff --git
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
index c45a479..ae530f1 100644
---
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
+++
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/Settings.java
@@ -16,6 +16,7 @@
*/
package org.apache.freemarker.generator.cli.config;
+import org.apache.freemarker.generator.base.FreeMarkerConstants;
import org.apache.freemarker.generator.base.FreeMarkerConstants.Model;
import org.apache.freemarker.generator.base.util.LocaleUtils;
import org.apache.freemarker.generator.base.util.NonClosableWriterWrapper;
@@ -36,8 +37,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Collections.emptyList;
import static java.util.Objects.requireNonNull;
import static
org.apache.freemarker.generator.base.FreeMarkerConstants.Configuration.LOCALE_KEY;
-import static
org.apache.freemarker.generator.base.FreeMarkerConstants.DEFAULT_CHARSET;
-import static
org.apache.freemarker.generator.base.FreeMarkerConstants.DEFAULT_LOCALE;
/**
* Capture all the settings required for rendering a FreeMarker template.
@@ -275,11 +274,11 @@ public class Settings {
this.sourceIncludePattern = null;
this.sourceExcludePattern = null;
this.configuration = new Properties();
- this.locale = DEFAULT_LOCALE.toString();
+ this.locale = FreeMarkerConstants.DEFAULT_LOCALE.toString();
this.parameters = new HashMap<>();
this.systemProperties = new Properties();
- this.setInputEncoding(DEFAULT_CHARSET.name());
- this.setOutputEncoding(DEFAULT_CHARSET.name());
+ this.setInputEncoding(FreeMarkerConstants.DEFAULT_CHARSET.name());
+ this.setOutputEncoding(FreeMarkerConstants.DEFAULT_CHARSET.name());
}
public SettingsBuilder setCommandLineArgs(String[] args) {
@@ -406,7 +405,7 @@ public class Settings {
private String getDefaultLocale() {
return configuration.getProperty(
LOCALE_KEY,
- System.getProperty(LOCALE_KEY, DEFAULT_LOCALE.toString()));
+ System.getProperty(LOCALE_KEY,
FreeMarkerConstants.DEFAULT_LOCALE.toString()));
}
}
}
diff --git
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputMapper.java
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputMapper.java
index d5d7568..6cf7915 100644
---
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputMapper.java
+++
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/output/DataSourceSeedingOutputMapper.java
@@ -17,7 +17,7 @@ public class DataSourceSeedingOutputMapper {
final String relativeFilePath = dataSource.getRelativeFilePath();
final String fileName = expand(template, dataSource);
- return (StringUtils.isEmpty(relativeFilePath)) ?
+ return StringUtils.isEmpty(relativeFilePath) ?
new File(outputDirectory, fileName) :
new File(new File(outputDirectory, relativeFilePath),
fileName);
}
diff --git
a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/dataframe/impl/CSVConverter.java
b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/dataframe/impl/CSVConverter.java
index 5745c35..30c1938 100644
---
a/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/dataframe/impl/CSVConverter.java
+++
b/freemarker-generator-tools/src/main/java/org/apache/freemarker/generator/tools/dataframe/impl/CSVConverter.java
@@ -40,7 +40,7 @@ public class CSVConverter {
final CSVRecord firstRecord = records.get(0);
// build dataframe with headers
- if (headerNames != null && !headerNames.isEmpty()) {
+ if (!headerNames.isEmpty()) {
headerNames.forEach(builder::addStringColumn);
} else {
for (int i = 0; i < firstRecord.size(); i++) {
