This is an automated email from the ASF dual-hosted git repository.
sgoeschl pushed a commit to branch FREEMARKER-172
in repository https://gitbox.apache.org/repos/asf/freemarker-generator.git
The following commit(s) were added to refs/heads/FREEMARKER-172 by this push:
new 3ba3ba4 FREEMARKER-172 [freemarker-generator] Start with refactoring
3ba3ba4 is described below
commit 3ba3ba4e253a232000e742a8ded6a6bf4b12af08
Author: Siegfried Goeschl <[email protected]>
AuthorDate: Thu Feb 4 00:07:59 2021 +0100
FREEMARKER-172 [freemarker-generator] Start with refactoring
---
.../org/apache/freemarker/generator/base/datasource/DataSource.java | 1 -
.../apache/freemarker/generator/base/datasource/DataSourceFactory.java | 1 -
.../apache/freemarker/generator/base/datasource/DataSourceLoader.java | 1 -
.../freemarker/generator/base/datasource/DataSourceLoaderFactory.java | 1 -
.../generator/base/template/TemplateTransformationsBuilder.java | 1 -
.../java/org/apache/freemarker/generator/base/tools/ToolsFactory.java | 1 -
.../main/java/org/apache/freemarker/generator/base/uri/NamedUri.java | 1 -
.../main/java/org/apache/freemarker/generator/base/util/ListUtils.java | 1 -
.../main/java/org/apache/freemarker/generator/base/util/MapBuilder.java | 1 -
.../apache/freemarker/generator/base/util/PropertiesTransformer.java | 1 -
.../main/java/org/apache/freemarker/generator/base/util/UriUtils.java | 1 -
.../apache/freemarker/generator/datasource/DataSourceFactoryTest.java | 1 -
.../apache/freemarker/generator/datasource/DataSourceLoaderTest.java | 1 -
.../java/org/apache/freemarker/generator/datasource/DataSourceTest.java | 2 --
.../apache/freemarker/generator/datasource/DataSourcesSupplierTest.java | 1 -
.../org/apache/freemarker/generator/datasource/DataSourcesTest.java | 1 -
.../org/apache/freemarker/generator/file/RecursiveFileSupplierTest.java | 1 -
.../org/apache/freemarker/generator/uri/NamedUriStringParserTest.java | 1 -
.../org/apache/freemarker/generator/cli/config/DataModelSupplier.java | 1 -
.../apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java | 1 -
20 files changed, 21 deletions(-)
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSource.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSource.java
index d01df00..522f0f1 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSource.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSource.java
@@ -390,5 +390,4 @@ public class DataSource implements Closeable,
javax.activation.DataSource {
private boolean isByteArrayDataSource() {
return dataSource instanceof ByteArrayDataSource;
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceFactory.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceFactory.java
index d98b60c..c9467a8 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceFactory.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceFactory.java
@@ -151,5 +151,4 @@ public abstract class DataSourceFactory {
throw new IllegalArgumentException(url, e);
}
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoader.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoader.java
index ec7e70a..423b648 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoader.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoader.java
@@ -44,5 +44,4 @@ public interface DataSourceLoader {
* @return DataSource
*/
DataSource load(String source, Charset charset);
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoaderFactory.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoaderFactory.java
index 8b18c84..b7c4a3e 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoaderFactory.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/datasource/DataSourceLoaderFactory.java
@@ -41,5 +41,4 @@ public abstract class DataSourceLoaderFactory {
}
return dataSourceLoader;
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
index c8541d8..c9b0814 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/template/TemplateTransformationsBuilder.java
@@ -304,5 +304,4 @@ public class TemplateTransformationsBuilder {
// avoid closing System.out after rendering the template
return new BufferedWriter(new NonClosableWriterWrapper(new
OutputStreamWriter(System.out, outputEncoding)));
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/tools/ToolsFactory.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/tools/ToolsFactory.java
index ca65533..607a165 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/tools/ToolsFactory.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/tools/ToolsFactory.java
@@ -96,5 +96,4 @@ public class ToolsFactory {
// Fall back to the defining class loader of the FreeMarker classes
return Class.forName(className);
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
index 12445b6..6003d3c 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/uri/NamedUri.java
@@ -132,5 +132,4 @@ public class NamedUri {
", parameters=" + parameters +
'}';
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/ListUtils.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/ListUtils.java
index 5ea20b4..4ec6fbc 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/ListUtils.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/ListUtils.java
@@ -63,5 +63,4 @@ public class ListUtils {
.findFirst()
.orElse(null);
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
index 67bcef3..574ddb0 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/MapBuilder.java
@@ -52,5 +52,4 @@ public class MapBuilder {
return map;
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/PropertiesTransformer.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/PropertiesTransformer.java
index aa5210e..90b2f6a 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/PropertiesTransformer.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/PropertiesTransformer.java
@@ -51,5 +51,4 @@ public class PropertiesTransformer {
properties.forEach((key, value) ->
result.put(key.toString().substring(prefix.length()), value));
return result;
}
-
}
diff --git
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java
index c80e36f..74d620c 100644
---
a/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java
+++
b/freemarker-generator-base/src/main/java/org/apache/freemarker/generator/base/util/UriUtils.java
@@ -58,5 +58,4 @@ public class UriUtils {
}
return "env".equalsIgnoreCase(uri.getScheme());
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
index 0cec87f..37d1f92 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceFactoryTest.java
@@ -116,5 +116,4 @@ public class DataSourceFactoryTest {
assertEquals("env:///", dataSource.getUri().toString());
assertEquals("text/plain", dataSource.getContentType());
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceLoaderTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceLoaderTest.java
index 729004c..1567699 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceLoaderTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceLoaderTest.java
@@ -184,5 +184,4 @@ public class DataSourceLoaderTest {
private DataSourceLoader dataSourceLoader() {
return DataSourceLoaderFactory.create();
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
index 09f860b..e27beb3 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourceTest.java
@@ -159,7 +159,5 @@ public class DataSourceTest {
public boolean isClosed() {
return closed;
}
-
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesSupplierTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesSupplierTest.java
index 70279fc..779485c 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesSupplierTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesSupplierTest.java
@@ -142,5 +142,4 @@ public class DataSourcesSupplierTest {
private static DataSourcesSupplier supplier(List<String> files, String
include, String exclude) {
return new DataSourcesSupplier(files, include, exclude,
Charset.defaultCharset());
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesTest.java
index 2d6154e..60ba5e9 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/datasource/DataSourcesTest.java
@@ -142,5 +142,4 @@ public class DataSourcesTest {
throw new RuntimeException("Failed to create URL:" + value, e);
}
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/file/RecursiveFileSupplierTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/file/RecursiveFileSupplierTest.java
index 5cc871b..6fbb177 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/file/RecursiveFileSupplierTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/file/RecursiveFileSupplierTest.java
@@ -107,5 +107,4 @@ public class RecursiveFileSupplierTest {
private static RecursiveFileSupplier fileSupplier(List<String> sources,
String include, String exclude) {
return new RecursiveFileSupplier(sources, singletonList(include),
singletonList(exclude));
}
-
}
diff --git
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/uri/NamedUriStringParserTest.java
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/uri/NamedUriStringParserTest.java
index c114525..ebcb84e 100644
---
a/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/uri/NamedUriStringParserTest.java
+++
b/freemarker-generator-base/src/test/java/org/apache/freemarker/generator/uri/NamedUriStringParserTest.java
@@ -262,5 +262,4 @@ public class NamedUriStringParserTest {
private static NamedUri parse(String value) {
return NamedUriStringParser.parse(value);
}
-
}
diff --git
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java
index 8b134b7..0684dc6 100644
---
a/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java
+++
b/freemarker-generator-cli/src/main/java/org/apache/freemarker/generator/cli/config/DataModelSupplier.java
@@ -143,5 +143,4 @@ public class DataModelSupplier implements
Supplier<Map<String, Object>> {
return result;
}
-
}
diff --git
a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
index 0623efc..e71e25c 100644
---
a/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
+++
b/freemarker-generator-tools/src/test/java/org/apache/freemarker/generator/tools/dataframe/DataFrameToolTest.java
@@ -155,5 +155,4 @@ public class DataFrameToolTest {
private static DataSourceLoader dataSourceLoader() {
return DataSourceLoaderFactory.create();
}
-
}
