Skip to content

Commit 398f9c3

Browse files
dpebotkurtisvg
authored andcommitted
Auto-update dependencies. (GoogleCloudPlatform#997)
* Auto-update dependencies. * Remove jre7. * Update BigQuery Samples.
1 parent e0245f6 commit 398f9c3

File tree

49 files changed

+61
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+61
-115
lines changed

appengine-java8/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.apache.httpcomponents</groupId>
5555
<artifactId>httpclient</artifactId>
56-
<version>4.5.4</version>
56+
<version>4.5.5</version>
5757
</dependency>
5858

5959
<dependency>

appengine-java8/cloudsql-postgres/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>org.postgresql</groupId>
7474
<artifactId>postgresql</artifactId>
75-
<version>42.1.4.jre7</version>
75+
<version>42.2.0</version>
7676
</dependency>
7777

7878
<dependency>

appengine-java8/guestbook-cloud-datastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>com.google.cloud</groupId>
6767
<artifactId>google-cloud</artifactId>
68-
<version>0.32.0-alpha</version>
68+
<version>0.33.0-alpha</version>
6969
</dependency>
7070

7171
<dependency>

appengine-java8/pubsub/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
<dependency>
5353
<groupId>com.google.cloud</groupId>
5454
<artifactId>google-cloud-pubsub</artifactId>
55-
<version>0.32.0-beta</version>
55+
<version>0.33.0-beta</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>com.google.cloud</groupId>
5959
<artifactId>google-cloud-datastore</artifactId>
60-
<version>1.14.0</version>
60+
<version>1.15.0</version>
6161
</dependency>
6262
<!-- [END dependencies] -->
6363
</dependencies>

appengine-java8/remote-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.apache.httpcomponents</groupId>
4646
<artifactId>httpclient</artifactId>
47-
<version>4.5.4</version>
47+
<version>4.5.5</version>
4848
</dependency>
4949

5050
<dependency>

appengine-java8/spanner/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-spanner</artifactId>
47-
<version>0.32.0-beta</version>
47+
<version>0.33.0-beta</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>

appengine/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.apache.httpcomponents</groupId>
4646
<artifactId>httpclient</artifactId>
47-
<version>4.5.4</version>
47+
<version>4.5.5</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>

appengine/remote/remote-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<dependency>
4545
<groupId>org.apache.httpcomponents</groupId>
4646
<artifactId>httpclient</artifactId>
47-
<version>4.5.4</version>
47+
<version>4.5.5</version>
4848
</dependency>
4949
<dependency>
5050
<groupId>javax.servlet</groupId>

bigquery/cloud-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<dependency>
4141
<groupId>com.google.cloud</groupId>
4242
<artifactId>google-cloud-bigquery</artifactId>
43-
<version>0.32.0-beta</version>
43+
<version>0.33.0-beta</version>
4444
</dependency>
4545
<!-- [END dependencies] -->
4646
<dependency>

bigquery/cloud-client/src/main/java/com/example/bigquery/QueryParametersSample.java

Lines changed: 7 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import com.google.cloud.bigquery.FieldValue;
2222
import com.google.cloud.bigquery.QueryJobConfiguration;
2323
import com.google.cloud.bigquery.QueryParameterValue;
24-
import com.google.cloud.bigquery.QueryResponse;
25-
import com.google.cloud.bigquery.QueryResult;
24+
import com.google.cloud.bigquery.TableResult;
2625
import java.io.IOException;
2726
import java.util.Arrays;
2827
import java.util.List;
@@ -112,8 +111,7 @@ public static void main(final String[] args) throws IOException, InterruptedExce
112111
// [START bigquery_query_params]
113112
private static void runNamed(final String corpus, final long minWordCount)
114113
throws InterruptedException {
115-
BigQuery bigquery =
116-
new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
114+
BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
117115

118116
String queryString =
119117
"SELECT word, word_count\n"
@@ -131,25 +129,9 @@ private static void runNamed(final String corpus, final long minWordCount)
131129
.build();
132130

133131
// Execute the query.
134-
QueryResponse response = bigquery.query(queryRequest);
135-
136-
// Wait for the job to finish (if the query takes more than 10 seconds to complete).
137-
while (!response.jobCompleted()) {
138-
Thread.sleep(1000);
139-
response = bigquery.getQueryResults(response.getJobId());
140-
}
141-
142-
// Check for errors.
143-
if (response.hasErrors()) {
144-
String firstError = "";
145-
if (response.getExecutionErrors().size() != 0) {
146-
firstError = response.getExecutionErrors().get(0).getMessage();
147-
}
148-
throw new RuntimeException(firstError);
149-
}
132+
TableResult result = bigquery.query(queryRequest);
150133

151134
// Print all pages of the results.
152-
QueryResult result = response.getResult();
153135
while (result != null) {
154136
for (List<FieldValue> row : result.iterateAll()) {
155137
System.out.printf("%s: %d\n", row.get(0).getStringValue(), row.get(1).getLongValue());
@@ -165,8 +147,7 @@ private static void runNamed(final String corpus, final long minWordCount)
165147
*/
166148
// [START bigquery_query_params_arrays]
167149
private static void runArray(String gender, String[] states) throws InterruptedException {
168-
BigQuery bigquery =
169-
new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
150+
BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
170151

171152
String queryString =
172153
"SELECT name, sum(number) as count\n"
@@ -186,25 +167,9 @@ private static void runArray(String gender, String[] states) throws InterruptedE
186167
.build();
187168

188169
// Execute the query.
189-
QueryResponse response = bigquery.query(queryRequest);
190-
191-
// Wait for the job to finish (if the query takes more than 10 seconds to complete).
192-
while (!response.jobCompleted()) {
193-
Thread.sleep(1000);
194-
response = bigquery.getQueryResults(response.getJobId());
195-
}
196-
197-
// Check for errors.
198-
if (response.hasErrors()) {
199-
String firstError = "";
200-
if (response.getExecutionErrors().size() != 0) {
201-
firstError = response.getExecutionErrors().get(0).getMessage();
202-
}
203-
throw new RuntimeException(firstError);
204-
}
170+
TableResult result = bigquery.query(queryRequest);
205171

206172
// Print all pages of the results.
207-
QueryResult result = response.getResult();
208173
while (result != null) {
209174
for (List<FieldValue> row : result.iterateAll()) {
210175
System.out.printf("%s: %d\n", row.get(0).getStringValue(), row.get(1).getLongValue());
@@ -217,8 +182,7 @@ private static void runArray(String gender, String[] states) throws InterruptedE
217182

218183
// [START bigquery_query_params_timestamps]
219184
private static void runTimestamp() throws InterruptedException {
220-
BigQuery bigquery =
221-
new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
185+
BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
222186

223187
DateTime timestamp = new DateTime(2016, 12, 7, 8, 0, 0, DateTimeZone.UTC);
224188

@@ -236,25 +200,9 @@ private static void runTimestamp() throws InterruptedException {
236200
.build();
237201

238202
// Execute the query.
239-
QueryResponse response = bigquery.query(queryRequest);
240-
241-
// Wait for the job to finish (if the query takes more than 10 seconds to complete).
242-
while (!response.jobCompleted()) {
243-
Thread.sleep(1000);
244-
response = bigquery.getQueryResults(response.getJobId());
245-
}
246-
247-
// Check for errors.
248-
if (response.hasErrors()) {
249-
String firstError = "";
250-
if (response.getExecutionErrors().size() != 0) {
251-
firstError = response.getExecutionErrors().get(0).getMessage();
252-
}
253-
throw new RuntimeException(firstError);
254-
}
203+
TableResult result = bigquery.query(queryRequest);
255204

256205
// Print all pages of the results.
257-
QueryResult result = response.getResult();
258206
DateTimeFormatter formatter = ISODateTimeFormat.dateTimeNoMillis().withZoneUTC();
259207
while (result != null) {
260208
for (List<FieldValue> row : result.iterateAll()) {

0 commit comments

Comments
 (0)