This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch strings in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 1ddfe58f1732f4e472f2ee36c075208a9400ee20 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu Apr 30 11:28:18 2020 +0200 Camel-kafka-generator-maven-plugin: Use the Strings class from tooling-model directly --- .../maven/dto/CamelKafkaConnectorOptionModel.java | 107 +-------------------- 1 file changed, 3 insertions(+), 104 deletions(-) diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java index 36cee65..069ad66 100644 --- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java +++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/dto/CamelKafkaConnectorOptionModel.java @@ -16,6 +16,8 @@ */ package org.apache.camel.kafkaconnector.maven.dto; +import org.apache.camel.tooling.model.Strings; + public class CamelKafkaConnectorOptionModel { private String description; @@ -56,111 +58,8 @@ public class CamelKafkaConnectorOptionModel { } public String getShortName(int watermark) { - String text = wrapCamelCaseWords(name, watermark, " "); + String text = Strings.wrapCamelCaseWords(name, watermark, " "); // ensure the option name starts with lower-case return Character.toLowerCase(text.charAt(0)) + text.substring(1); } - - public static String wrapCamelCaseWords(String option, int watermark, String lineSep) { - String text = option.replaceAll("(?=[A-Z][a-z])", " "); - text = wrapWords(text, "", lineSep, watermark, false); - return Character.toUpperCase(text.charAt(0)) + text.substring(1); - } - - /** - * To wrap a big line by words. - * @param line the big line - * @param wordSep the word separator - * @param lineSep 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 wordSep, String lineSep, int watermark, boolean wrapLongWords) { - if (line == null) { - return null; - } else { - if (lineSep == null) { - lineSep = System.lineSeparator(); - } - if (wordSep == null) { - wordSep = ""; - } - - if (watermark < 1) { - watermark = 1; - } - - int inputLineLength = line.length(); - int offset = 0; - StringBuilder sb = new StringBuilder(inputLineLength + 32); - int currentLength = 0; - while (offset < inputLineLength) { - if (line.charAt(offset) == ' ') { - offset++; - continue; - } - int next = line.indexOf(' ', offset); - if (next < 0) { - next = inputLineLength; - if (wrapLongWords && inputLineLength - offset > watermark) { - if (currentLength > 0) { - sb.append(wordSep); - currentLength += wordSep.length(); - } - sb.append(line, offset, watermark - currentLength); - sb.append(lineSep); - offset += watermark - currentLength; - } - } - if (currentLength + (currentLength > 0 ? wordSep.length() : 0) + next - offset <= watermark) { - if (currentLength > 0) { - sb.append(wordSep); - currentLength += wordSep.length(); - } - sb.append(line, offset, next); - currentLength += next - offset; - offset = next + 1; - } else { - sb.append(lineSep); - sb.append(line, offset, next); - currentLength = next - offset; - offset = next + 1; - } - } - /* - while (inputLineLength - offset > watermark) { - if (line.charAt(offset) == ' ') { - ++offset; - } else { - int spaceToWrapAt = line.lastIndexOf(' ', watermark + offset); - int spaces = 0; - for (int i = offset; i < spaceToWrapAt; i++) { - spaces += line.charAt(i) == ' ' ? 1 : 0; - } - if (spaceToWrapAt >= offset) { - sb.append(line, offset, spaceToWrapAt); - sb.append(newLine); - offset = spaceToWrapAt + 1; - } else if (wrapLongWords) { - sb.append(line, offset, watermark + offset); - sb.append(newLine); - offset += watermark; - } else { - spaceToWrapAt = line.indexOf(' ', watermark + offset); - if (spaceToWrapAt >= 0) { - sb.append(line, offset, spaceToWrapAt); - sb.append(newLine); - offset = spaceToWrapAt + 1; - } else { - sb.append(line, offset, line.length()); - offset = inputLineLength; - } - } - } - } - sb.append(line, offset, line.length()); - */ - return sb.toString(); - } - } }