This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 946936626bc37bfff5f3f948b019d99e4ee31934
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Feb 16 14:05:28 2022 +0100
(chores) camel-package-maven-plugin: replace read logic
Replace builtin read stream logic with builtin one from newer Java versions
---
.../apache/camel/tooling/util/PackageHelper.java | 24 +---------------------
.../camel/maven/packaging/ComponentDslMojo.java | 3 ++-
.../camel/maven/packaging/EndpointDslMojo.java | 4 +++-
.../packaging/generics/PackagePluginUtils.java | 8 ++++++++
4 files changed, 14 insertions(+), 25 deletions(-)
diff --git
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
index 1c7cf6f..2f7fc16 100644
---
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
+++
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/PackageHelper.java
@@ -16,12 +16,9 @@
*/
package org.apache.camel.tooling.util;
-import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
@@ -42,29 +39,10 @@ public final class PackageHelper {
/**
* Loads the entire stream into memory as a String and returns it.
* <p/>
- * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line
terminator at the of the text.
- * <p/>
* Warning, don't use for crazy big streams :)
*/
public static String loadText(InputStream in) throws IOException {
- StringBuilder builder = new StringBuilder();
- InputStreamReader isr = new InputStreamReader(in);
- try {
- BufferedReader reader = new LineNumberReader(isr);
- while (true) {
- String line = reader.readLine();
- if (line != null) {
- builder.append(line);
- builder.append("\n");
- } else {
- break;
- }
- }
- return builder.toString();
- } finally {
- isr.close();
- in.close();
- }
+ return new String(in.readAllBytes());
}
public static String loadText(File file) throws IOException {
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 0d56017..25bcdc2e 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -41,6 +41,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.sonatype.plexus.build.incremental.BuildContext;
+import static
org.apache.camel.maven.packaging.generics.PackagePluginUtils.joinHeaderAndSource;
import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
import static org.apache.camel.tooling.util.PackageHelper.loadText;
@@ -224,7 +225,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo
{
Path target = outputDir.toPath().resolve(filePath).resolve(fileName);
try {
- String code = licenseHeader + source;
+ final String code = joinHeaderAndSource(licenseHeader, source);
if (getLog().isDebugEnabled()) {
getLog().debug("Source code generated:\n" + code);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 822570a..8bd0943 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -58,6 +58,7 @@ import org.jboss.forge.roaster.model.source.MethodSource;
import org.jboss.forge.roaster.model.source.ParameterSource;
import org.sonatype.plexus.build.incremental.BuildContext;
+import static
org.apache.camel.maven.packaging.generics.PackagePluginUtils.joinHeaderAndSource;
import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
import static org.apache.camel.tooling.util.PackageHelper.loadText;
@@ -1006,7 +1007,8 @@ public class EndpointDslMojo extends
AbstractGeneratorMojo {
private boolean writeSourceIfChanged(String source, String filePath,
String fileName) throws MojoFailureException {
try {
- String code = licenseHeader + source;
+ final String code = joinHeaderAndSource(licenseHeader, source);
+
if (getLog().isDebugEnabled()) {
getLog().debug("Source code generated:\n" + code);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
index d9606b4..e461209 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/PackagePluginUtils.java
@@ -43,4 +43,12 @@ public final class PackagePluginUtils {
return index;
}
+ public static String joinHeaderAndSource(String licenseHeader, String
source) {
+ StringBuilder sb = new StringBuilder(licenseHeader);
+
+ sb.append("\n");
+ sb.append(source);
+ return sb.toString();
+ }
+
}
