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

Updated plugins to work with Java 21 #108

Merged
merged 1 commit into from
Nov 17, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.it;


import io.streamnative.oxia.client.OxiaClientBuilder;
import io.streamnative.oxia.client.shard.NamespaceNotFoundException;
import io.streamnative.oxia.testcontainers.OxiaContainer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.metrics.api;


import java.util.Map;
import lombok.NonNull;

Expand Down
16 changes: 13 additions & 3 deletions client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@

<properties>
<caffeine.version>3.1.4</caffeine.version>
<grpc.version>1.51.0</grpc.version>
<grpc.version>1.59.0</grpc.version>
<grpc-test.version>1.2.2</grpc-test.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<protobuf.version>3.21.7</protobuf.version>
<protobuf.version>3.25.0</protobuf.version>
<reactor.version>3.5.2</reactor.version>
<reactor-grpc.version>1.2.3</reactor-grpc.version>
<reactor-grpc.version>1.2.4</reactor-grpc.version>
<zah.version>0.16</zah.version>
</properties>

Expand All @@ -58,6 +58,11 @@
<artifactId>caffeine</artifactId>
<version>${caffeine.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.salesforce.servicelibs</groupId>
<artifactId>reactor-grpc-stub</artifactId>
Expand Down Expand Up @@ -95,6 +100,11 @@
<artifactId>zero-allocation-hashing</artifactId>
<version>${zah.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client;


import io.streamnative.oxia.client.metrics.api.Metrics;
import java.time.Duration;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client;


import java.util.Comparator;
import java.util.function.Predicate;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client;


import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client;


import java.nio.ByteBuffer;

public class ProtoUtil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client;


import io.streamnative.oxia.client.api.AsyncOxiaClient;
import io.streamnative.oxia.client.api.DeleteOption;
import io.streamnative.oxia.client.api.GetResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import io.streamnative.oxia.proto.GetResponse;
import lombok.NonNull;
import lombok.Value;
Expand All @@ -25,6 +24,7 @@
public class GetResult {
/** The value associated with the key specified in the call. */
byte @NonNull [] value;

/** Metadata for the record associated with the key specified in the call. */
@NonNull Version version;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import lombok.Getter;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import lombok.NonNull;

/** A notification from an Oxia server indicating a change to a record associated with a key. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import io.streamnative.oxia.proto.PutResponse;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import java.util.List;
import java.util.function.Consumer;
import lombok.NonNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import lombok.Getter;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.api;


import java.util.Optional;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.grpc;


import java.util.Objects;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.grpc;


import lombok.NonNull;
import lombok.SneakyThrows;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.shard;


import lombok.Getter;
import lombok.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.shard;


import lombok.Getter;
import lombok.NonNull;

Expand All @@ -34,6 +33,7 @@ public NoShardAvailableException(@NonNull String key) {
this.key = key;
this.shardId = null;
}

/**
* Creates an instance of the exception.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.shard;


import java.util.function.Predicate;
import lombok.NonNull;

Expand Down
4 changes: 4 additions & 0 deletions etc/findbugsExclude.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@
<Class name="io.streamnative.oxia.client.OxiaClientBuilder" />
<Bug pattern="URF_UNREAD_FIELD" />
</Match>
<Match>
<Package name="io.streamnative.oxia.client" />
<Bug pattern="CT_CONSTRUCTOR_THROW" />
</Match>
</FindBugsFilter>
4 changes: 4 additions & 0 deletions perf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.streamnative.oxia.client.perf.PerfClient</mainClass>
</transformer>
</transformers>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.oxia.client.perf;


import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import io.streamnative.oxia.client.OxiaClientBuilder;
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@

<assertj.version>3.24.1</assertj.version>
<awaitility.version>3.0.0</awaitility.version>
<checkstyle.version>10.3.3</checkstyle.version>
<lombok.version>1.18.24</lombok.version>
<slf4j.version>2.0.5</slf4j.version>
<checkstyle.version>10.12.5</checkstyle.version>
<lombok.version>1.18.30</lombok.version>
<slf4j.version>1.7.32</slf4j.version>
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<mockito.junit.jupiter.version>4.11.0</mockito.junit.jupiter.version>
<opentelemetry.version>1.23.1</opentelemetry.version>
<testcontainers.version>1.17.6</testcontainers.version>

<checkstyle.plugin.version>3.2.0</checkstyle.plugin.version>
<checkstyle.plugin.version>3.3.1</checkstyle.plugin.version>
<jacoco.plugin.version>0.8.8</jacoco.plugin.version>
<license.plugin.version>4.1</license.plugin.version>
<maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
<maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
<maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
<spotbugs.plugin.version>4.7.2.0</spotbugs.plugin.version>
<spotless.plugin.version>2.25.0</spotless.plugin.version>
<spotbugs.plugin.version>4.8.1.0</spotbugs.plugin.version>
<spotless.plugin.version>2.39.0</spotless.plugin.version>
</properties>

<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions pulsar-metadatastore-oxia/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
<maven.enforcer.plugin.version>3.1.0</maven.enforcer.plugin.version>
<maven.shade.plugin.version>3.4.1</maven.shade.plugin.version>
<maven.surefire.plugin.version>3.0.0-M7</maven.surefire.plugin.version>
<spotbugs.plugin.version>4.7.2.0</spotbugs.plugin.version>
<spotless.plugin.version>2.25.0</spotless.plugin.version>
<spotbugs.plugin.version>4.8.1.0</spotbugs.plugin.version>
<spotless.plugin.version>2.39.0</spotless.plugin.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.client.OxiaClientBuilder;
import io.streamnative.oxia.client.api.AsyncOxiaClient;
import io.streamnative.oxia.client.api.DeleteOption;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import lombok.NonNull;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.pulsar.metadata.api.MetadataStore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import java.util.function.Supplier;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import java.util.function.Supplier;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import java.util.function.Supplier;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import lombok.Getter;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import java.util.function.Supplier;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import java.util.function.Supplier;
import org.apache.pulsar.metadata.impl.MetadataStoreFactoryImpl;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia.bookkeeper;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import io.streamnative.pulsarmetadatastoreoxia.OxiaTestBase;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia.bookkeeper;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import io.streamnative.pulsarmetadatastoreoxia.OxiaTestBase;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package io.streamnative.pulsarmetadatastoreoxia.bookkeeper;


import io.streamnative.oxia.testcontainers.OxiaContainer;
import io.streamnative.pulsarmetadatastoreoxia.OxiaTestBase;
import lombok.Getter;
Expand Down
Loading