This commit is contained in:
Shekhar Gulati
2016-08-24 14:26:16 +05:30
parent 2ae1c02b5d
commit 9b60adf732
2 changed files with 48 additions and 12 deletions
+36 -10
View File
@@ -405,9 +405,8 @@ public abstract class Strman {
* @param n Number of chars to return * @param n Number of chars to return
* @return The first n chars * @return The first n chars
*/ */
public static String first(final String value, final int n) { public static Optional<String> first(final String value, final int n) {
validate(value, NULL_STRING_PREDICATE, NULL_STRING_MSG_SUPPLIER); return Optional.ofNullable(value).filter(v -> !v.isEmpty()).map(v -> v.substring(0, n));
return value.substring(0, n);
} }
/** /**
@@ -416,7 +415,7 @@ public abstract class Strman {
* @param value The input String * @param value The input String
* @return The first char * @return The first char
*/ */
public static String head(final String value) { public static Optional<String> head(final String value) {
return first(value, 1); return first(value, 1);
} }
@@ -1049,7 +1048,10 @@ public abstract class Strman {
public static String toStudlyCase(final String value) { public static String toStudlyCase(final String value) {
validate(value, NULL_STRING_PREDICATE, NULL_STRING_MSG_SUPPLIER); validate(value, NULL_STRING_PREDICATE, NULL_STRING_MSG_SUPPLIER);
String[] words = collapseWhitespace(value.trim()).split("\\s*(_|-|\\s)\\s*"); String[] words = collapseWhitespace(value.trim()).split("\\s*(_|-|\\s)\\s*");
return Arrays.stream(words).filter(w -> !w.trim().isEmpty()).map(w -> head(w).toUpperCase() + tail(w)).collect(joining()); return Arrays.stream(words)
.filter(w -> !w.trim().isEmpty())
.map(Strman::upperFirst)
.collect(joining());
} }
/** /**
@@ -1058,9 +1060,8 @@ public abstract class Strman {
* @param value The input String * @param value The input String
* @return String tail * @return String tail
*/ */
public static String tail(final String value) { public static Optional<String> tail(final String value) {
validate(value, NULL_STRING_PREDICATE, NULL_STRING_MSG_SUPPLIER); return Optional.ofNullable(value).filter(v -> !v.isEmpty()).map(v -> last(v, v.length() - 1));
return last(value, value.length() - 1);
} }
/** /**
@@ -1144,7 +1145,11 @@ public abstract class Strman {
if (input.length() == 0) { if (input.length() == 0) {
return ""; return "";
} }
return head(input).toUpperCase() + tail(input).toLowerCase(); return head(input)
.map(String::toUpperCase)
.map(h ->
tail(input).map(t -> h + t.toLowerCase()).orElse(h))
.get();
} }
/** /**
@@ -1161,7 +1166,12 @@ public abstract class Strman {
if (input.length() == 0) { if (input.length() == 0) {
return ""; return "";
} }
return head(input).toLowerCase() + tail(input);
return head(input)
.map(String::toLowerCase)
.map(h ->
tail(input).map(t -> h + t).orElse(h))
.get();
} }
/** /**
@@ -1196,6 +1206,22 @@ public abstract class Strman {
return input.startsWith(leftEncloser) && input.endsWith(rightEncloser); return input.startsWith(leftEncloser) && input.endsWith(rightEncloser);
} }
/**
* Converts the first character of string to upper case.
*
* @param input The string to convert.
* @return Returns the converted string.
*/
public static String upperFirst(String input) {
if (input == null) {
throw new IllegalArgumentException("input can't be null");
}
return head(input)
.map(String::toUpperCase)
.map(h -> tail(input).map(t -> h + t).orElse(h))
.get();
}
private static void validate(String value, Predicate<String> predicate, final Supplier<String> supplier) { private static void validate(String value, Predicate<String> predicate, final Supplier<String> supplier) {
if (predicate.test(value)) { if (predicate.test(value)) {
throw new IllegalArgumentException(supplier.get()); throw new IllegalArgumentException(supplier.get());
+12 -2
View File
@@ -345,7 +345,7 @@ public class StrmanTest {
final String[] fixture = { final String[] fixture = {
"foo", "foobar" "foo", "foobar"
}; };
Arrays.stream(fixture).forEach(el -> assertThat(first(el, 3), equalTo("foo"))); Arrays.stream(fixture).forEach(el -> assertThat(first(el, 3), equalTo(Optional.of("foo"))));
} }
@Test @Test
@@ -354,7 +354,7 @@ public class StrmanTest {
"foo", "foobar" "foo", "foobar"
}; };
Arrays.stream(fixture).forEach(el -> assertThat(head(el), equalTo("f"))); Arrays.stream(fixture).forEach(el -> assertThat(head(el), equalTo(Optional.of("f"))));
} }
@Test @Test
@@ -948,4 +948,14 @@ public class StrmanTest {
final String line = "This is a string, with words!"; final String line = "This is a string, with words!";
assertThat(words(line), is(new String[]{"This", "is", "a", "string", "with", "words"})); assertThat(words(line), is(new String[]{"This", "is", "a", "string", "with", "words"}));
} }
@Test
public void upperFirst_shouldConvertFirstCharToUpperCase() throws Exception {
assertThat(upperFirst("fred"), is("Fred"));
}
@Test
public void upperFirst_shouldReturnSameStringIfFirstCharIsUpperCase() throws Exception {
assertThat(upperFirst("FRED"), is("FRED"));
}
} }