Repository: beam Updated Branches: refs/heads/master 7fc73d790 -> 893bf428a
Ditch apache commons Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/39a2ed0c Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/39a2ed0c Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/39a2ed0c Branch: refs/heads/master Commit: 39a2ed0ccb53bcc96c179c64405c80226bac7b9b Parents: 2dd1907 Author: Mairbek Khadikov <mair...@google.com> Authored: Thu Jun 29 10:12:50 2017 -0700 Committer: Mairbek Khadikov <mair...@google.com> Committed: Thu Jun 29 10:12:50 2017 -0700 ---------------------------------------------------------------------- sdks/java/io/google-cloud-platform/pom.xml | 11 ------ .../beam/sdk/io/gcp/spanner/RandomUtils.java | 41 ++++++++++++++++++++ .../beam/sdk/io/gcp/spanner/SpannerReadIT.java | 11 ++---- .../beam/sdk/io/gcp/spanner/SpannerWriteIT.java | 10 ++--- 4 files changed, 47 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/39a2ed0c/sdks/java/io/google-cloud-platform/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index 94066c7..09a430a 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -258,19 +258,8 @@ <artifactId>proto-google-common-protos</artifactId> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <scope>provided</scope> - </dependency> - <!-- Test dependencies --> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-text</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-java-core</artifactId> <classifier>tests</classifier> http://git-wip-us.apache.org/repos/asf/beam/blob/39a2ed0c/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/RandomUtils.java ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/RandomUtils.java b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/RandomUtils.java new file mode 100644 index 0000000..f479b4a --- /dev/null +++ b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/RandomUtils.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.beam.sdk.io.gcp.spanner; + +import java.util.Random; + +/** + * Useful randomness related utilities. + */ +public class RandomUtils { + + private static final char[] ALPHANUMERIC = "1234567890abcdefghijklmnopqrstuvwxyz".toCharArray(); + + private RandomUtils() { + } + + public static String randomAlphaNumeric(int length) { + Random random = new Random(); + char[] result = new char[length]; + for (int i = 0; i < length; i++) { + result[i] = ALPHANUMERIC[random.nextInt(ALPHANUMERIC.length)]; + } + return new String(result); + } + +} http://git-wip-us.apache.org/repos/asf/beam/blob/39a2ed0c/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerReadIT.java ---------------------------------------------------------------------- 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 ca43b40..9f7c64e 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 @@ -40,8 +40,6 @@ import org.apache.beam.sdk.testing.TestPipelineOptions; import org.apache.beam.sdk.transforms.Count; 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; @@ -127,7 +125,7 @@ public class SpannerReadIT { .set("key") .to((long) i) .set("value") - .to(RandomStringUtils.random(100, true, true)) + .to(RandomUtils.randomAlphaNumeric(100)) .build()); } @@ -161,11 +159,8 @@ public class SpannerReadIT { } private String generateDatabaseName() { - String random = - new RandomStringGenerator.Builder() - .withinRange('a', 'z') - .build() - .generate(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()); + String random = RandomUtils + .randomAlphaNumeric(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()); return options.getDatabaseIdPrefix() + "-" + random; } } http://git-wip-us.apache.org/repos/asf/beam/blob/39a2ed0c/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/spanner/SpannerWriteIT.java ---------------------------------------------------------------------- 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 613756c..2f6cd55 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 @@ -41,7 +41,6 @@ import org.apache.beam.sdk.testing.TestPipeline; import org.apache.beam.sdk.testing.TestPipelineOptions; 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; @@ -114,11 +113,8 @@ public class SpannerWriteIT { } private String generateDatabaseName() { - String random = - new RandomStringGenerator.Builder() - .withinRange('a', 'z') - .build() - .generate(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()); + String random = RandomUtils + .randomAlphaNumeric(MAX_DB_NAME_LENGTH - 1 - options.getDatabaseIdPrefix().length()); return options.getDatabaseIdPrefix() + "-" + random; } @@ -166,7 +162,7 @@ public class SpannerWriteIT { Mutation.WriteBuilder builder = Mutation.newInsertOrUpdateBuilder(table); Long key = c.element(); builder.set("Key").to(key); - builder.set("Value").to(new RandomStringGenerator.Builder().build().generate(valueSize)); + builder.set("Value").to(RandomUtils.randomAlphaNumeric(valueSize)); Mutation mutation = builder.build(); c.output(mutation); }