Skip to content
This repository was archived by the owner on Nov 14, 2024. It is now read-only.

Excavator: Upgrades Baseline to the latest version #6072

Merged
bulldozer-bot merged 1 commit into from
Jun 14, 2022
Merged

Excavator: Upgrades Baseline to the latest version #6072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
dependencies {
classpath 'com.netflix.nebula:gradle-info-plugin:11.3.3'
classpath 'com.netflix.nebula:nebula-publishing-plugin:18.4.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.139.0'
classpath 'com.palantir.baseline:gradle-baseline-java:4.143.0'
classpath 'com.palantir.gradle.conjure:gradle-conjure:5.27.0'
classpath 'com.palantir.gradle.docker:gradle-docker:0.32.0'
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
Expand Down
8 changes: 4 additions & 4 deletions timelock-impl/src/main/java/com/palantir/atlasdb/timelock/ConjureTimelockResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.palantir.atlasdb.timelock;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
Expand Down Expand Up @@ -58,7 +59,6 @@
import com.palantir.lock.watch.LockWatchVersion;
import com.palantir.timestamp.TimestampRange;
import com.palantir.tokens.auth.AuthHeader;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
Expand Down Expand Up @@ -150,7 +150,7 @@ public ListenableFuture<ConjureWaitForLocksResponse> waitForLocks(
}

private static Set<LockDescriptor> fromConjureLockDescriptors(Set<ConjureLockDescriptor> lockDescriptors) {
Set<LockDescriptor> descriptors = new HashSet<>(lockDescriptors.size());
Set<LockDescriptor> descriptors = Sets.newHashSetWithExpectedSize(lockDescriptors.size());
for (ConjureLockDescriptor descriptor : lockDescriptors) {
descriptors.add(ByteArrayLockDescriptor.of(descriptor.get().asNewByteArray()));
}
Expand All @@ -177,15 +177,15 @@ public ListenableFuture<ConjureUnlockResponse> unlock(
}

private static Set<LockToken> fromConjureLockTokens(Set<ConjureLockToken> lockTokens) {
Set<LockToken> tokens = new HashSet<>(lockTokens.size());
Set<LockToken> tokens = Sets.newHashSetWithExpectedSize(lockTokens.size());
for (ConjureLockToken token : lockTokens) {
tokens.add(LockToken.of(token.getRequestId()));
}
return tokens;
}

private static Set<ConjureLockToken> toConjureLockTokens(Set<LockToken> lockTokens) {
Set<ConjureLockToken> tokens = new HashSet<>(lockTokens.size());
Set<ConjureLockToken> tokens = Sets.newHashSetWithExpectedSize(lockTokens.size());
for (LockToken token : lockTokens) {
tokens.add(ConjureLockToken.of(token.getRequestId()));
}
Expand Down