Skip to content

Add Micrometer's Lower Dot Notation to CaseFormat #3959

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Micrometer's Lower Dot Notation to CaseFormat #3959

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
8 changes: 8 additions & 0 deletions android/guava/src/com/google/common/base/CaseFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ String convert(CaseFormat format, String s) {
}
return super.convert(format, s);
}
},

/** Java properties naming convention, e.g., "lower.dot". */
LOWER_DOT(CharMatcher.is('.'), ".") {
@Override
String normalizeWord(String word) {
return Ascii.toLowerCase(word);
}
};

private final CharMatcher wordBoundary;
Expand Down
57 changes: 57 additions & 0 deletions guava-tests/test/com/google/common/base/CaseFormatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import static com.google.common.base.CaseFormat.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.LOWER_HYPHEN;
import static com.google.common.base.CaseFormat.LOWER_UNDERSCORE;
import static com.google.common.base.CaseFormat.LOWER_DOT;
import static com.google.common.base.CaseFormat.UPPER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;

Expand Down Expand Up @@ -80,6 +81,11 @@ public void testLowerHyphenToUpperUnderscore() {
assertEquals("FOO_BAR", LOWER_HYPHEN.to(UPPER_UNDERSCORE, "foo-bar"));
}

public void testLowerHyphenToLowerDot() {
assertEquals("foo", LOWER_HYPHEN.to(LOWER_DOT, "foo"));
assertEquals("foo.bar", LOWER_HYPHEN.to(LOWER_DOT, "foo-bar"));
}

public void testLowerUnderscoreToLowerHyphen() {
assertEquals("foo", LOWER_UNDERSCORE.to(LOWER_HYPHEN, "foo"));
assertEquals("foo-bar", LOWER_UNDERSCORE.to(LOWER_HYPHEN, "foo_bar"));
Expand All @@ -105,6 +111,11 @@ public void testLowerUnderscoreToUpperUnderscore() {
assertEquals("FOO_BAR", LOWER_UNDERSCORE.to(UPPER_UNDERSCORE, "foo_bar"));
}

public void testLowerUnderscoreToLowerDot() {
assertEquals("foo", LOWER_UNDERSCORE.to(LOWER_DOT, "foo"));
assertEquals("foo.bar", LOWER_UNDERSCORE.to(LOWER_DOT, "foo_bar"));
}

public void testLowerCamelToLowerHyphen() {
assertEquals("foo", LOWER_CAMEL.to(LOWER_HYPHEN, "foo"));
assertEquals("foo-bar", LOWER_CAMEL.to(LOWER_HYPHEN, "fooBar"));
Expand Down Expand Up @@ -133,6 +144,11 @@ public void testLowerCamelToUpperUnderscore() {
assertEquals("FOO_BAR", LOWER_CAMEL.to(UPPER_UNDERSCORE, "fooBar"));
}

public void testLowerCamelToLowerDot() {
assertEquals("foo", LOWER_CAMEL.to(LOWER_DOT, "foo"));
assertEquals("foo.bar", LOWER_CAMEL.to(LOWER_DOT, "fooBar"));
}

public void testUpperCamelToLowerHyphen() {
assertEquals("foo", UPPER_CAMEL.to(LOWER_HYPHEN, "Foo"));
assertEquals("foo-bar", UPPER_CAMEL.to(LOWER_HYPHEN, "FooBar"));
Expand Down Expand Up @@ -161,6 +177,12 @@ public void testUpperCamelToUpperUnderscore() {
assertEquals("H__T__T__P", UPPER_CAMEL.to(UPPER_UNDERSCORE, "H_T_T_P"));
}

public void testUpperCamelToLowerDot() {
assertEquals("foo", UPPER_CAMEL.to(LOWER_DOT, "Foo"));
assertEquals("foo.bar", UPPER_CAMEL.to(LOWER_DOT, "FooBar"));
assertEquals("h.t.t.p", UPPER_CAMEL.to(LOWER_DOT, "HTTP"));
}

public void testUpperUnderscoreToLowerHyphen() {
assertEquals("foo", UPPER_UNDERSCORE.to(LOWER_HYPHEN, "FOO"));
assertEquals("foo-bar", UPPER_UNDERSCORE.to(LOWER_HYPHEN, "FOO_BAR"));
Expand All @@ -187,6 +209,41 @@ public void testUpperUnderscoreToUpperUnderscore() {
assertEquals("FOO_BAR", UPPER_UNDERSCORE.to(UPPER_UNDERSCORE, "FOO_BAR"));
}

public void testUpperUnderscoreToLowerDot() {
assertEquals("foo", UPPER_UNDERSCORE.to(LOWER_DOT, "FOO"));
assertEquals("foo.bar", UPPER_UNDERSCORE.to(LOWER_DOT, "FOO_BAR"));
}

public void testLowerDotToLowerHyphen() {
assertEquals("foo", LOWER_DOT.to(LOWER_HYPHEN, "foo"));
assertEquals("foo-bar", LOWER_DOT.to(LOWER_HYPHEN, "foo.bar"));
}

public void testLowerDotToLowerUnderscore() {
assertEquals("foo", LOWER_DOT.to(LOWER_UNDERSCORE, "foo"));
assertEquals("foo_bar", LOWER_DOT.to(LOWER_UNDERSCORE, "foo.bar"));
}

public void testLowerDotToLowerCamel() {
assertEquals("foo", LOWER_DOT.to(LOWER_CAMEL, "foo"));
assertEquals("fooBar", LOWER_DOT.to(LOWER_CAMEL, "foo.bar"));
}

public void testLowerDotToUpperCamel() {
assertEquals("Foo", LOWER_DOT.to(UPPER_CAMEL, "foo"));
assertEquals("FooBar", LOWER_DOT.to(UPPER_CAMEL, "foo.bar"));
}

public void testLowerDotToUpperUnderscore() {
assertEquals("FOO", LOWER_DOT.to(UPPER_UNDERSCORE, "foo"));
assertEquals("FOO_BAR", LOWER_DOT.to(UPPER_UNDERSCORE, "foo.bar"));
}

public void testLowerDotToLowerDot() {
assertEquals("foo", LOWER_DOT.to(LOWER_DOT, "foo"));
assertEquals("foo.bar", LOWER_DOT.to(LOWER_DOT, "foo.bar"));
}

public void testConverterToForward() {
assertEquals("FooBar", UPPER_UNDERSCORE.converterTo(UPPER_CAMEL).convert("FOO_BAR"));
assertEquals("fooBar", UPPER_UNDERSCORE.converterTo(LOWER_CAMEL).convert("FOO_BAR"));
Expand Down
8 changes: 8 additions & 0 deletions guava/src/com/google/common/base/CaseFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@ String convert(CaseFormat format, String s) {
}
return super.convert(format, s);
}
},

/** Java properties naming convention, e.g., "lower.dot". */
LOWER_DOT(CharMatcher.is('.'), ".") {
@Override
String normalizeWord(String word) {
return Ascii.toLowerCase(word);
}
};

private final CharMatcher wordBoundary;
Expand Down