diff --git a/.github/workflows/RavenClient.yml b/.github/workflows/RavenClient.yml index bbfbc109..f99ee302 100644 --- a/.github/workflows/RavenClient.yml +++ b/.github/workflows/RavenClient.yml @@ -27,12 +27,13 @@ jobs: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java-version }} + distribution: "zulu" - name: Download RavenDB Server run: wget -O RavenDB.tar.bz2 "https://hibernatingrhinos.com/downloads/RavenDB%20for%20Linux%20x64/latest?buildType=${{ env.RAVENDB_BUILD_TYPE }}&version=${{ matrix.serverVersion }}" diff --git a/src/main/java/net/ravendb/client/documents/subscriptions/SubscriptionState.java b/src/main/java/net/ravendb/client/documents/subscriptions/SubscriptionState.java index f7299491..c0ea9680 100644 --- a/src/main/java/net/ravendb/client/documents/subscriptions/SubscriptionState.java +++ b/src/main/java/net/ravendb/client/documents/subscriptions/SubscriptionState.java @@ -16,8 +16,8 @@ public class SubscriptionState { private String nodeTag; private Date lastBatchAckTime; private Date lastClientConnectionTime; + private long raftCommandIndex; private boolean disabled; - private Long raftCommandIndex; private ArchivedDataProcessingBehavior archivedDataProcessingBehavior; private SubscriptionShardingState shardingState; @@ -78,14 +78,6 @@ public void setNodeTag(String nodeTag) { this.nodeTag = nodeTag; } - public Long getRaftCommandIndex() { - return raftCommandIndex; - } - - public void setRaftCommandIndex(Long raftCommandIndex) { - this.raftCommandIndex = raftCommandIndex; - } - public Date getLastBatchAckTime() { return lastBatchAckTime; } @@ -102,6 +94,14 @@ public void setLastClientConnectionTime(Date lastClientConnectionTime) { this.lastClientConnectionTime = lastClientConnectionTime; } + public long getRaftCommandIndex() { + return raftCommandIndex; + } + + public void setRaftCommandIndex(long raftCommandIndex) { + this.raftCommandIndex = raftCommandIndex; + } + public boolean isDisabled() { return disabled; } diff --git a/src/main/java/net/ravendb/client/serverwide/operations/logs/SetLogsConfigurationOperation.java b/src/main/java/net/ravendb/client/serverwide/operations/logs/SetLogsConfigurationOperation.java index 391f137a..7c2d214d 100644 --- a/src/main/java/net/ravendb/client/serverwide/operations/logs/SetLogsConfigurationOperation.java +++ b/src/main/java/net/ravendb/client/serverwide/operations/logs/SetLogsConfigurationOperation.java @@ -63,6 +63,7 @@ public static class Parameters { private Duration retentionTime; private Long retentionSize; private boolean compress; + private boolean persist; public Parameters(GetLogsConfigurationResult getLogs) { mode = getLogs.getMode(); @@ -105,5 +106,13 @@ public LogMode getMode() { public void setMode(LogMode mode) { this.mode = mode; } + + public boolean isPersist() { + return persist; + } + + public void setPersist(boolean persist) { + this.persist = persist; + } } } diff --git a/src/main/java/net/ravendb/client/serverwide/operations/trafficWatch/PutTrafficWatchConfigurationOperation.java b/src/main/java/net/ravendb/client/serverwide/operations/trafficWatch/PutTrafficWatchConfigurationOperation.java index 33b2b388..2a72197b 100644 --- a/src/main/java/net/ravendb/client/serverwide/operations/trafficWatch/PutTrafficWatchConfigurationOperation.java +++ b/src/main/java/net/ravendb/client/serverwide/operations/trafficWatch/PutTrafficWatchConfigurationOperation.java @@ -67,6 +67,7 @@ public static class Parameters { private List httpMethods; private List changeTypes; private List certificateThumbprints; + private boolean persist; /** * @return Traffic Watch logging mode. @@ -193,5 +194,19 @@ public List getCertificateThumbprints() { public void setCertificateThumbprints(List certificateThumbprints) { this.certificateThumbprints = certificateThumbprints; } + + /** + * @return Indicates if the configuration should be persisted to the configuration file + */ + public boolean isPersist() { + return persist; + } + + /** + * @param persist Indicates if the configuration should be persisted to the configuration file + */ + public void setPersist(boolean persist) { + this.persist = persist; + } } }