Skip to content
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
16 changes: 3 additions & 13 deletions ambry-benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,11 @@
// Unless required by applicable law or agreed to in writing, software distributed
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied.
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.8"
}
plugins {
id 'java'
id 'me.champeau.jmh' version '0.7.3'
}

apply plugin: "me.champeau.gradle.jmh"
apply plugin: 'java'

dependencies {
jmh "commons-codec:commons-codec:$commonsVersion"
}
Expand All @@ -32,7 +23,6 @@ jmh {
iterations = 2
timeOnIteration = '5s'
fork = 1
include = 'com\\.github\\.ambry\\..*'

// Enable GC profiler by default to track memory allocations
// Shows allocation rate (MB/sec) and normalized allocation (B/op)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.microsoft.aad.msal4j.ClientCredentialParameters;
import com.microsoft.aad.msal4j.ConfidentialClientApplication;
import com.microsoft.aad.msal4j.IAuthenticationResult;
import com.mysql.cj.util.StringUtils;
import org.apache.commons.lang3.StringUtils;
import java.net.MalformedURLException;
import java.time.OffsetDateTime;
import java.util.Collections;
Expand Down Expand Up @@ -104,11 +104,11 @@ protected BlobServiceAsyncClient buildBlobServiceAsyncClient(HttpClient httpClie
@Override
protected void validateABSAuthConfigs(AzureCloudConfig azureCloudConfig) {
if (storageAccountInfo() != null) {
if (StringUtils.isNullOrEmpty(storageAccountInfo().getStorageScope())) {
if (StringUtils.isEmpty(storageAccountInfo().getStorageScope())) {
throw new IllegalArgumentException(String.format("Storage account %s is missing the %s setting",
storageAccountInfo().getName(), AZURE_STORAGE_ACCOUNT_INFO_STORAGE_SCOPE));
}
if (StringUtils.isNullOrEmpty(storageAccountInfo().getStorageEndpoint())) {
if (StringUtils.isEmpty(storageAccountInfo().getStorageEndpoint())) {
throw new IllegalArgumentException(
String.format("Storage account %s is missing the %s setting", storageAccountInfo().getName(),
AZURE_STORAGE_ACCOUNT_INFO_STORAGE_ENDPOINT));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import javax.sql.DataSource;
import joptsimple.internal.Strings;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -250,7 +250,7 @@ public void deleteHostAccountStorageStatsForHost(String hostname, int port) thro
* Read all the container storage usage from local backup file.
*/
private void readStatsFromLocalBackupFile() {
if (!Strings.isNullOrEmpty(config.localBackupFilePath)) {
if (!StringUtils.isEmpty(config.localBackupFilePath)) {
// load backup file and this backup is the previous stats
ObjectMapper objectMapper = new ObjectMapper();
try {
Expand Down
612 changes: 366 additions & 246 deletions build.gradle

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions gradle/buildscript.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ repositories {
}

dependencies {
classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0"
classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1"
classpath "org.shipkit:shipkit-auto-version:0.0.30"
// this is actually the artifactory plugin
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0"
classpath "org.gradle:test-retry-gradle-plugin:1.3.1"
classpath "org.gradle:test-retry-gradle-plugin:1.5.8"
}
4 changes: 4 additions & 0 deletions gradle/dependency-versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ext {
commonsVersion = "1.9"
bouncycastleVersion = "1.64"
javaxVersion = "3.0.1"
jsr305Version = "3.0.2"
nettyVersion = "4.1.79.Final"
nettyTcNativeBoringSSLStatic_linux_x86_64 = "2.0.61.Final:linux-x86_64"
nettyTcNativeBoringSSLStatic_osx_aarch_64 = "2.0.61.Final:osx-aarch_64"
Expand All @@ -37,4 +38,7 @@ ext {
caffeineVersion = "2.9.3"
hadoopCommonVersion = "3.3.6"
commonsLangVersion = "3.12.0"
httpclientVersion = "4.5.14"
guavaVersion = "32.0.0-jre"
commonsIoVersion = "2.11.0"
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Mon Feb 10 10:27:18 PST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
Loading