diff --git a/.kokoro/presubmit.cfg b/.kokoro/presubmit.cfg
index 3d41a167b56..cb822f09e7a 100644
--- a/.kokoro/presubmit.cfg
+++ b/.kokoro/presubmit.cfg
@@ -19,4 +19,3 @@ env_vars: {
key: "TRAMPOLINE_BUILD_FILE"
value: "github/java-docs-samples/.kokoro/tests/diff_tests.sh"
}
-
diff --git a/appengine/datastore/pom.xml b/appengine/datastore/pom.xml
index a17fdbd53af..a008b0b4e9c 100644
--- a/appengine/datastore/pom.xml
+++ b/appengine/datastore/pom.xml
@@ -40,5 +40,4 @@
indexes-exploding
indexes-perfect
-
diff --git a/container-registry/container-analysis/pom.xml b/container-registry/container-analysis/pom.xml
index 847a215400e..0506aa7b4d7 100644
--- a/container-registry/container-analysis/pom.xml
+++ b/container-registry/container-analysis/pom.xml
@@ -44,7 +44,7 @@
com.google.cloud
google-cloud-pubsub
- 0.34.0-beta
+ 0.38.0-beta
com.google.api
diff --git a/container-registry/container-analysis/src/main/java/com/example/containeranalysis/Samples.java b/container-registry/container-analysis/src/main/java/com/example/containeranalysis/Samples.java
index 4cf69253da6..9203fe84fbd 100644
--- a/container-registry/container-analysis/src/main/java/com/example/containeranalysis/Samples.java
+++ b/container-registry/container-analysis/src/main/java/com/example/containeranalysis/Samples.java
@@ -30,11 +30,11 @@
import com.google.containeranalysis.v1alpha1.Occurrence;
import com.google.containeranalysis.v1alpha1.VulnerabilityType;
import com.google.containeranalysis.v1alpha1.VulnerabilityType.VulnerabilityDetails;
+import com.google.pubsub.v1.ProjectSubscriptionName;
+import com.google.pubsub.v1.ProjectTopicName;
import com.google.pubsub.v1.PubsubMessage;
import com.google.pubsub.v1.PushConfig;
import com.google.pubsub.v1.Subscription;
-import com.google.pubsub.v1.SubscriptionName;
-import com.google.pubsub.v1.TopicName;
/**
* API usage samples
@@ -292,7 +292,7 @@ public static int pubSub(String subscriptionId, int timeout, String projectId) t
try {
// subscribe to the requested pubsub channel
- SubscriptionName subscriptionName = SubscriptionName.of(projectId, subscriptionId);
+ ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(projectId, subscriptionId);
subscriber = Subscriber.newBuilder(subscriptionName, receiver).build();
subscriber.startAsync().awaitRunning();
// listen to messages for 'listenTimeout' seconds
@@ -339,8 +339,8 @@ public static Subscription createOccurrenceSubscription(String subscriptionId, S
String topicId = "resource-notes-occurrences-v1alpha1";
try (SubscriptionAdminClient client = SubscriptionAdminClient.create()) {
PushConfig config = PushConfig.getDefaultInstance();
- TopicName topicName = TopicName.of(projectId, topicId);
- SubscriptionName subscriptionName = SubscriptionName.of(projectId, subscriptionId);
+ ProjectTopicName topicName = ProjectTopicName.of(projectId, topicId);
+ ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(projectId, subscriptionId);
Subscription sub = client.createSubscription(subscriptionName, topicName, config, 0);
return sub;
}
diff --git a/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTests.java b/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTests.java
index 657844bd23b..56c636c1282 100644
--- a/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTests.java
+++ b/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTests.java
@@ -25,7 +25,7 @@
import com.google.containeranalysis.v1alpha1.Note;
import com.google.containeranalysis.v1alpha1.Occurrence;
import com.google.containeranalysis.v1alpha1.VulnerabilityType.VulnerabilityDetails;
-import com.google.pubsub.v1.SubscriptionName;
+import com.google.pubsub.v1.ProjectSubscriptionName;
import java.util.Date;
import org.junit.After;
import org.junit.Before;
@@ -194,7 +194,7 @@ public void testPubSub() throws Exception {
int newCount;
int tries;
String subscriptionId = "drydockOccurrences";
- SubscriptionName subscriptionName = SubscriptionName.of(PROJECT_ID, subscriptionId);
+ ProjectSubscriptionName subscriptionName = ProjectSubscriptionName.of(PROJECT_ID, subscriptionId);
Samples.createOccurrenceSubscription(subscriptionId, PROJECT_ID);
Subscriber subscriber = null;
diff --git a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java
index c35773fd8a5..7a640dc8c3d 100644
--- a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java
+++ b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java
@@ -49,12 +49,12 @@
@SuppressWarnings("checkstyle:abbreviationaswordinname")
public class SpannerGroupWriteIT {
- String instanceId;
- String databaseId;
+ private String instanceId;
+ private String databaseId;
- Path tempPath;
- Spanner spanner;
- SpannerOptions spannerOptions;
+ private Path tempPath;
+ private Spanner spanner;
+ private SpannerOptions spannerOptions;
@Before
public void setUp() throws Exception {
@@ -93,7 +93,7 @@ public void setUp() throws Exception {
@Nullable
@Override
- public Void run(TransactionContext tx) throws Exception {
+ public Void run(TransactionContext tx) {
tx.buffer(mutations);
return null;
}
@@ -106,7 +106,7 @@ public Void run(TransactionContext tx) throws Exception {
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
DatabaseAdminClient adminClient = spanner.getDatabaseAdminClient();
try {
adminClient.dropDatabase(instanceId, databaseId);
@@ -118,7 +118,7 @@ public void tearDown() throws Exception {
}
@Test
- public void testEndToEnd() throws Exception {
+ public void testEndToEnd() {
SpannerGroupWrite.main(
new String[] { "--instanceId=" + instanceId, "--databaseId=" + databaseId,
"--suspiciousUsersFile=" + tempPath, "--runner=DirectRunner" });
diff --git a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java
index 1d75546f911..85e7decefa9 100644
--- a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java
+++ b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java
@@ -43,14 +43,14 @@
@SuppressWarnings("checkstyle:abbreviationaswordinname")
public class SpannerReadIT {
- String instanceId;
- String databaseId;
+ private String instanceId;
+ private String databaseId;
- Spanner spanner;
- SpannerOptions spannerOptions;
+ private Spanner spanner;
+ private SpannerOptions spannerOptions;
@Before
- public void setUp() throws Exception {
+ public void setUp() {
instanceId = System.getProperty("spanner.test.instance");
databaseId = "df-spanner-read-it";
@@ -115,7 +115,7 @@ public void setUp() throws Exception {
runner.run(new TransactionRunner.TransactionCallable() {
@Nullable
@Override
- public Void run(TransactionContext tx) throws Exception {
+ public Void run(TransactionContext tx) {
tx.buffer(mutations);
return null;
}
@@ -123,7 +123,7 @@ public Void run(TransactionContext tx) throws Exception {
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
DatabaseAdminClient adminClient = spanner.getDatabaseAdminClient();
try {
adminClient.dropDatabase(instanceId, databaseId);
diff --git a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java
index 5631ddcbd46..994d41c9cd3 100644
--- a/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java
+++ b/dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java
@@ -43,13 +43,13 @@
@SuppressWarnings("checkstyle:abbreviationaswordinname")
public class SpannerWriteIT {
- String instanceId;
- String databaseId;
+ private String instanceId;
+ private String databaseId;
- Path singersPath;
- Path albumsPath;
- Spanner spanner;
- SpannerOptions spannerOptions;
+ private Path singersPath;
+ private Path albumsPath;
+ private Spanner spanner;
+ private SpannerOptions spannerOptions;
@Before
public void setUp() throws Exception {
@@ -95,7 +95,7 @@ public void setUp() throws Exception {
}
@After
- public void tearDown() throws Exception {
+ public void tearDown() {
DatabaseAdminClient adminClient = spanner.getDatabaseAdminClient();
try {
adminClient.dropDatabase(instanceId, databaseId);
@@ -107,7 +107,7 @@ public void tearDown() throws Exception {
}
@Test
- public void testEndToEnd() throws Exception {
+ public void testEndToEnd() {
SpannerWrite.main(new String[] { "--instanceId=" + instanceId, "--databaseId=" + databaseId,
"--singersFilename=" + singersPath, "--albumsFilename=" + albumsPath,
"--runner=DirectRunner" });
diff --git a/errorreporting/src/main/java/com/example/errorreporting/QuickStart.java b/errorreporting/src/main/java/com/example/errorreporting/QuickStart.java
index 334d7c44fe7..8f399b08bcf 100644
--- a/errorreporting/src/main/java/com/example/errorreporting/QuickStart.java
+++ b/errorreporting/src/main/java/com/example/errorreporting/QuickStart.java
@@ -38,7 +38,7 @@ public static void main(String[] args) throws Exception {
// Google Cloud Platform Project ID
String projectId = (args.length > 0) ? args[0] : ServiceOptions.getDefaultProjectId();
- ProjectName projectName = ProjectName.create(projectId);
+ ProjectName projectName = ProjectName.of(projectId);
// Instantiate an Error Reporting Client
try (ReportErrorsServiceClient reportErrorsServiceClient = ReportErrorsServiceClient.create()) {
diff --git a/monitoring/cloud-client/pom.xml b/monitoring/cloud-client/pom.xml
index d8c3a92d10e..689065ebafc 100644
--- a/monitoring/cloud-client/pom.xml
+++ b/monitoring/cloud-client/pom.xml
@@ -55,7 +55,7 @@
com.google.cloud
google-cloud-monitoring
- 0.34.0-beta
+ 0.38.0-beta
com.google.guava
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 c777b6d6caf..151594b819b 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
@@ -65,7 +65,7 @@ public static void main(String... args) throws Exception {
List pointList = new ArrayList<>();
pointList.add(point);
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
// Prepares the metric descriptor
Map metricLabels = new HashMap();
@@ -93,7 +93,7 @@ public static void main(String... args) throws Exception {
timeSeriesList.add(timeSeries);
CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.addAllTimeSeries(timeSeriesList)
.build();
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 0781c86c206..be60908a871 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
@@ -21,7 +21,9 @@
import com.google.api.MonitoredResource;
import com.google.api.MonitoredResourceDescriptor;
import com.google.cloud.monitoring.v3.MetricServiceClient;
-import com.google.cloud.monitoring.v3.PagedResponseWrappers;
+import com.google.cloud.monitoring.v3.MetricServiceClient.ListMetricDescriptorsPagedResponse;
+import com.google.cloud.monitoring.v3.MetricServiceClient.ListMonitoredResourceDescriptorsPagedResponse;
+import com.google.cloud.monitoring.v3.MetricServiceClient.ListTimeSeriesPagedResponse;
import com.google.monitoring.v3.Aggregation;
import com.google.monitoring.v3.CreateMetricDescriptorRequest;
import com.google.monitoring.v3.CreateTimeSeriesRequest;
@@ -92,7 +94,7 @@ void createMetricDescriptor(String type) throws IOException {
String metricType = CUSTOM_METRIC_DOMAIN + "/" + type;
final MetricServiceClient client = MetricServiceClient.create();
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
MetricDescriptor descriptor = MetricDescriptor.newBuilder()
.setType(metricType)
@@ -102,7 +104,7 @@ void createMetricDescriptor(String type) throws IOException {
.build();
CreateMetricDescriptorRequest request = CreateMetricDescriptorRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.setMetricDescriptor(descriptor)
.build();
@@ -119,7 +121,7 @@ void deleteMetricDescriptor(String name) throws IOException {
// [START monitoring_delete_metric]
String projectId = System.getProperty("projectId");
final MetricServiceClient client = MetricServiceClient.create();
- MetricDescriptorName metricName = MetricDescriptorName.create(projectId, name);
+ MetricDescriptorName metricName = MetricDescriptorName.of(projectId, name);
client.deleteMetricDescriptor(metricName);
System.out.println("Deleted descriptor " + name);
// [END monitoring_delete_metric]
@@ -155,17 +157,17 @@ void writeTimeSeries() throws IOException {
List pointList = new ArrayList<>();
pointList.add(point);
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
// Prepares the metric descriptor
- Map metricLabels = new HashMap();
+ Map metricLabels = new HashMap<>();
Metric metric = Metric.newBuilder()
.setType("custom.googleapis.com/my_metric")
.putAllLabels(metricLabels)
.build();
// Prepares the monitored resource descriptor
- Map resourceLabels = new HashMap();
+ Map resourceLabels = new HashMap<>();
resourceLabels.put("instance_id", "1234567890123456789");
resourceLabels.put("zone", "us-central1-f");
@@ -185,7 +187,7 @@ void writeTimeSeries() throws IOException {
timeSeriesList.add(timeSeries);
CreateTimeSeriesRequest request = CreateTimeSeriesRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.addAllTimeSeries(timeSeriesList)
.build();
@@ -203,7 +205,7 @@ void listTimeSeriesHeaders() throws IOException {
// [START monitoring_read_timeseries_fields]
MetricServiceClient metricServiceClient = MetricServiceClient.create();
String projectId = System.getProperty("projectId");
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -213,15 +215,14 @@ void listTimeSeriesHeaders() throws IOException {
.build();
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
.setInterval(interval)
.setView(ListTimeSeriesRequest.TimeSeriesView.HEADERS);
ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
+ ListTimeSeriesPagedResponse response = metricServiceClient.listTimeSeries(request);
System.out.println("Got timeseries headers: ");
for (TimeSeries ts : response.iterateAll()) {
@@ -237,7 +238,7 @@ void listTimeSeries(String filter) throws IOException {
// [START monitoring_read_timeseries_simple]
MetricServiceClient metricServiceClient = MetricServiceClient.create();
String projectId = System.getProperty("projectId");
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -247,14 +248,13 @@ void listTimeSeries(String filter) throws IOException {
.build();
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.setFilter(filter)
.setInterval(interval);
ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
+ ListTimeSeriesPagedResponse response = metricServiceClient.listTimeSeries(request);
System.out.println("Got timeseries: ");
for (TimeSeries ts : response.iterateAll()) {
@@ -270,7 +270,7 @@ void listTimeSeriesAggregrate() throws IOException {
// [START monitoring_read_timeseries_align]
MetricServiceClient metricServiceClient = MetricServiceClient.create();
String projectId = System.getProperty("projectId");
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -285,15 +285,14 @@ void listTimeSeriesAggregrate() throws IOException {
.build();
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
.setInterval(interval)
.setAggregation(aggregation);
ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
+ ListTimeSeriesPagedResponse response = metricServiceClient.listTimeSeries(request);
System.out.println("Got timeseries: ");
for (TimeSeries ts : response.iterateAll()) {
@@ -309,7 +308,7 @@ void listTimeSeriesReduce() throws IOException {
// [START monitoring_read_timeseries_reduce]
MetricServiceClient metricServiceClient = MetricServiceClient.create();
String projectId = System.getProperty("projectId");
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
// Restrict time to last 20 minutes
long startMillis = System.currentTimeMillis() - ((60 * 20) * 1000);
@@ -325,15 +324,14 @@ void listTimeSeriesReduce() throws IOException {
.build();
ListTimeSeriesRequest.Builder requestBuilder = ListTimeSeriesRequest.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.setFilter("metric.type=\"compute.googleapis.com/instance/cpu/utilization\"")
.setInterval(interval)
.setAggregation(aggregation);
ListTimeSeriesRequest request = requestBuilder.build();
- PagedResponseWrappers.ListTimeSeriesPagedResponse response = metricServiceClient
- .listTimeSeries(request);
+ ListTimeSeriesPagedResponse response = metricServiceClient.listTimeSeries(request);
System.out.println("Got timeseries: ");
for (TimeSeries ts : response.iterateAll()) {
@@ -351,14 +349,13 @@ void listMetricDescriptors() throws IOException {
String projectId = System.getProperty("projectId");
final MetricServiceClient client = MetricServiceClient.create();
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
ListMetricDescriptorsRequest request = ListMetricDescriptorsRequest
.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.build();
- PagedResponseWrappers.ListMetricDescriptorsPagedResponse response =
- client.listMetricDescriptors(request);
+ ListMetricDescriptorsPagedResponse response = client.listMetricDescriptors(request);
System.out.println("Listing descriptors: ");
@@ -377,16 +374,16 @@ void listMonitoredResources() throws IOException {
String projectId = System.getProperty("projectId");
final MetricServiceClient client = MetricServiceClient.create();
- ProjectName name = ProjectName.create(projectId);
+ ProjectName name = ProjectName.of(projectId);
ListMonitoredResourceDescriptorsRequest request = ListMonitoredResourceDescriptorsRequest
.newBuilder()
- .setNameWithProjectName(name)
+ .setName(name.toString())
.build();
System.out.println("Listing monitored resource descriptors: ");
- PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse response = client
+ ListMonitoredResourceDescriptorsPagedResponse response = client
.listMonitoredResourceDescriptors(request);
for (MonitoredResourceDescriptor d : response.iterateAll()) {
@@ -406,7 +403,7 @@ void describeMonitoredResources(String type) throws IOException {
String projectId = System.getProperty("projectId");
final MetricServiceClient client = MetricServiceClient.create();
- MonitoredResourceDescriptorName name = MonitoredResourceDescriptorName.create(projectId, type);
+ MonitoredResourceDescriptorName name = MonitoredResourceDescriptorName.of(projectId, type);
MonitoredResourceDescriptor response = client.getMonitoredResourceDescriptor(name);
System.out.println("Printing monitored resource descriptor: ");
@@ -462,7 +459,7 @@ void handleCommandLine(String commandLine) throws IOException {
break;
case "delete-metric-descriptor":
args = commandLine.split("\\s+", 2);
- if (args.length != 1) {
+ if (args.length != 2) {
throw new IllegalArgumentException("usage: ");
}
deleteMetricDescriptor(args[1]);
@@ -507,13 +504,6 @@ void handleCommandLine(String commandLine) throws IOException {
}
}
- private void assertArgsLength(String[] args, int expectedLength) {
- if (args.length != expectedLength) {
- throw new IllegalArgumentException(
- String.format("expected exactly %d arg(s), found %d", expectedLength, args.length));
- }
- }
-
private static void printUsage() {
System.out.println("Usage:");
System.out.println();