This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c106879 Camel-Package-Maven-Plugin: Fixed CS
c106879 is described below
commit c106879f337386d8704d0fd588935bfc1911d2c0
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 15 12:27:37 2020 +0200
Camel-Package-Maven-Plugin: Fixed CS
---
.../camel/maven/packaging/UpdateReadmeMojo.java | 27 ++++++++++++++++------
.../camel/maven/packaging/EndpointHelperTest.java | 18 +++++++--------
2 files changed, 29 insertions(+), 16 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index 64039cf..f13ea6a 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -21,11 +21,19 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Paths;
import java.util.*;
-import java.util.stream.Stream;
import java.util.regex.Pattern;
+import java.util.stream.Stream;
-import org.apache.camel.tooling.model.*;
+import org.apache.camel.tooling.model.ArtifactModel;
+import org.apache.camel.tooling.model.BaseModel;
+import org.apache.camel.tooling.model.BaseOptionModel;
+import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.DataFormatModel;
+import org.apache.camel.tooling.model.EipModel;
import org.apache.camel.tooling.model.EipModel.EipOptionModel;
+import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.tooling.model.LanguageModel;
+import org.apache.camel.tooling.model.OtherModel;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.maven.plugin.MojoExecutionException;
@@ -85,6 +93,9 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo {
*/
@Parameter
protected Boolean failFast;
+
+ Pattern copyRE = Pattern.compile("(\\[\\[.*)|(= .*)|(//.*)");
+ Pattern attrRE = Pattern.compile(":([a-zA-Z0-9_-]*):( .*)?");
@Override
public void execute(MavenProject project, MavenProjectHelper
projectHelper, BuildContext buildContext) throws MojoFailureException,
MojoExecutionException {
@@ -443,8 +454,6 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
return title;
}
- Pattern copyRE = Pattern.compile("(\\[\\[.*)|(= .*)|(//.*)");
- Pattern attrRE = Pattern.compile(":([a-zA-Z0-9_-]*):( .*)?");
private boolean updateHeader(String name, final File file, final
BaseModel<? extends BaseOptionModel> model, String titleSuffix, String
linkSuffix) throws MojoExecutionException {
getLog().debug("updateHeader " + file);
@@ -483,8 +492,10 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
newLines.add(":description: " + model.getDescription());
newLines.add(":since: " + model.getFirstVersionShort());
//TODO put the deprecation into the actual support level.
- newLines.add(":supportLevel: " +
model.getSupportLevel().toString() + (model.isDeprecated()? "-deprecated": ""));
- if (model.isDeprecated()) newLines.add(":deprecated:
*deprecated*");
+ newLines.add(":supportLevel: " +
model.getSupportLevel().toString() + (model.isDeprecated() ? "-deprecated" :
""));
+ if (model.isDeprecated()) {
+ newLines.add(":deprecated: *deprecated*");
+ }
if (model instanceof ComponentModel) {
newLines.add(":component-header: " +
generateComponentHeader((ComponentModel)model));
if
(Arrays.asList(model.getLabel().split(",")).contains("core")) {
@@ -517,7 +528,9 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
if (updated) {
// build the new updated text
- if (!newLines.get(newLines.size() - 1).isEmpty())
newLines.add("");
+ if (!newLines.get(newLines.size() - 1).isEmpty()) {
+ newLines.add("");
+ }
String newText = String.join("\n", newLines);
PackageHelper.writeText(file, newText);
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
index 134c432..54e5888 100644
---
a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
+++
b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
@@ -73,21 +73,21 @@ public class EndpointHelperTest {
Pattern attrRE = Pattern.compile(":[a-zA-Z0-9_-]*:( .*)?");
String[] lines = {
- "[[any23-dataformat]]",
- "//= Any23 DataFormat",
- "= Any23 DataFormat"
+ "[[any23-dataformat]]",
+ "//= Any23 DataFormat",
+ "= Any23 DataFormat"
};
Stream.of(lines).forEach(line -> {
Matcher copy = copyRE.matcher(line);
assertTrue(copy.matches(), line);
});
String[] attrlines = {
- ":attribute:",
- ":attribute: value",
- ":attri-bute: value",
- ":attri_bute: value",
- ":attribute: value",
- ":attribute: value \\"
+ ":attribute:",
+ ":attribute: value",
+ ":attri-bute: value",
+ ":attri_bute: value",
+ ":attribute: value",
+ ":attribute: value \\"
};
Stream.of(attrlines).forEach(line -> {
Matcher copy = attrRE.matcher(line);
