Skip to content

Fix duplicate toUpperCase() calls, use Locale.ROOT #158

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 11 commits into
base: main
Choose a base branch
from
Open

Fix duplicate toUpperCase() calls, use Locale.ROOT #158

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
85053db
Remove duplicate toUpperCase() calls
nyurik Apr 28, 2018
803cdd5
Use Locale.ROOT with toUpper to avoid ambiguities
nyurik Apr 29, 2018
1e8d0c3
Update to recent version while keeping changes
bocops Apr 22, 2021
9c8fc6e
Merge pull request #1 from bocops/patch-3
nyurik May 21, 2021
15e7afa
Merge branch 'main' into patch-2
nyurik May 21, 2021
92e2e40
simplified per suggestion
nyurik May 21, 2021
9101f25
Further optimization to remove dup toUpperCase
nyurik May 21, 2021
f0f5dc6
Merge branch 'main' into patch-2
sonyaa Nov 8, 2021
efe3cde
Update java/src/main/java/com/google/openlocationcode/OpenLocationCod…
nyurik Nov 18, 2021
868ed71
Merge branch 'main' into patch-2
nyurik Nov 18, 2021
731fdcd
Merge branch 'main' into patch-2
phebehp Jun 17, 2022
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: 5 additions & 3 deletions java/com/google/openlocationcode/OpenLocationCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.openlocationcode;

import java.math.BigDecimal;
import java.util.Locale;

/**
* Convert locations to and from convenient short codes.
Expand Down Expand Up @@ -153,11 +154,12 @@ public double getEastLongitude() {
* @constructor
*/
public OpenLocationCode(String code) throws IllegalArgumentException {
if (!isValidCode(code.toUpperCase())) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can get rid of the code.toUpperCase() here all together, since we're calling it inside of isValidCode().

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since this is public, can we make that assumption and document it the constructor comments?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand your question here, can you rephrase? What assumption are you thinking we need to document?

String newCode = code.toUpperCase(Locale.ROOT);
if (!isValidCode(newCode)) {
throw new IllegalArgumentException(
"The provided code '" + code + "' is not a valid Open Location Code.");
}
this.code = code.toUpperCase();
this.code = newCode;
}

/**
Expand Down Expand Up @@ -496,7 +498,7 @@ public static boolean isValidCode(String code) {
if (code == null || code.length() < 2) {
return false;
}
code = code.toUpperCase();
code = code.toUpperCase(Locale.ROOT);
Copy link
Contributor

@JonMcPherson JonMcPherson May 5, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you wanted to remove all redundant calls of toUpperCase(), it could be modified to something like this

public static boolean isValidCode(String code) {
    return isValidCodeUpperCase(code.toUpperCase(Locale.ROOT));
}

private static boolean isValidCodeUpperCase(String code) {
    // do validity checks without calling code.toUpperCase() redundantly
}

And the constructor would instead call !isValidCodeUpperCase(newCode).
Just a minor improvement...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing out the redundant call. It's so redundant, in fact, that I think we can just remove the one in the constructor since the code will be cast to uppercase in isValidCode().


// There must be exactly one separator.
int separatorPosition = code.indexOf(SEPARATOR);
Expand Down