fix: Assorted warnings. (#246)

google-cloud-pubsublite/clirr-ignored-differences.xml

@@ -1,31 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 <differences>
-  <!-- Path construction has been modified: remove on next release. -->
+  <!-- ProjectLookupUtils functions renamed: remove on next release. -->
   <difference>
     <differenceType>7002</differenceType>
-    <className>com/google/cloud/pubsublite/*Path*</className>
+    <className>com/google/cloud/pubsublite/ProjectLookupUtils</className>
     <method>*</method>
   </difference>
   <difference>
-    <differenceType>7004</differenceType>
-    <className>com/google/cloud/pubsublite/*Path*</className>
-    <method>*</method>
-  </difference>
-  <difference>
-    <differenceType>7005</differenceType>
-    <className>com/google/cloud/pubsublite/*Path*</className>
-    <method>*</method>
-    <to>*</to>
+    <differenceType>3003</differenceType>
+    <className>com/google/cloud/pubsublite/ProjectLookupUtils</className>
   </difference>
   <difference>
-    <differenceType>7013</differenceType>
-    <className>com/google/cloud/pubsublite/*Path*</className>
-    <method>*</method>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/pubsublite/*Paths*</className>
+    <differenceType>7009</differenceType>
+    <className>com/google/cloud/pubsublite/ProjectLookupUtils</className>
     <method>*</method>
   </difference>
   <!-- Blanket ignored files -->

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/ProjectLookupUtils.java

@@ -23,37 +23,45 @@
 import com.google.cloud.resourcemanager.ResourceManagerOptions;
 import io.grpc.StatusException;
 
-public class ProjectLookupUtils {
-  private static final ResourceManager resourceManager =
-      ResourceManagerOptions.getDefaultInstance().getService();
+public final class ProjectLookupUtils {
+  private ProjectLookupUtils() {}
+
+  private static ResourceManager resourceManager = null;
+
+  private static synchronized ResourceManager getResourceManager() {
+    if (resourceManager == null) {
+      resourceManager = ResourceManagerOptions.getDefaultInstance().getService();
+    }
+    return resourceManager;
+  }
 
   private static ProjectNumber getProjectNumber(ProjectId id) throws StatusException {
     try {
-      Project project = resourceManager.get(id.toString());
+      Project project = getResourceManager().get(id.toString());
       return ProjectNumber.of(project.getProjectNumber());
     } catch (Throwable t) {
       throw ExtractStatus.toCanonical(t);
     }
   }
 
-  static ProjectNumber toCannonical(ProjectIdOrNumber project) throws StatusException {
+  static ProjectNumber toCanonical(ProjectIdOrNumber project) throws StatusException {
     if (project.getKind() == Kind.NUMBER) return project.number();
     return getProjectNumber(project.name());
   }
 
-  public static ProjectPath toCannonical(ProjectPath path) throws StatusException {
-    return path.toBuilder().setProject(toCannonical(path.project())).build();
+  public static ProjectPath toCanonical(ProjectPath path) throws StatusException {
+    return path.toBuilder().setProject(toCanonical(path.project())).build();
   }
 
-  public static LocationPath toCannonical(LocationPath path) throws StatusException {
-    return path.toBuilder().setProject(toCannonical(path.project())).build();
+  public static LocationPath toCanonical(LocationPath path) throws StatusException {
+    return path.toBuilder().setProject(toCanonical(path.project())).build();
   }
 
-  public static SubscriptionPath toCannonical(SubscriptionPath path) throws StatusException {
-    return path.toBuilder().setProject(toCannonical(path.project())).build();
+  public static SubscriptionPath toCanonical(SubscriptionPath path) throws StatusException {
+    return path.toBuilder().setProject(toCanonical(path.project())).build();
   }
 
-  public static TopicPath toCannonical(TopicPath path) throws StatusException {
-    return path.toBuilder().setProject(toCannonical(path.project())).build();
+  public static TopicPath toCanonical(TopicPath path) throws StatusException {
+    return path.toBuilder().setProject(toCanonical(path.project())).build();
   }
 }

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/AdminClientImpl.java

@@ -102,7 +102,7 @@ public CloudRegion region() {
   public ApiFuture<Topic> createTopic(Topic topic) {
     return RetryingExecutorUtil.runWithRetries(
         () -> {
-          TopicPath path = ProjectLookupUtils.toCannonical(TopicPath.parse(topic.getName()));
+          TopicPath path = ProjectLookupUtils.toCanonical(TopicPath.parse(topic.getName()));
           return stub.createTopic(
               CreateTopicRequest.newBuilder()
                   .setParent(path.locationPath().toString())
@@ -119,7 +119,7 @@ public ApiFuture<Topic> getTopic(TopicPath path) {
         () ->
             stub.getTopic(
                 GetTopicRequest.newBuilder()
-                    .setName(ProjectLookupUtils.toCannonical(path).toString())
+                    .setName(ProjectLookupUtils.toCanonical(path).toString())
                     .build()),
         topicRetryingExecutor);
   }
@@ -130,7 +130,7 @@ public ApiFuture<Long> getTopicPartitionCount(TopicPath path) {
         () ->
             stub.getTopicPartitions(
                     GetTopicPartitionsRequest.newBuilder()
-                        .setName(ProjectLookupUtils.toCannonical(path).toString())
+                        .setName(ProjectLookupUtils.toCanonical(path).toString())
                         .build())
                 .getPartitionCount(),
         partitionCountRetryingExecutor);
@@ -142,7 +142,7 @@ public ApiFuture<List<Topic>> listTopics(LocationPath path) {
         () ->
             stub.listTopics(
                     ListTopicsRequest.newBuilder()
-                        .setParent(ProjectLookupUtils.toCannonical(path).toString())
+                        .setParent(ProjectLookupUtils.toCanonical(path).toString())
                         .build())
                 .getTopicsList(),
         listTopicsRetryingExecutor);
@@ -156,7 +156,7 @@ public ApiFuture<Topic> updateTopic(Topic topic, FieldMask mask) {
               topic
                   .toBuilder()
                   .setName(
-                      ProjectLookupUtils.toCannonical(TopicPath.parse(topic.getName())).toString())
+                      ProjectLookupUtils.toCanonical(TopicPath.parse(topic.getName())).toString())
                   .build();
           return stub.updateTopic(
               UpdateTopicRequest.newBuilder().setTopic(canonical).setUpdateMask(mask).build());
@@ -171,7 +171,7 @@ public ApiFuture<Void> deleteTopic(TopicPath path) {
         () -> {
           stub.deleteTopic(
               DeleteTopicRequest.newBuilder()
-                  .setName(ProjectLookupUtils.toCannonical(path).toString())
+                  .setName(ProjectLookupUtils.toCanonical(path).toString())
                   .build());
           return null;
         },
@@ -186,7 +186,7 @@ public ApiFuture<List<SubscriptionPath>> listTopicSubscriptions(TopicPath path)
           for (String subscription :
               stub.listTopicSubscriptions(
                       ListTopicSubscriptionsRequest.newBuilder()
-                          .setName(ProjectLookupUtils.toCannonical(path).toString())
+                          .setName(ProjectLookupUtils.toCanonical(path).toString())
                           .build())
                   .getSubscriptionsList()) {
             SubscriptionPath subscription_path = SubscriptionPath.parse(subscription);
@@ -202,7 +202,7 @@ public ApiFuture<Subscription> createSubscription(Subscription subscription) {
     return RetryingExecutorUtil.runWithRetries(
         () -> {
           SubscriptionPath path =
-              ProjectLookupUtils.toCannonical(SubscriptionPath.parse(subscription.getName()));
+              ProjectLookupUtils.toCanonical(SubscriptionPath.parse(subscription.getName()));
           return stub.createSubscription(
               CreateSubscriptionRequest.newBuilder()
                   .setParent(path.locationPath().toString())
@@ -219,7 +219,7 @@ public ApiFuture<Subscription> getSubscription(SubscriptionPath path) {
         () ->
             stub.getSubscription(
                 GetSubscriptionRequest.newBuilder()
-                    .setName(ProjectLookupUtils.toCannonical(path).toString())
+                    .setName(ProjectLookupUtils.toCanonical(path).toString())
                     .build()),
         subscriptionRetryingExecutor);
   }
@@ -230,7 +230,7 @@ public ApiFuture<List<Subscription>> listSubscriptions(LocationPath path) {
         () ->
             stub.listSubscriptions(
                     ListSubscriptionsRequest.newBuilder()
-                        .setParent(ProjectLookupUtils.toCannonical(path).toString())
+                        .setParent(ProjectLookupUtils.toCanonical(path).toString())
                         .build())
                 .getSubscriptionsList(),
         listSubscriptionsRetryingExecutor);
@@ -244,8 +244,7 @@ public ApiFuture<Subscription> updateSubscription(Subscription subscription, Fie
               subscription
                   .toBuilder()
                   .setName(
-                      ProjectLookupUtils.toCannonical(
-                              SubscriptionPath.parse(subscription.getName()))
+                      ProjectLookupUtils.toCanonical(SubscriptionPath.parse(subscription.getName()))
                           .toString())
                   .build();
           return stub.updateSubscription(
@@ -264,7 +263,7 @@ public ApiFuture<Void> deleteSubscription(SubscriptionPath path) {
         () -> {
           stub.deleteSubscription(
               DeleteSubscriptionRequest.newBuilder()
-                  .setName(ProjectLookupUtils.toCannonical(path).toString())
+                  .setName(ProjectLookupUtils.toCanonical(path).toString())
                   .build());
           return null;
         },

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/TopicStatsClientImpl.java

@@ -111,7 +111,7 @@ public ApiFuture<ComputeMessageStatsResponse> computeMessageStats(
         () -> {
           return stub.computeMessageStats(
               ComputeMessageStatsRequest.newBuilder()
-                  .setTopic(ProjectLookupUtils.toCannonical(path).toString())
+                  .setTopic(ProjectLookupUtils.toCanonical(path).toString())
                   .setPartition(partition.value())
                   .setStartCursor(Cursor.newBuilder().setOffset(start.value()).build())
                   .setEndCursor(Cursor.newBuilder().setOffset(end.value()).build())

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/wire/AssignerBuilder.java

@@ -81,7 +81,7 @@ public Assigner build() throws StatusException {
       InitialPartitionAssignmentRequest initial =
           InitialPartitionAssignmentRequest.newBuilder()
               .setSubscription(
-                  ProjectLookupUtils.toCannonical(builder.subscriptionPath()).toString())
+                  ProjectLookupUtils.toCanonical(builder.subscriptionPath()).toString())
               .setClientId(ByteString.copyFrom(uuidBuffer.array()))
               .build();
       return new AssignerImpl(

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/wire/CommitterBuilder.java

@@ -69,7 +69,7 @@ public Committer build() throws StatusException {
       InitialCommitCursorRequest initialCommitCursorRequest =
           InitialCommitCursorRequest.newBuilder()
               .setSubscription(
-                  ProjectLookupUtils.toCannonical(builder.subscriptionPath()).toString())
+                  ProjectLookupUtils.toCanonical(builder.subscriptionPath()).toString())
               .setPartition(builder.partition().value())
               .build();
       return new CommitterImpl(cursorStub, initialCommitCursorRequest);

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/wire/PublisherBuilder.java

@@ -115,7 +115,7 @@ public Publisher<Offset> build() throws StatusException {
       return new PublisherImpl(
           actualStub,
           InitialPublishRequest.newBuilder()
-              .setTopic(ProjectLookupUtils.toCannonical(autoBuilt.topic()).toString())
+              .setTopic(ProjectLookupUtils.toCanonical(autoBuilt.topic()).toString())
               .setPartition(autoBuilt.partition().value())
               .build(),
           validateBatchingSettings(autoBuilt.batching()));

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/wire/RoutingMetadata.java

@@ -39,7 +39,7 @@ static Metadata of(TopicPath topic, Partition partition) throws StatusException
       Metadata metadata = new Metadata();
       String topic_value =
           URLEncoder.encode(
-              ProjectLookupUtils.toCannonical(topic).toString(), StandardCharsets.UTF_8.toString());
+              ProjectLookupUtils.toCanonical(topic).toString(), StandardCharsets.UTF_8.toString());
       String params = String.format("partition=%s&topic=%s", partition.value(), topic_value);
       metadata.put(PARAMS_KEY, params);
       return metadata;
@@ -53,7 +53,7 @@ static Metadata of(SubscriptionPath subscription, Partition partition) throws St
       Metadata metadata = new Metadata();
       String subscription_value =
           URLEncoder.encode(
-              ProjectLookupUtils.toCannonical(subscription).toString(),
+              ProjectLookupUtils.toCanonical(subscription).toString(),
               StandardCharsets.UTF_8.toString());
       String params =
           String.format("partition=%s&subscription=%s", partition.value(), subscription_value);

google-cloud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/wire/SubscriberBuilder.java

@@ -87,7 +87,7 @@ public Subscriber build() throws StatusException {
       InitialSubscribeRequest initialSubscribeRequest =
           InitialSubscribeRequest.newBuilder()
               .setSubscription(
-                  ProjectLookupUtils.toCannonical(builder.subscriptionPath()).toString())
+                  ProjectLookupUtils.toCanonical(builder.subscriptionPath()).toString())
               .setPartition(builder.partition().value())
               .build();
       return new SubscriberImpl(

google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/TopicStatsClientSettingsTest.java

@@ -30,10 +30,11 @@
 public class TopicStatsClientSettingsTest {
   @Test
   public void testSettings() throws StatusException {
-    TopicStatsClientSettings.newBuilder()
-        .setRegion(CloudRegion.of("us-central1"))
-        .setStub(TopicStatsServiceGrpc.newBlockingStub(mock(Channel.class)))
-        .build()
-        .instantiate();
+    TopicStatsClient unusedClient =
+        TopicStatsClientSettings.newBuilder()
+            .setRegion(CloudRegion.of("us-central1"))
+            .setStub(TopicStatsServiceGrpc.newBlockingStub(mock(Channel.class)))
+            .build()
+            .instantiate();
   }
 }

google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitterBuilderTest.java

@@ -34,15 +34,16 @@
 public class CommitterBuilderTest {
   @Test
   public void testBuilder() throws Exception {
-    CommitterBuilder.newBuilder()
-        .setSubscriptionPath(
-            SubscriptionPath.newBuilder()
-                .setLocation(CloudZone.of(CloudRegion.of("us-central1"), 'a'))
-                .setProject(ProjectNumber.of(3))
-                .setName(SubscriptionName.of("abc"))
-                .build())
-        .setPartition(Partition.of(987))
-        .setCursorStub(CursorServiceGrpc.newStub(mock(Channel.class)))
-        .build();
+    Committer unusedCommitter =
+        CommitterBuilder.newBuilder()
+            .setSubscriptionPath(
+                SubscriptionPath.newBuilder()
+                    .setLocation(CloudZone.of(CloudRegion.of("us-central1"), 'a'))
+                    .setProject(ProjectNumber.of(3))
+                    .setName(SubscriptionName.of("abc"))
+                    .build())
+            .setPartition(Partition.of(987))
+            .setCursorStub(CursorServiceGrpc.newStub(mock(Channel.class)))
+            .build();
   }
 }

google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/PublisherBuilderTest.java

@@ -20,10 +20,12 @@
 
 import com.google.cloud.pubsublite.CloudRegion;
 import com.google.cloud.pubsublite.CloudZone;
+import com.google.cloud.pubsublite.Offset;
 import com.google.cloud.pubsublite.Partition;
 import com.google.cloud.pubsublite.ProjectNumber;
 import com.google.cloud.pubsublite.TopicName;
 import com.google.cloud.pubsublite.TopicPath;
+import com.google.cloud.pubsublite.internal.Publisher;
 import com.google.cloud.pubsublite.proto.PublisherServiceGrpc;
 import io.grpc.Channel;
 import org.junit.Test;
@@ -34,16 +36,17 @@
 public class PublisherBuilderTest {
   @Test
   public void testBuilder() throws Exception {
-    PublisherBuilder.builder()
-        .setBatching(PublisherBuilder.DEFAULT_BATCHING_SETTINGS)
-        .setTopic(
-            TopicPath.newBuilder()
-                .setLocation(CloudZone.of(CloudRegion.of("us-central1"), 'a'))
-                .setProject(ProjectNumber.of(3))
-                .setName(TopicName.of("abc"))
-                .build())
-        .setPartition(Partition.of(85))
-        .setStub(PublisherServiceGrpc.newStub(mock(Channel.class)))
-        .build();
+    Publisher<Offset> unusedPublisher =
+        PublisherBuilder.builder()
+            .setBatching(PublisherBuilder.DEFAULT_BATCHING_SETTINGS)
+            .setTopic(
+                TopicPath.newBuilder()
+                    .setLocation(CloudZone.of(CloudRegion.of("us-central1"), 'a'))
+                    .setProject(ProjectNumber.of(3))
+                    .setName(TopicName.of("abc"))
+                    .build())
+            .setPartition(Partition.of(85))
+            .setStub(PublisherServiceGrpc.newStub(mock(Channel.class)))
+            .build();
   }
 }

google-cloud-pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/RoutingPublisherTest.java

@@ -16,13 +16,16 @@
 
 package com.google.cloud.pubsublite.internal.wire;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.api.core.ApiFuture;
+import com.google.api.core.ApiFutures;
 import com.google.cloud.pubsublite.Message;
+import com.google.cloud.pubsublite.Offset;
 import com.google.cloud.pubsublite.Partition;
 import com.google.cloud.pubsublite.PublishMetadata;
 import com.google.cloud.pubsublite.internal.FakeApiService;
@@ -73,8 +76,11 @@ public void flushFlushesAll() throws Exception {
   public void publishValidRoute() throws Exception {
     Message message = Message.builder().setKey(ByteString.copyFromUtf8("abc")).build();
     when(routingPolicy.route(message.key())).thenReturn(Partition.of(1));
-    routing.publish(message);
+    PublishMetadata meta = PublishMetadata.of(Partition.of(1), Offset.of(3));
+    when(publisher1.publish(message)).thenReturn(ApiFutures.immediateFuture(meta));
+    ApiFuture<PublishMetadata> fut = routing.publish(message);
     verify(publisher1, times(1)).publish(message);
+    assertThat(fut.get()).isEqualTo(meta);
     this.routing.stopAsync().awaitTerminated();
   }