From dbeba09b0def871066753d96a2fb354bffe18c04 Mon Sep 17 00:00:00 2001 From: Kenneth Knowles Date: Wed, 28 Jun 2017 07:12:51 -0700 Subject: [PATCH] Only use ASCII 'a' through 'z' for temporary Spanner tables --- .../apache/beam/sdk/io/gcp/spanner/SpannerReadIT.java | 8 +++++--- .../apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerReadIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerReadIT.java index f5d7cbd6c31d..ca43b40104e8 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerReadIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerReadIT.java @@ -41,6 +41,7 @@ import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionView; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.text.RandomStringGenerator; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -161,9 +162,10 @@ public void tearDown() throws Exception { private String generateDatabaseName() { String random = - RandomStringUtils.randomAlphanumeric( - MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()) - .toLowerCase(); + new RandomStringGenerator.Builder() + .withinRange('a', 'z') + .build() + .generate(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()); return options.getDatabaseIdPrefix() + "-" + random; } } diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java index 33532c929bab..613756cff248 100644 --- a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java @@ -33,7 +33,6 @@ import com.google.cloud.spanner.Statement; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; import java.util.Collections; - import org.apache.beam.sdk.io.GenerateSequence; import org.apache.beam.sdk.options.Default; import org.apache.beam.sdk.options.Description; @@ -43,7 +42,6 @@ import org.apache.beam.sdk.transforms.DoFn; import org.apache.beam.sdk.transforms.ParDo; import org.apache.commons.text.RandomStringGenerator; - import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -116,9 +114,11 @@ public void setUp() throws Exception { } private String generateDatabaseName() { - String random = new RandomStringGenerator.Builder().build() - .generate(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()) - .toLowerCase(); + String random = + new RandomStringGenerator.Builder() + .withinRange('a', 'z') + .build() + .generate(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()); return options.getDatabaseIdPrefix() + "-" + random; }