Skip to content

Commit fb1cab4

Browse files
fix: Update POMs to run errorprone analyzers and fix found issues (#677)
* fix: Update POMs to run errorprone analyzers and fix found issues * fix: Disable ErrorProne until I can figure out how to enable it long term, but keep other pom changes. * fix: Add back errorprone blocks commented out
1 parent d583623 commit fb1cab4

File tree

5 files changed

+50
-42
lines changed

5 files changed

+50
-42
lines changed

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

+11-10
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@
3232
public class AssignerSettingsTest {
3333
@Test
3434
public void testBuilder() {
35-
AssignerSettings.newBuilder()
36-
.setSubscriptionPath(
37-
SubscriptionPath.newBuilder()
38-
.setLocation(CloudZone.of(CloudRegion.of("us-central1"), 'a'))
39-
.setProject(ProjectNumber.of(3))
40-
.setName(SubscriptionName.of("abc"))
41-
.build())
42-
.setReceiver(mock(PartitionAssignmentReceiver.class))
43-
.setServiceClient(mock(PartitionAssignmentServiceClient.class))
44-
.build();
35+
AssignerSettings unusedSettings =
36+
AssignerSettings.newBuilder()
37+
.setSubscriptionPath(
38+
SubscriptionPath.newBuilder()
39+
.setLocation(CloudZone.of(CloudRegion.of("us-central1"), 'a'))
40+
.setProject(ProjectNumber.of(3))
41+
.setName(SubscriptionName.of("abc"))
42+
.build())
43+
.setReceiver(mock(PartitionAssignmentReceiver.class))
44+
.setServiceClient(mock(PartitionAssignmentServiceClient.class))
45+
.build();
4546
}
4647
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void waitUntilEmptyReturnsWhenEmpty() throws Exception {
217217

218218
@Test
219219
public void waitUntilEmptyReturnsOnShutdown() throws Exception {
220-
committer.commitOffset(Offset.of(10));
220+
Future<?> unusedFuture = committer.commitOffset(Offset.of(10));
221221

222222
CountDownLatch latch = new CountDownLatch(1);
223223
Future<?> waitFuture =
@@ -246,7 +246,7 @@ public void waitUntilEmptyReturnsOnShutdown() throws Exception {
246246

247247
@Test
248248
public void waitUntilEmptyThrowsOnPermanentError() throws Exception {
249-
committer.commitOffset(Offset.of(10));
249+
Future<?> unusedFuture = committer.commitOffset(Offset.of(10));
250250

251251
Future<?> waitFuture =
252252
executorService.submit(

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

+13-12
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.google.cloud.pubsublite.internal.testing.FakeApiService;
3131
import com.google.protobuf.ByteString;
3232
import java.time.Duration;
33+
import java.util.concurrent.Future;
3334
import java.util.function.Consumer;
3435
import org.junit.Before;
3536
import org.junit.Test;
@@ -109,8 +110,8 @@ public void testPublishWithKey() throws Exception {
109110
when(mockRoutingPolicy.route(message0.key())).thenReturn(Partition.of(0));
110111
when(mockRoutingPolicy.route(message1.key())).thenReturn(Partition.of(1));
111112

112-
publisher.publish(message0);
113-
publisher.publish(message1);
113+
Future<?> unusedFuture0 = publisher.publish(message0);
114+
Future<?> unusedFuture1 = publisher.publish(message1);
114115

115116
verify(publisher0).publish(message0);
116117
verify(publisher1).publish(message1);
@@ -125,8 +126,8 @@ public void testPublishWithoutKey() throws Exception {
125126
.thenReturn(Partition.of(0))
126127
.thenReturn(Partition.of(1));
127128

128-
publisher.publish(messageA);
129-
publisher.publish(messageB);
129+
Future<?> unusedFutureA = publisher.publish(messageA);
130+
Future<?> unusedFutureB = publisher.publish(messageB);
130131

131132
verify(publisher0).publish(messageA);
132133
verify(publisher1).publish(messageB);
@@ -137,7 +138,7 @@ public void testPublishWithBadRouting() throws Exception {
137138
Message message = Message.builder().build();
138139

139140
when(mockRoutingPolicy.routeWithoutKey()).thenReturn(Partition.of(4));
140-
publisher.publish(message);
141+
Future<?> unusedFuture = publisher.publish(message);
141142

142143
ApiExceptionMatcher.assertThrowableMatches(
143144
publisher.failureCause(), StatusCode.Code.FAILED_PRECONDITION);
@@ -181,9 +182,9 @@ public void testIncreaseSucceeds() throws Exception {
181182
when(mockRoutingPolicy.route(message1.key())).thenReturn(Partition.of(1));
182183
when(mockRoutingPolicy.route(message2.key())).thenReturn(Partition.of(2));
183184

184-
publisher.publish(message0);
185-
publisher.publish(message1);
186-
publisher.publish(message2);
185+
Future<?> unusedFuture0 = publisher.publish(message0);
186+
Future<?> unusedFuture1 = publisher.publish(message1);
187+
Future<?> unusedFuture2 = publisher.publish(message2);
187188

188189
verify(publisher0).publish(message0);
189190
verify(publisher1).publish(message1);
@@ -199,8 +200,8 @@ public void testDecreaseIgnored() throws Exception {
199200
when(mockRoutingPolicy.route(message0.key())).thenReturn(Partition.of(0));
200201
when(mockRoutingPolicy.route(message1.key())).thenReturn(Partition.of(1));
201202

202-
publisher.publish(message0);
203-
publisher.publish(message1);
203+
Future<?> unusedFuture0 = publisher.publish(message0);
204+
Future<?> unusedFuture1 = publisher.publish(message1);
204205

205206
verify(publisher0).publish(message0);
206207
verify(publisher1).publish(message1);
@@ -216,8 +217,8 @@ public void testNoopConfigUpdate() throws Exception {
216217
when(mockRoutingPolicy.route(message0.key())).thenReturn(Partition.of(0));
217218
when(mockRoutingPolicy.route(message1.key())).thenReturn(Partition.of(1));
218219

219-
publisher.publish(message0);
220-
publisher.publish(message1);
220+
Future<?> unusedFuture0 = publisher.publish(message0);
221+
Future<?> unusedFuture1 = publisher.publish(message1);
221222

222223
verify(publisher0).publish(message0);
223224
verify(publisher1).publish(message1);

pom.xml

+19-14
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
<artifactId>auto-service-annotations</artifactId>
4545
<version>1.0</version>
4646
</dependency>
47+
<dependency>
48+
<groupId>javax.annotation</groupId>
49+
<artifactId>javax.annotation-api</artifactId>
50+
<version>1.3.2</version>
51+
</dependency>
4752
<dependency>
4853
<groupId>com.google.truth</groupId>
4954
<artifactId>truth</artifactId>
@@ -98,7 +103,13 @@
98103
<source>1.8</source>
99104
<target>1.8</target>
100105
<encoding>UTF-8</encoding>
101-
<compilerArgument>-Xlint:unchecked</compilerArgument>
106+
<compilerArgs>
107+
<arg>-Xlint:all</arg>
108+
<!-- UNCOMMENT FOR ERRORPRONE>
109+
<arg>-XDcompilePolicy=simple</arg>
110+
<arg>-Xplugin:ErrorProne</arg>
111+
</!-->
112+
</compilerArgs>
102113
<annotationProcessorPaths>
103114
<path>
104115
<groupId>com.google.auto.value</groupId>
@@ -110,6 +121,13 @@
110121
<artifactId>auto-service</artifactId>
111122
<version>1.0</version>
112123
</path>
124+
<!-- UNCOMMENT FOR ERRORPRONE>
125+
<path>
126+
<groupId>com.google.errorprone</groupId>
127+
<artifactId>error_prone_core</artifactId>
128+
<version>2.7.1</version>
129+
</path>
130+
</!-->
113131
</annotationProcessorPaths>
114132
</configuration>
115133
</plugin>
@@ -125,19 +143,6 @@
125143
</modules>
126144

127145
<profiles>
128-
<profile>
129-
<id>java8</id>
130-
<activation>
131-
<jdk>[8,)</jdk>
132-
</activation>
133-
<dependencies>
134-
<dependency>
135-
<groupId>javax.annotation</groupId>
136-
<artifactId>javax.annotation-api</artifactId>
137-
</dependency>
138-
</dependencies>
139-
</profile>
140-
141146
<profile>
142147
<id>include-samples</id>
143148
<modules>

pubsublite-beam-io/src/main/java/com/google/cloud/pubsublite/beam/SubscriberOptions.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,11 @@ private SubscriberServiceClient newSubscriberServiceClient(Partition partition)
113113
throws ApiException {
114114
try {
115115
SubscriberServiceSettings.Builder settingsBuilder = SubscriberServiceSettings.newBuilder();
116-
addDefaultMetadata(
117-
PubsubContext.of(FRAMEWORK),
118-
RoutingMetadata.of(subscriptionPath(), partition),
119-
settingsBuilder);
116+
settingsBuilder =
117+
addDefaultMetadata(
118+
PubsubContext.of(FRAMEWORK),
119+
RoutingMetadata.of(subscriptionPath(), partition),
120+
settingsBuilder);
120121
return SubscriberServiceClient.create(
121122
addDefaultSettings(subscriptionPath().location().region(), settingsBuilder));
122123
} catch (Throwable t) {

0 commit comments

Comments
 (0)