From c861c4a3544841b13949fe70d9cf0da4da0350fd Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent Date: Wed, 17 Jan 2018 11:54:38 -0800 Subject: [PATCH 1/6] Updated mlengine/online-prediction. --- mlengine/online-prediction/pom.xml | 15 +++++++++++++++ pom.xml | 2 ++ 2 files changed, 17 insertions(+) diff --git a/mlengine/online-prediction/pom.xml b/mlengine/online-prediction/pom.xml index c7e87f0c740..8ffa00b0074 100644 --- a/mlengine/online-prediction/pom.xml +++ b/mlengine/online-prediction/pom.xml @@ -17,6 +17,21 @@ limitations under the License. mlengine-online-prediction 1 + + + com.google.cloud.samples + shared-configuration + 1.0.8 + + + + 1.8 + 1.8 + + diff --git a/pom.xml b/pom.xml index 0a0338824f8..9495896f3c2 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,8 @@ logging + mlengine/online-prediction + monitoring/cloud-client pubsub/cloud-client From 435dd13c5518fc849d13e853a576eb90a216ec84 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent Date: Wed, 17 Jan 2018 13:28:37 -0800 Subject: [PATCH 2/6] Updated monitoring/ --- mlengine/online-prediction/README.md | 3 ++ monitoring/cloud-client/README.md | 4 ++ monitoring/cloud-client/pom.xml | 13 ++++--- .../example/monitoring/QuickstartSample.java | 38 ++++++++++--------- .../java/com/example/monitoring/Snippets.java | 5 ++- .../monitoring/QuickstartSampleIT.java | 33 ++++++++-------- .../com/example/monitoring/SnippetsIT.java | 33 ++++++++-------- 7 files changed, 69 insertions(+), 60 deletions(-) diff --git a/mlengine/online-prediction/README.md b/mlengine/online-prediction/README.md index ab13de1036b..ad13011cc31 100644 --- a/mlengine/online-prediction/README.md +++ b/mlengine/online-prediction/README.md @@ -1,5 +1,8 @@ # Cloud Machine Learning Engine - Online Prediction with Java + +Open in Cloud Shell + ## Setup This sample demonstrates how to send online prediction requests to your deployed model on CMLE. diff --git a/monitoring/cloud-client/README.md b/monitoring/cloud-client/README.md index 930a7a5eb57..187faa448c0 100644 --- a/monitoring/cloud-client/README.md +++ b/monitoring/cloud-client/README.md @@ -1,5 +1,9 @@ # Getting Started with Google Stackdriver Monitoring API and the Google Cloud Client libraries + +Open in Cloud Shell + + [Google Stackdriver Monitoring API][monitoring] collects metrics, events, and metadata from Google Cloud Platform, Amazon Web Services (AWS), hosted uptime probes, application instrumentation, and a variety of common application diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml index dc78d2e689d..51a3d9d4b1a 100644 --- a/monitoring/cloud-client/pom.xml +++ b/monitoring/cloud-client/pom.xml @@ -19,18 +19,19 @@ monitoring-google-cloud-samples jar - + - doc-samples - com.google.cloud - 1.0.0 - ../.. + com.google.cloud.samples + shared-configuration + 1.0.8 1.8 1.8 - UTF-8 diff --git a/monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java b/monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java index dfd6ae89c15..c777b6d6caf 100644 --- a/monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java +++ b/monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java @@ -1,28 +1,27 @@ /* - Copyright 2017, Google, Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.monitoring; +//CHECKSTYLE OFF: VariableDeclarationUsageDistance // [START monitoring_quickstart] + import com.google.api.Metric; import com.google.api.MonitoredResource; - -// Imports the Google Cloud client library import com.google.cloud.monitoring.v3.MetricServiceClient; - import com.google.monitoring.v3.CreateTimeSeriesRequest; import com.google.monitoring.v3.Point; import com.google.monitoring.v3.ProjectName; @@ -30,13 +29,15 @@ import com.google.monitoring.v3.TimeSeries; import com.google.monitoring.v3.TypedValue; import com.google.protobuf.util.Timestamps; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +// Imports the Google Cloud client library + public class QuickstartSample { + public static void main(String... args) throws Exception { // Your Google Cloud Platform project ID String projectId = System.getProperty("projectId"); @@ -105,3 +106,4 @@ public static void main(String... args) throws Exception { } } // [END monitoring_quickstart] +//CHECKSTYLE ON: VariableDeclarationUsageDistance diff --git a/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java index 40492605ee1..0781c86c206 100644 --- a/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java +++ b/monitoring/cloud-client/src/main/java/com/example/monitoring/Snippets.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -37,7 +37,6 @@ import com.google.monitoring.v3.TypedValue; import com.google.protobuf.Duration; import com.google.protobuf.util.Timestamps; - import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; @@ -134,6 +133,7 @@ void deleteMetricDescriptor(String name) throws IOException { * DOUBLE value_type and GAUGE metric kind. If the metric descriptor * doesn't exist, it will be auto-created. */ + //CHECKSTYLE OFF: VariableDeclarationUsageDistance void writeTimeSeries() throws IOException { // [START monitoring_write_timeseries] String projectId = System.getProperty("projectId"); @@ -194,6 +194,7 @@ void writeTimeSeries() throws IOException { System.out.println("Done writing time series value."); // [END monitoring_write_timeseries] } + //CHECKSTYLE ON: VariableDeclarationUsageDistance /** * Demonstrates listing time series headers. diff --git a/monitoring/cloud-client/src/test/java/com/example/monitoring/QuickstartSampleIT.java b/monitoring/cloud-client/src/test/java/com/example/monitoring/QuickstartSampleIT.java index dbc8000c408..e118067e1d2 100644 --- a/monitoring/cloud-client/src/test/java/com/example/monitoring/QuickstartSampleIT.java +++ b/monitoring/cloud-client/src/test/java/com/example/monitoring/QuickstartSampleIT.java @@ -1,32 +1,31 @@ /* - Copyright 2016, Google, Inc. - - Licensed 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. -*/ + * Copyright 2016 Google Inc. + * + * Licensed 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 com.example.monitoring; import static com.google.common.truth.Truth.assertThat; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - /** * Tests for quickstart sample. */ diff --git a/monitoring/cloud-client/src/test/java/com/example/monitoring/SnippetsIT.java b/monitoring/cloud-client/src/test/java/com/example/monitoring/SnippetsIT.java index bb06947fda9..ebc6e1d6aea 100644 --- a/monitoring/cloud-client/src/test/java/com/example/monitoring/SnippetsIT.java +++ b/monitoring/cloud-client/src/test/java/com/example/monitoring/SnippetsIT.java @@ -1,32 +1,31 @@ /* - Copyright 2016, Google, Inc. - - Licensed 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. -*/ + * Copyright 2016 Google Inc. + * + * Licensed 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 com.example.monitoring; import static com.google.common.truth.Truth.assertThat; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - /** * Tests for quickstart sample. */ From fe4efb7509fc6a5e8a7c0e79d99fd300c3f56d31 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent Date: Wed, 17 Jan 2018 13:34:34 -0800 Subject: [PATCH 3/6] Updated pubsub/ --- pubsub/cloud-client/README.md | 3 ++ pubsub/cloud-client/pom.xml | 13 +++++---- .../pubsub/CreatePullSubscriptionExample.java | 28 +++++++++---------- .../example/pubsub/CreateTopicExample.java | 28 +++++++++---------- .../com/example/pubsub/PublisherExample.java | 2 +- .../com/example/pubsub/SubscriberExample.java | 2 +- .../java/com/example/pubsub/QuickStartIT.java | 28 +++++++++---------- 7 files changed, 54 insertions(+), 50 deletions(-) diff --git a/pubsub/cloud-client/README.md b/pubsub/cloud-client/README.md index 75bc28b47dc..8adcd502064 100644 --- a/pubsub/cloud-client/README.md +++ b/pubsub/cloud-client/README.md @@ -1,5 +1,8 @@ # Getting Started with Cloud Pub/Sub and the Google Cloud Client libraries + +Open in Cloud Shell + [Google Cloud Pub/Sub][pubsub] is a fully-managed real-time messaging service that allows you to send and receive messages between independent applications. This sample Java application demonstrates how to access the Pub/Sub API using diff --git a/pubsub/cloud-client/pom.xml b/pubsub/cloud-client/pom.xml index 65ac49064ed..b68bb534485 100644 --- a/pubsub/cloud-client/pom.xml +++ b/pubsub/cloud-client/pom.xml @@ -19,18 +19,19 @@ pubsub-google-cloud-samples jar - + - doc-samples - com.google.cloud - 1.0.0 - ../.. + com.google.cloud.samples + shared-configuration + 1.0.8 1.8 1.8 - UTF-8 diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java index f9e4531e057..4fc3a3216c1 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreatePullSubscriptionExample.java @@ -1,18 +1,18 @@ /* - Copyright 2017, Google, Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.pubsub; diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java index 86a60e6885d..7deccf1c562 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/CreateTopicExample.java @@ -1,18 +1,18 @@ /* - Copyright 2016, Google, Inc. - - Licensed 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. -*/ + * Copyright 2016 Google Inc. + * + * Licensed 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 com.example.pubsub; diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java index 87cb5c0b7c9..dc0acf0ca5a 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/PublisherExample.java @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java index 54f19c856e2..71897b7384c 100644 --- a/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java +++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/SubscriberExample.java @@ -5,7 +5,7 @@ * 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 + * 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, diff --git a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java index eb7a7766a7c..bfa268c6911 100644 --- a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java +++ b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickStartIT.java @@ -1,18 +1,18 @@ /* - Copyright 2016, Google, Inc. - - Licensed 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. -*/ + * Copyright 2016 Google Inc. + * + * Licensed 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 com.example.pubsub; From c7c7d149f4b282255b007024a25d74cb06a87360 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent Date: Wed, 17 Jan 2018 13:38:18 -0800 Subject: [PATCH 4/6] Updated spanner/ --- spanner/cloud-client/README.md | 3 ++ spanner/cloud-client/pom.xml | 27 +++++------------- .../com/example/spanner/QuickstartSample.java | 28 +++++++++---------- .../com/example/spanner/SpannerSample.java | 4 +-- .../example/spanner/QuickstartSampleIT.java | 28 +++++++++---------- .../com/example/spanner/SpannerSampleIT.java | 2 +- 6 files changed, 41 insertions(+), 51 deletions(-) diff --git a/spanner/cloud-client/README.md b/spanner/cloud-client/README.md index b028fff17cb..9029e54dea1 100644 --- a/spanner/cloud-client/README.md +++ b/spanner/cloud-client/README.md @@ -1,5 +1,8 @@ # Getting Started with Cloud Spanner and the Google Cloud Client libraries + +Open in Cloud Shell + [Cloud Spanner][Spanner] is a horizontally-scalable database-as-a-service with transactions and SQL support. These sample Java applications demonstrate how to access the Spanner API using diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index 431b8cb5035..9b3da831e76 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -1,18 +1,3 @@ - + - doc-samples - com.google.cloud - 1.0.0 - ../.. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java index a05c847e3ed..eaa64ed62aa 100644 --- a/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java +++ b/spanner/cloud-client/src/main/java/com/example/spanner/QuickstartSample.java @@ -1,18 +1,18 @@ /* - Copyright 2017, Google, Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.spanner; diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java index 43a516f4bfc..6fcd336be11 100644 --- a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java +++ b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java @@ -1,11 +1,11 @@ /* - * Copyright 2017 Google Inc. + * Copyright 2015 Google Inc. * * Licensed 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 + * 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, diff --git a/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java b/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java index 350f2b3d9a1..af14dbf7e01 100644 --- a/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java +++ b/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java @@ -1,18 +1,18 @@ /* - Copyright 2017, Google, Inc. - - Licensed 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. -*/ + * Copyright 2015 Google Inc. + * + * Licensed 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 com.example.spanner; diff --git a/spanner/cloud-client/src/test/java/com/example/spanner/SpannerSampleIT.java b/spanner/cloud-client/src/test/java/com/example/spanner/SpannerSampleIT.java index 79242f7dcbe..8f6a2e7457d 100644 --- a/spanner/cloud-client/src/test/java/com/example/spanner/SpannerSampleIT.java +++ b/spanner/cloud-client/src/test/java/com/example/spanner/SpannerSampleIT.java @@ -5,7 +5,7 @@ * 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 + * 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, From 2022a018b8ef2732e09c15f7771c13a48047a147 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent Date: Wed, 17 Jan 2018 13:43:36 -0800 Subject: [PATCH 5/6] Updated speech/ --- speech/README.md | 3 ++ speech/cloud-client/README.md | 3 ++ speech/cloud-client/pom.xml | 12 ++++---- .../com/example/speech/QuickstartSample.java | 30 +++++++++---------- .../java/com/example/speech/Recognize.java | 30 +++++++++---------- .../example/speech/QuickstartSampleIT.java | 29 +++++++++--------- .../java/com/example/speech/RecognizeIT.java | 29 +++++++++--------- 7 files changed, 71 insertions(+), 65 deletions(-) diff --git a/speech/README.md b/speech/README.md index 9d54a590b10..f41c8d4d4a1 100644 --- a/speech/README.md +++ b/speech/README.md @@ -1,5 +1,8 @@ # Cloud Speech API samples for Java + +Open in Cloud Shell + This directory contains several samples for the [Cloud Speech API](https://cloud.google.com/speech/) with Java. diff --git a/speech/cloud-client/README.md b/speech/cloud-client/README.md index aa07100c8dd..963e2294fc0 100644 --- a/speech/cloud-client/README.md +++ b/speech/cloud-client/README.md @@ -1,5 +1,8 @@ # Getting Started with Google Cloud Speech API and the Google Cloud Client libraries + +Open in Cloud Shell + [Google Cloud Speech API][speech] enables easy integration of Google speech recognition technologies into developer applications. diff --git a/speech/cloud-client/pom.xml b/speech/cloud-client/pom.xml index 8ccedb7995c..12ba0cd6edb 100644 --- a/speech/cloud-client/pom.xml +++ b/speech/cloud-client/pom.xml @@ -19,12 +19,14 @@ speech-google-cloud-samples jar - + - doc-samples - com.google.cloud - 1.0.0 - ../.. + com.google.cloud.samples + shared-configuration + 1.0.8 diff --git a/speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java b/speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java index e84dc11e7ba..e9f5cef94f1 100644 --- a/speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java +++ b/speech/cloud-client/src/main/java/com/example/speech/QuickstartSample.java @@ -1,23 +1,24 @@ /* - Copyright 2017, Google Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.speech; // [START speech_quickstart] // Imports the Google Cloud client library + import com.google.cloud.speech.v1.RecognitionAudio; import com.google.cloud.speech.v1.RecognitionConfig; import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding; @@ -26,7 +27,6 @@ import com.google.cloud.speech.v1.SpeechRecognitionAlternative; import com.google.cloud.speech.v1.SpeechRecognitionResult; import com.google.protobuf.ByteString; - import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java index 27ef28dacb5..bffa00c770b 100644 --- a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java +++ b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java @@ -1,24 +1,24 @@ /* - Copyright 2017, Google Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.speech; +import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.rpc.ApiStreamObserver; import com.google.api.gax.rpc.BidiStreamingCallable; -import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.speech.v1.LongRunningRecognizeMetadata; import com.google.cloud.speech.v1.LongRunningRecognizeResponse; import com.google.cloud.speech.v1.RecognitionAudio; diff --git a/speech/cloud-client/src/test/java/com/example/speech/QuickstartSampleIT.java b/speech/cloud-client/src/test/java/com/example/speech/QuickstartSampleIT.java index 42c7fe7cd0a..4b6fead1e81 100644 --- a/speech/cloud-client/src/test/java/com/example/speech/QuickstartSampleIT.java +++ b/speech/cloud-client/src/test/java/com/example/speech/QuickstartSampleIT.java @@ -1,18 +1,18 @@ /* - Copyright 2017, Google, Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.speech; @@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/speech/cloud-client/src/test/java/com/example/speech/RecognizeIT.java b/speech/cloud-client/src/test/java/com/example/speech/RecognizeIT.java index 7e2c4862fda..ea4cddb0b5f 100644 --- a/speech/cloud-client/src/test/java/com/example/speech/RecognizeIT.java +++ b/speech/cloud-client/src/test/java/com/example/speech/RecognizeIT.java @@ -1,18 +1,18 @@ /* - Copyright 2017, Google, Inc. - - Licensed 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. -*/ + * Copyright 2017 Google Inc. + * + * Licensed 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 com.example.speech; @@ -20,7 +20,6 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; - import org.junit.After; import org.junit.Before; import org.junit.Test; From 8418e1c5c0364351cb86ec9e479982f365a872ba Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent Date: Wed, 17 Jan 2018 14:22:09 -0800 Subject: [PATCH 6/6] Fixed spanner mistakes. --- pom.xml | 4 ---- spanner/cloud-client/pom.xml | 6 +++--- .../src/main/java/com/example/spanner/SpannerSample.java | 2 +- .../test/java/com/example/spanner/QuickstartSampleIT.java | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 9495896f3c2..50f3c866997 100644 --- a/pom.xml +++ b/pom.xml @@ -33,10 +33,6 @@ 1.8 1.8 - - default-instance - mysample - quickstart-db diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml index 9b3da831e76..2cc052fdfd9 100644 --- a/spanner/cloud-client/pom.xml +++ b/spanner/cloud-client/pom.xml @@ -101,9 +101,9 @@ limitations under the License. 2.19.1 - ${spanner.test.instance} - ${spanner.sample.database} - ${spanner.quickstart.database} + default-instance + mysample + quickstart-db diff --git a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java index 6fcd336be11..f20c1b8a110 100644 --- a/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java +++ b/spanner/cloud-client/src/main/java/com/example/spanner/SpannerSample.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google Inc. + * Copyright 2017 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java b/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java index af14dbf7e01..707018d71c6 100644 --- a/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java +++ b/spanner/cloud-client/src/test/java/com/example/spanner/QuickstartSampleIT.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 Google Inc. + * Copyright 2017 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.