Fixing build issues caused by dependency update.

.kokoro/presubmit.cfg

@@ -19,4 +19,3 @@ env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/java-docs-samples/.kokoro/tests/diff_tests.sh"
 }
-

appengine/datastore/pom.xml

@@ -40,5 +40,4 @@
     <module>indexes-exploding</module>
     <module>indexes-perfect</module>
   </modules>
-
 </project>

container-registry/container-analysis/pom.xml

@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>0.34.0-beta</version>
+      <version>0.38.0-beta</version>
     </dependency>
     <dependency>
       <groupId>com.google.api</groupId>

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;
     }

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;

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" });

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,15 +115,15 @@ public void setUp() throws Exception {
     runner.run(new TransactionRunner.TransactionCallable<Void>() {
       @Nullable
       @Override
-      public Void run(TransactionContext tx) throws Exception {
+      public Void run(TransactionContext tx) {
         tx.buffer(mutations);
         return null;
       }
     });
   }
 
   @After
-  public void tearDown() throws Exception {
+  public void tearDown() {
     DatabaseAdminClient adminClient = spanner.getDatabaseAdminClient();
     try {
       adminClient.dropDatabase(instanceId, databaseId);

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" });

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()) {

monitoring/cloud-client/pom.xml

@@ -55,7 +55,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
-      <version>0.34.0-beta</version>
+      <version>0.38.0-beta</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

monitoring/cloud-client/src/main/java/com/example/monitoring/QuickstartSample.java

@@ -65,7 +65,7 @@ public static void main(String... args) throws Exception {
     List<Point> pointList = new ArrayList<>();
     pointList.add(point);
 
-    ProjectName name = ProjectName.create(projectId);
+    ProjectName name = ProjectName.of(projectId);
 
     // Prepares the metric descriptor
     Map<String, String> metricLabels = new HashMap<String, String>();
@@ -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();