Skip to content

(chores) make copy/pasted code consistent #15375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orpiske merged 1 commit into from
Aug 30, 2024
Merged

(chores) make copy/pasted code consistent #15375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion core/camel-util/src/main/java/org/apache/camel/util/StringHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,10 @@ public static String capitalize(final String text, boolean dashToCamelCase) {
if (dashToCamelCase) {
ret = dashToCamelCase(text);
}
return doCapitalize(ret);
}

private static String doCapitalize(String ret) {
if (ret == null) {
return null;
}
Expand Down Expand Up @@ -542,7 +546,7 @@ public static String decapitalize(final String text) {
final char[] chars = text.toCharArray();

// We are OK with the limitations of Character.toLowerCase. The symbols and ideographs
// for which it does not return the lower case value should not be used here (this is
// for which it does not return the lower case value should not be used here (this isap
// mostly used to convert part of setters/getters to properties)
chars[0] = Character.toLowerCase(chars[0]);
return new String(chars);
Expand Down
82 changes: 46 additions & 36 deletions tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/Strings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.camel.tooling.util;

import java.util.Collection;
import java.util.Locale;

/**
* Some String helper methods
Expand Down Expand Up @@ -62,11 +61,14 @@ public static String getOrElse(String text, String defaultValue) {
* @return the text after the token, or <tt>null</tt> if text does not contain the token
*/
public static String after(String text, String after) {
int index = text.indexOf(after);
if (index < 0) {
if (text == null) {
return null;
}
int pos = text.indexOf(after);
if (pos == -1) {
return null;
}
return text.substring(index + after.length());
return text.substring(pos + after.length());
}

/**
Expand All @@ -78,11 +80,8 @@ public static String after(String text, String after) {
* @return the text after the token, or default value if text does not contain the token
*/
public static String after(String text, String after, String defaultValue) {
int index = text.indexOf(after);
if (index < 0) {
return defaultValue;
}
return text.substring(index + after.length());
String answer = after(text, after);
return answer != null ? answer : defaultValue;
}

/**
Expand Down Expand Up @@ -162,11 +161,11 @@ public static String asTitle(String name) {
}

public static String before(String text, String before) {
int index = text.indexOf(before);
if (index < 0) {
if (text == null) {
return null;
}
return text.substring(0, index);
int pos = text.indexOf(before);
return pos == -1 ? null : text.substring(0, pos);
}

public static String indentCollection(String indent, Collection<String> list) {
Expand Down Expand Up @@ -216,37 +215,46 @@ public static String camelCaseToDash(String text) {
if (text == null || text.isEmpty()) {
return text;
}
StringBuilder answer = new StringBuilder();
char prev = 0;

Character prev = null;
Character next = null;
char[] arr = text.toCharArray();
StringBuilder answer = new StringBuilder(arr.length < 13 ? 16 : arr.length + 8);

for (int i = 0; i < arr.length; i++) {
char ch = arr[i];
if (i < arr.length - 1) {
next = arr[i + 1];
} else {
next = null;
}

if (ch == '-' || ch == '_') {
answer.append("-");
} else if (Character.isUpperCase(ch) && prev != null && !Character.isUpperCase(prev)) {
if (prev != '-' && prev != '_') {
answer.append("-");
}
answer.append(ch);
} else if (Character.isUpperCase(ch) && prev != null && next != null && Character.isLowerCase(next)) {
if (prev != '-' && prev != '_') {
answer.append("-");
}
answer.append(ch);
} else {
answer.append(ch);
if (Character.isUpperCase(ch) && prev != 0) {
char next;

if (i < arr.length - 1) {
next = arr[i + 1];
} else {
next = 0;
}

if (!Character.isUpperCase(prev) || next != 0 && Character.isLowerCase(next)) {
applyDashPrefix(prev, answer, ch);
} else {
answer.append(Character.toLowerCase(ch));
}
} else {
answer.append(Character.toLowerCase(ch));
}
}
prev = ch;
}

return answer.toString().toLowerCase(Locale.ENGLISH);
return answer.toString();
}

private static void applyDashPrefix(char prev, StringBuilder answer, char ch) {
if (prev != '-' && prev != '_') {
answer.append("-");
}
answer.append(Character.toLowerCase(ch));
}

/**
Expand All @@ -256,13 +264,15 @@ public static String camelCaseToDash(String text) {
* @return the string capitalized (upper case first character) or null if the input is null
*/
public static String capitalize(final String text) {
if (text == null) {
return doCapitalize(text);
}

private static String doCapitalize(String ret) {
if (ret == null) {
return null;
}

int length = text.length();
final char[] chars = new char[length];
text.getChars(0, length, chars, 0);
final char[] chars = ret.toCharArray();

// We are OK with the limitations of Character.toUpperCase. The symbols and ideographs
// for which it does not return the capitalized value should not be used here (this is
Expand Down