Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: Update google-cloud-pubsublite-parent version to 1.14.5 #488

Merged
merged 3 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsublite-parent</artifactId>
<version>1.12.1</version>
<version>1.14.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
Expand All @@ -17,27 +17,24 @@
<module>pubsublite-kafka</module>
<module>pubsublite-kafka-auth</module>
</modules>
<properties>
<psl.version>1.12.1</psl.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-pubsublite-v1</artifactId>
<version>${psl.version}</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsublite</artifactId>
<version>${psl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>3.8.0</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-pubsublite-v1</artifactId>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-pubsublite</artifactId>
</dependency>
</dependencies>
</project>
20 changes: 18 additions & 2 deletions pubsublite-kafka-auth/pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>pubsublite-kafka-parent</artifactId>
Expand Down Expand Up @@ -31,4 +33,18 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
</project>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<usedDependencies>
<dependency>com.google.flogger:google-extensions</dependency>
<dependency>com.google.api.grpc:proto-google-cloud-pubsublite-v1</dependency>
</usedDependencies>
</configuration>
</plugin>
</plugins>
</build>
</project>
9 changes: 0 additions & 9 deletions pubsublite-kafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
<groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</dependency>
<!--test dependencies-->
<dependency>
<groupId>junit</groupId>
Expand All @@ -69,11 +65,6 @@
<artifactId>truth</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.truth.extensions</groupId>
<artifactId>truth-java8-extension</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import com.google.cloud.pubsublite.proto.SequencedMessage;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import java.util.ArrayDeque;
import java.util.Optional;

Expand All @@ -44,13 +43,10 @@ class SinglePartitionSubscriber extends ProxyService {

private final CloseableMonitor monitor = new CloseableMonitor();

@GuardedBy("monitor.monitor")
private BlockingPullSubscriber subscriber;

@GuardedBy("monitor.monitor")
private boolean needsCommitting = false;

@GuardedBy("monitor.monitor")
private Optional<Offset> lastReceived = Optional.empty();

SinglePartitionSubscriber(
Expand Down Expand Up @@ -99,7 +95,6 @@ ApiFuture<Void> onData() {
}
}

@GuardedBy("monitor.monitor")
private ArrayDeque<SequencedMessage> pullMessages() throws CheckedApiException {
ArrayDeque<SequencedMessage> messages = new ArrayDeque<>();
for (Optional<SequencedMessage> message = subscriber.messageIfAvailable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.flogger.GoogleLogger;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.errorprone.annotations.concurrent.GuardedBy;
import java.time.Duration;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
Expand Down Expand Up @@ -67,11 +66,9 @@ class SingleSubscriptionConsumerImpl implements SingleSubscriptionConsumer {

private final CloseableMonitor monitor = new CloseableMonitor();

@GuardedBy("monitor.monitor")
private final Map<Partition, SinglePartitionSubscriber> partitions = new HashMap<>();
// When the set of assignments changes, this future will be set and swapped with a new future to
// let ongoing pollers know that they should pick up new assignments.
@GuardedBy("monitor.monitor")
private SettableApiFuture<Void> assignmentChanged = SettableApiFuture.create();

// Set when wakeup() has been called once.
Expand All @@ -89,7 +86,6 @@ class SingleSubscriptionConsumerImpl implements SingleSubscriptionConsumer {
}

@Override
@SuppressWarnings("GuardedBy")
public void setAssignment(Set<Partition> assignment) {
try (CloseableMonitor.Hold h = monitor.enter()) {

Expand Down Expand Up @@ -214,7 +210,6 @@ public ApiFuture<Map<Partition, Offset>> commitAll() {
}

@Override
@SuppressWarnings("GuardedBy")
public ApiFuture<Void> commit(Map<Partition, Offset> commitOffsets) {
try (CloseableMonitor.Hold h = monitor.enter()) {
ImmutableList.Builder<ApiFuture<?>> commitFutures = ImmutableList.builder();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.google.cloud.pubsublite.kafka;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import static com.google.cloud.pubsublite.internal.testing.UnitTestExamples.example;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.google.cloud.pubsublite.kafka;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
import static org.junit.Assert.assertThrows;

import com.google.api.gax.rpc.StatusCode.Code;
Expand Down
Loading