Repository: beam Updated Branches: refs/heads/master 4ab74bf74 -> 1721cea27
[BEAM-1871] Remove another depedendency by moving TestCredential Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c0baf4ce Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c0baf4ce Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c0baf4ce Branch: refs/heads/master Commit: c0baf4ce2f9b520ac843e67fb25d0384f1cb3aef Parents: 4ab74bf Author: Luke Cwik <[email protected]> Authored: Wed Apr 19 14:20:46 2017 -0700 Committer: Luke Cwik <[email protected]> Committed: Wed Apr 19 15:29:51 2017 -0700 ---------------------------------------------------------------------- sdks/java/core/pom.xml | 5 -- .../apache/beam/sdk/util/TestCredential.java | 59 -------------------- .../org/apache/beam/SdkCoreApiSurfaceTest.java | 1 - sdks/java/extensions/gcp-core/pom.xml | 5 ++ .../apache/beam/sdk/util/TestCredential.java | 59 ++++++++++++++++++++ 5 files changed, 64 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/c0baf4ce/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index dc80a2c..2860be2 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -140,11 +140,6 @@ </dependency> <dependency> - <groupId>com.google.auth</groupId> - <artifactId>google-auth-library-credentials</artifactId> - </dependency> - - <dependency> <groupId>com.google.apis</groupId> <artifactId>google-api-services-bigquery</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/c0baf4ce/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TestCredential.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TestCredential.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TestCredential.java deleted file mode 100644 index f34527e..0000000 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/TestCredential.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.util; - -import com.google.auth.Credentials; -import java.io.IOException; -import java.net.URI; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - * Fake credential, for use in testing. - */ -public class TestCredential extends Credentials { - @Override - public String getAuthenticationType() { - return "Test"; - } - - @Override - public Map<String, List<String>> getRequestMetadata() throws IOException { - return Collections.emptyMap(); - } - - @Override - public Map<String, List<String>> getRequestMetadata(URI uri) throws IOException { - return Collections.emptyMap(); - } - - @Override - public boolean hasRequestMetadata() { - return false; - } - - @Override - public boolean hasRequestMetadataOnly() { - return true; - } - - @Override - public void refresh() throws IOException { - } -} http://git-wip-us.apache.org/repos/asf/beam/blob/c0baf4ce/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java b/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java index 66c1393..eed4457 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/SdkCoreApiSurfaceTest.java @@ -41,7 +41,6 @@ public class SdkCoreApiSurfaceTest { "com.google.api.client", "com.google.api.services.bigquery", "com.google.api.services.storage", - "com.google.auth", "com.google.protobuf", "com.fasterxml.jackson.annotation", "com.fasterxml.jackson.core", http://git-wip-us.apache.org/repos/asf/beam/blob/c0baf4ce/sdks/java/extensions/gcp-core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/gcp-core/pom.xml b/sdks/java/extensions/gcp-core/pom.xml index d566f94..918632a 100644 --- a/sdks/java/extensions/gcp-core/pom.xml +++ b/sdks/java/extensions/gcp-core/pom.xml @@ -73,6 +73,11 @@ </dependency> <dependency> + <groupId>com.google.auth</groupId> + <artifactId>google-auth-library-credentials</artifactId> + </dependency> + + <dependency> <groupId>com.google.http-client</groupId> <artifactId>google-http-client-jackson2</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/c0baf4ce/sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/TestCredential.java ---------------------------------------------------------------------- diff --git a/sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/TestCredential.java b/sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/TestCredential.java new file mode 100644 index 0000000..f34527e --- /dev/null +++ b/sdks/java/extensions/gcp-core/src/main/java/org/apache/beam/sdk/util/TestCredential.java @@ -0,0 +1,59 @@ +/* + * 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.util; + +import com.google.auth.Credentials; +import java.io.IOException; +import java.net.URI; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +/** + * Fake credential, for use in testing. + */ +public class TestCredential extends Credentials { + @Override + public String getAuthenticationType() { + return "Test"; + } + + @Override + public Map<String, List<String>> getRequestMetadata() throws IOException { + return Collections.emptyMap(); + } + + @Override + public Map<String, List<String>> getRequestMetadata(URI uri) throws IOException { + return Collections.emptyMap(); + } + + @Override + public boolean hasRequestMetadata() { + return false; + } + + @Override + public boolean hasRequestMetadataOnly() { + return true; + } + + @Override + public void refresh() throws IOException { + } +}
