Merge pull request #540 from weaviate/async-replication-config-updates

Update argument naming

Author: bevzzz

src/it/java/io/weaviate/integration/CollectionsITest.java

@@ -345,11 +345,11 @@ public void test_asyncReplicationConfig() throws IOException {
                 .asyncReplication(AsyncReplicationConfig.of(
                     async -> async
                         .hashTreeHeight(1)
-                        .replicationConcurrency(2)
-                        .replicationFrequencyMillis(3)
-                        .replicationFrequencyMillisWhilePropagating(4)
-                        .nodePingFrequencyMillis(5)
-                        .loggingFrequencyMillis(6)
+                        .maxWorkers(2)
+                        .frequencyMillis(3)
+                        .frequencyMillisWhilePropagating(4)
+                        .aliveNodesCheckingFrequencyMillis(5)
+                        .loggingFrequencySeconds(6)
                         .diffBatchSize(7)
                         .diffPerNodeTimeoutSeconds(8)
                         .prePropagationTimeoutSeconds(9)
@@ -364,11 +364,11 @@ public void test_asyncReplicationConfig() throws IOException {
         .extracting(CollectionConfig::replication)
         .extracting(Replication::asyncReplicationConfig)
         .returns(1, AsyncReplicationConfig::hashTreeHeight)
-        .returns(2, AsyncReplicationConfig::replicationConcurrency)
-        .returns(3, AsyncReplicationConfig::replicationFrequencyMillis)
-        .returns(4, AsyncReplicationConfig::replicationFrequencyMillisWhilePropagating)
-        .returns(5, AsyncReplicationConfig::nodePingFrequencyMillis)
-        .returns(6, AsyncReplicationConfig::loggingFrequencyMillis)
+        .returns(2, AsyncReplicationConfig::maxWorkers)
+        .returns(3, AsyncReplicationConfig::frequencyMillis)
+        .returns(4, AsyncReplicationConfig::frequencyMillisWhilePropagating)
+        .returns(5, AsyncReplicationConfig::aliveNodesCheckingFrequencyMillis)
+        .returns(6, AsyncReplicationConfig::loggingFrequencySeconds)
         .returns(7, AsyncReplicationConfig::diffBatchSize)
         .returns(8, AsyncReplicationConfig::diffPerNodeTimeoutSeconds)
         .returns(9, AsyncReplicationConfig::prePropagationTimeoutSeconds)

src/main/java/io/weaviate/client6/v1/api/collections/Replication.java

@@ -35,11 +35,11 @@ public Replication(Builder builder) {
 
   public static record AsyncReplicationConfig(
       @SerializedName("hashtreeHeight") Integer hashTreeHeight,
-      @SerializedName("maxWorkers") Integer replicationConcurrency,
-      @SerializedName("frequency") Integer replicationFrequencyMillis,
-      @SerializedName("frequencyWhilePropagating") Integer replicationFrequencyMillisWhilePropagating,
-      @SerializedName("aliveNodesCheckingFrequency") Integer nodePingFrequencyMillis,
-      @SerializedName("loggingFrequency") Integer loggingFrequencyMillis,
+      @SerializedName("maxWorkers") Integer maxWorkers,
+      @SerializedName("frequency") Integer frequencyMillis,
+      @SerializedName("frequencyWhilePropagating") Integer frequencyMillisWhilePropagating,
+      @SerializedName("aliveNodesCheckingFrequency") Integer aliveNodesCheckingFrequencyMillis,
+      @SerializedName("loggingFrequency") Integer loggingFrequencySeconds,
       @SerializedName("diffBatchSize") Integer diffBatchSize,
       @SerializedName("diffPerNodeTimeout") Integer diffPerNodeTimeoutSeconds,
       @SerializedName("prePropagationTimeout") Integer prePropagationTimeoutSeconds,
@@ -52,11 +52,11 @@ public static record AsyncReplicationConfig(
     public AsyncReplicationConfig(Builder builder) {
       this(
           builder.hashTreeHeight,
-          builder.replicationConcurrency,
-          builder.replicationFrequencyMillis,
-          builder.replicationFrequencyMillisWhilePropagating,
-          builder.nodePingFrequencyMillis,
-          builder.loggingFrequencyMillis,
+          builder.maxWorkers,
+          builder.frequencyMillis,
+          builder.frequencyMillisWhilePropagating,
+          builder.aliveNodesCheckingFrequencyMillis,
+          builder.loggingFrequencySeconds,
           builder.diffBatchSize,
           builder.diffPerNodeTimeoutSeconds,
           builder.prePropagationTimeoutSeconds,
@@ -73,11 +73,11 @@ public static AsyncReplicationConfig of(Function<Builder, ObjectBuilder<AsyncRep
 
     public static class Builder implements ObjectBuilder<AsyncReplicationConfig> {
       private Integer hashTreeHeight;
-      private Integer replicationConcurrency;
-      private Integer replicationFrequencyMillis;
-      private Integer replicationFrequencyMillisWhilePropagating;
-      private Integer nodePingFrequencyMillis;
-      private Integer loggingFrequencyMillis;
+      private Integer maxWorkers;
+      private Integer frequencyMillis;
+      private Integer frequencyMillisWhilePropagating;
+      private Integer aliveNodesCheckingFrequencyMillis;
+      private Integer loggingFrequencySeconds;
       private Integer diffBatchSize;
       private Integer diffPerNodeTimeoutSeconds;
       private Integer prePropagationTimeoutSeconds;
@@ -94,38 +94,38 @@ public Builder hashTreeHeight(int hashTreeHeight) {
       }
 
       /** Maximum number of async replication workers. */
-      public Builder replicationConcurrency(int replicationConcurrency) {
-        this.replicationConcurrency = replicationConcurrency;
+      public Builder maxWorkers(int maxWorkers) {
+        this.maxWorkers = maxWorkers;
         return this;
       }
 
       /**
        * Base frequency in milliseconds at which async replication
        * runs diff calculations.
        */
-      public Builder replicationFrequencyMillis(int replicationFrequencyMillis) {
-        this.replicationFrequencyMillis = replicationFrequencyMillis;
+      public Builder frequencyMillis(int frequencyMillis) {
+        this.frequencyMillis = frequencyMillis;
         return this;
       }
 
       /**
        * Frequency in milliseconds at which async replication runs
        * while propagation is active.
        */
-      public Builder replicationFrequencyMillisWhilePropagating(int replicationFrequencyMillisWhilePropagating) {
-        this.replicationFrequencyMillisWhilePropagating = replicationFrequencyMillisWhilePropagating;
+      public Builder frequencyMillisWhilePropagating(int frequencyMillisWhilePropagating) {
+        this.frequencyMillisWhilePropagating = frequencyMillisWhilePropagating;
         return this;
       }
 
       /** Interval in milliseconds at which liveness of target nodes is checked." */
-      public Builder nodePingFrequencyMillis(int nodePingFrequencyMillis) {
-        this.nodePingFrequencyMillis = nodePingFrequencyMillis;
+      public Builder aliveNodesCheckingFrequencyMillis(int aliveNodesCheckingFrequencyMillis) {
+        this.aliveNodesCheckingFrequencyMillis = aliveNodesCheckingFrequencyMillis;
         return this;
       }
 
       /** Interval in seconds at which async replication logs its status. */
-      public Builder loggingFrequencyMillis(int loggingFrequencyMillis) {
-        this.loggingFrequencyMillis = loggingFrequencyMillis;
+      public Builder loggingFrequencySeconds(int loggingFrequencySeconds) {
+        this.loggingFrequencySeconds = loggingFrequencySeconds;
         return this;
       }