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

fix(deps): update errorproneversion to v2.30.0 (main) (minor) #11991

Merged
merged 2 commits into from
Aug 12, 2024
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,10 +15,10 @@
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
import com.google.errorprone.matchers.Description;
import com.google.inject.Inject;
import com.sun.source.tree.ClassTree;
import com.sun.source.tree.MethodTree;
import com.sun.source.util.TreePath;
import javax.inject.Inject;

@AutoService(BugChecker.class)
@BugPattern(
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ val DEPENDENCY_BOMS = listOf(

val autoServiceVersion = "1.1.1"
val autoValueVersion = "1.11.0"
val errorProneVersion = "2.29.2"
val errorProneVersion = "2.30.0"
val byteBuddyVersion = "1.14.18"
val asmVersion = "9.7"
val jmhVersion = "1.37"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ public abstract class ClickHouseDbRequest {
private static final SqlStatementSanitizer sanitizer =
SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());

public static ClickHouseDbRequest create(String host, Integer port, String dbName, String sql) {
public static ClickHouseDbRequest create(String host, int port, String dbName, String sql) {
return new AutoValue_ClickHouseDbRequest(host, port, dbName, sanitizer.sanitize(sql));
}

public abstract String getHost();

public abstract Integer getPort();
public abstract int getPort();

public abstract String getDbName();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.net.URI;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
Expand Down Expand Up @@ -103,7 +104,7 @@ private Future<Response> doSendRequest(Request request, URI uri) {
protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
optionsBuilder.setSingleConnectionFactory(
(host, port) -> {
URI uri = URI.create(String.format("http://%s:%d", host, port));
URI uri = URI.create(String.format(Locale.ROOT, "http://%s:%d", host, port));
Service<Request, Response> svc = getClient(uri, ClientType.SINGLE_CONN);
return (path, headers) -> {
// this is synchronized bc so is the Netty one;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package spring.jpa;

import java.util.Locale;
import java.util.Objects;
import javax.annotation.Nullable;
import javax.persistence.Entity;
Expand Down Expand Up @@ -55,7 +56,8 @@ public void setLastName(String lastName) {

@Override
public String toString() {
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
return String.format(
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import java.util.Locale;
import java.util.Objects;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -55,7 +56,8 @@ public void setLastName(String lastName) {

@Override
public String toString() {
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
return String.format(
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ public abstract class InfluxDbRequest {
SqlStatementSanitizer.create(AgentCommonConfig.get().isStatementSanitizationEnabled());

public static InfluxDbRequest create(
String host, Integer port, String dbName, String operation, String sql) {
String host, int port, String dbName, String operation, String sql) {
return new AutoValue_InfluxDbRequest(host, port, dbName, operation, sanitizer.sanitize(sql));
}

public abstract String getHost();

public abstract Integer getPort();
public abstract int getPort();

public abstract String getDbName();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package spring.jpa;

import java.util.Locale;
import java.util.Objects;
import javax.annotation.Nullable;
import javax.persistence.Entity;
Expand Down Expand Up @@ -55,7 +56,8 @@ public void setLastName(String lastName) {

@Override
public String toString() {
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
return String.format(
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package io.opentelemetry.javaagent.instrumentation.spring.data.v3_0.repository;

import java.util.Locale;
import java.util.Objects;
import javax.annotation.Nullable;
import org.springframework.data.annotation.Id;
Expand Down Expand Up @@ -49,7 +50,8 @@ public void setLastName(String lastName) {

@Override
public String toString() {
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
return String.format(
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import java.util.Locale;
import java.util.Objects;
import javax.annotation.Nullable;

Expand Down Expand Up @@ -55,7 +56,8 @@ public void setLastName(String lastName) {

@Override
public String toString() {
return String.format("Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
return String.format(
Locale.ROOT, "Customer[id=%d, firstName='%s', lastName='%s']", id, firstName, lastName);
}

@Override
Expand Down
Loading