You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/10/09 07:37:59 UTC
[camel-quarkus] 02/03: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch extlist
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 02ae983e55e7a9037f1ef686435ead2492f1b72e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Oct 9 09:27:47 2019 +0200
Polished
---
.../apache/camel/quarkus/maven/PackageHelper.java | 29 -----
.../quarkus/maven/PrepareCatalogQuarkusMojo.java | 2 +-
.../apache/camel/quarkus/maven/StringHelper.java | 144 ++++-----------------
3 files changed, 23 insertions(+), 152 deletions(-)
diff --git a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PackageHelper.java b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PackageHelper.java
index 65b4355..15f4e9f 100644
--- a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PackageHelper.java
+++ b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PackageHelper.java
@@ -58,35 +58,6 @@ public final class PackageHelper {
}
}
- /**
- * Converts the value to use title style instead of dash cased
- */
- public static String camelDashToTitle(String value) {
- StringBuilder sb = new StringBuilder(value.length());
- boolean dash = false;
-
- for (char c : value.toCharArray()) {
- if ('-' == c) {
- dash = true;
- continue;
- }
-
- if (dash) {
- sb.append(' ');
- sb.append(Character.toUpperCase(c));
- } else {
- // upper case first
- if (sb.length() == 0) {
- sb.append(Character.toUpperCase(c));
- } else {
- sb.append(c);
- }
- }
- dash = false;
- }
- return sb.toString();
- }
-
public static void writeText(File file, String text) throws IOException {
FileOutputStream fos = new FileOutputStream(file, false);
try {
diff --git a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
index 906d72b..ba86dea 100644
--- a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
+++ b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/PrepareCatalogQuarkusMojo.java
@@ -50,9 +50,9 @@ import org.apache.maven.project.ProjectBuildingResult;
import org.apache.maven.repository.RepositorySystem;
import org.mvel2.templates.TemplateRuntime;
-import static org.apache.camel.quarkus.maven.PackageHelper.camelDashToTitle;
import static org.apache.camel.quarkus.maven.PackageHelper.loadText;
import static org.apache.camel.quarkus.maven.PackageHelper.writeText;
+import static org.apache.camel.quarkus.maven.StringHelper.camelDashToTitle;
/**
* Prepares the Quarkus provider camel catalog to include component it supports
diff --git a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/StringHelper.java b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/StringHelper.java
index 02274bf..bcc16a7 100644
--- a/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/StringHelper.java
+++ b/tooling/maven/package-maven-plugin/src/main/java/org/apache/camel/quarkus/maven/StringHelper.java
@@ -16,20 +16,12 @@
*/
package org.apache.camel.quarkus.maven;
-import java.util.Collection;
-
-import com.google.common.base.CaseFormat;
-
public final class StringHelper {
private StringHelper() {
// Utils Class
}
- public static boolean isEmpty(String s) {
- return s == null || s.trim().isEmpty();
- }
-
public static String after(String text, String after) {
if (!text.contains(after)) {
return null;
@@ -52,12 +44,29 @@ public final class StringHelper {
return before(text, before);
}
- public static String indentCollection(String indent, Collection<String> list) {
- StringBuilder sb = new StringBuilder();
- for (String text : list) {
- sb.append(indent).append(text);
+ public static String cutLastZeroDigit(String version) {
+ String answer = version;
+ // cut last digit so its not 2.18.0 but 2.18
+ String[] parts = version.split("\\.");
+ if (parts.length == 3 && parts[2].equals("0")) {
+ answer = parts[0] + "." + parts[1];
}
- return sb.toString();
+ return answer;
+ }
+
+ /**
+ * Returns the base class name, i.e. without package and generic related
+ * information.
+ *
+ * @param className The class name which base class is to be computed.
+ * @return the base class name, i.e. without package and generic related
+ * information.
+ */
+ public static String getClassShortName(String className) {
+ if (className != null) {
+ return className.replaceAll("<.*>", "").replaceAll(".*[.]([^.]+)", "$1");
+ }
+ return className;
}
/**
@@ -88,113 +97,4 @@ public final class StringHelper {
}
return sb.toString();
}
-
- public static String cutLastZeroDigit(String version) {
- String answer = version;
- // cut last digit so its not 2.18.0 but 2.18
- String[] parts = version.split("\\.");
- if (parts.length == 3 && parts[2].equals("0")) {
- answer = parts[0] + "." + parts[1];
- }
- return answer;
- }
-
- /**
- * To wrap long camel cased texts by words.
- *
- * @param option the option which is camel cased.
- * @param watermark a watermark to denote the size to cut after
- * @param newLine the new line to use when breaking into a new line
- */
- public static String wrapCamelCaseWords(String option, int watermark, String newLine) {
- String text = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, option);
- text = text.replace('-', ' ');
- text = wrapWords(text, "\n", watermark, false);
- text = text.replace(' ', '-');
- text = CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, text);
-
- // upper case first char on each line
- String[] lines = text.split("\n");
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < lines.length; i++) {
- String line = lines[i];
- line = Character.toUpperCase(line.charAt(0)) + line.substring(1);
- sb.append(line);
- if (i < lines.length - 1) {
- sb.append(newLine);
- }
- }
- return sb.toString();
- }
-
- /**
- * To wrap a big line by words.
- *
- * @param line the big line
- * @param newLine the new line to use when breaking into a new line
- * @param watermark a watermark to denote the size to cut after
- * @param wrapLongWords whether to wrap long words
- */
- public static String wrapWords(String line, String newLine, int watermark, boolean wrapLongWords) {
- if (line == null) {
- return null;
- } else {
- if (newLine == null) {
- newLine = System.lineSeparator();
- }
-
- if (watermark < 1) {
- watermark = 1;
- }
-
- int inputLineLength = line.length();
- int offset = 0;
- StringBuilder sb = new StringBuilder(inputLineLength + 32);
-
- while (inputLineLength - offset > watermark) {
- if (line.charAt(offset) == 32) {
- ++offset;
- } else {
- int spaceToWrapAt = line.lastIndexOf(32, watermark + offset);
- if (spaceToWrapAt >= offset) {
- sb.append(line.substring(offset, spaceToWrapAt));
- sb.append(newLine);
- offset = spaceToWrapAt + 1;
- } else if (wrapLongWords) {
- sb.append(line.substring(offset, watermark + offset));
- sb.append(newLine);
- offset += watermark;
- } else {
- spaceToWrapAt = line.indexOf(32, watermark + offset);
- if (spaceToWrapAt >= 0) {
- sb.append(line.substring(offset, spaceToWrapAt));
- sb.append(newLine);
- offset = spaceToWrapAt + 1;
- } else {
- sb.append(line.substring(offset));
- offset = inputLineLength;
- }
- }
- }
- }
-
- sb.append(line.substring(offset));
- return sb.toString();
- }
- }
-
- /**
- * Returns the base class name, i.e. without package and generic related
- * information.
- *
- * @param className The class name which base class is to be computed.
- * @return the base class name, i.e. without package and generic related
- * information.
- */
- public static String getClassShortName(String className) {
- if (className != null) {
- return className.replaceAll("<.*>", "").replaceAll(".*[.]([^.]+)", "$1");
- }
- return className;
- }
}