Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix projectName parsing in GapicSpannerRpc #6746

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
skuruppu merged 3 commits into from
Nov 15, 2019
Merged

Fix projectName parsing in GapicSpannerRpc #6746

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d7e788
Fix projectName parsing in GapicSpannerRpc to accept project names th…
mbril Nov 12, 2019
a057c9e
added comment and executed formatter
mbril Nov 14, 2019
c069771
Update google-cloud-clients/google-cloud-spanner/src/main/java/com/go…
mbril Nov 15, 2019
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
12 changes: 11 additions & 1 deletion ...s/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@
import com.google.spanner.v1.Session;
import com.google.spanner.v1.Transaction;
import io.grpc.Context;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -186,7 +189,14 @@ public static GapicSpannerRpc create(SpannerOptions options) {

public GapicSpannerRpc(final SpannerOptions options) {
this.projectId = options.getProjectId();
this.projectName = PROJECT_NAME_TEMPLATE.instantiate("project", this.projectId);
String projectNameStr = PROJECT_NAME_TEMPLATE.instantiate("project", this.projectId);
try {
// Fix use cases where projectName contains special charecters.
// This would happen when projects are under an organization.
projectNameStr = URLDecoder.decode(projectNameStr, StandardCharsets.UTF_8.toString());
} catch (UnsupportedEncodingException e) { // Ignored.
}
this.projectName = projectNameStr;

// create a metadataProvider which combines both internal headers and
// per-method-call extra headers for channelProvider to inject the headers
Expand Down