fix(deps): update errorproneversion to v2.41.0 (minor) (#14331)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
parent
4efd3d263b
commit
c965b09dd7
|
|
@ -6,13 +6,14 @@
|
||||||
package com.google.errorprone.bugpatterns.checkreturnvalue;
|
package com.google.errorprone.bugpatterns.checkreturnvalue;
|
||||||
|
|
||||||
import com.google.errorprone.ErrorProneFlags;
|
import com.google.errorprone.ErrorProneFlags;
|
||||||
|
import com.google.errorprone.bugpatterns.WellKnownKeep;
|
||||||
|
|
||||||
public final class CanIgnoreReturnValueSuggesterFactory {
|
public final class CanIgnoreReturnValueSuggesterFactory {
|
||||||
|
|
||||||
// calls package private constructor of CanIgnoreReturnValueSuggester
|
// calls package private constructor of CanIgnoreReturnValueSuggester
|
||||||
public static CanIgnoreReturnValueSuggester createCanIgnoreReturnValueSuggester(
|
public static CanIgnoreReturnValueSuggester createCanIgnoreReturnValueSuggester(
|
||||||
ErrorProneFlags errorProneFlags) {
|
ErrorProneFlags errorProneFlags, WellKnownKeep wellKnownKeep) {
|
||||||
return new CanIgnoreReturnValueSuggester(errorProneFlags);
|
return new CanIgnoreReturnValueSuggester(errorProneFlags, wellKnownKeep);
|
||||||
}
|
}
|
||||||
|
|
||||||
private CanIgnoreReturnValueSuggesterFactory() {}
|
private CanIgnoreReturnValueSuggesterFactory() {}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import com.google.errorprone.BugPattern;
|
||||||
import com.google.errorprone.ErrorProneFlags;
|
import com.google.errorprone.ErrorProneFlags;
|
||||||
import com.google.errorprone.VisitorState;
|
import com.google.errorprone.VisitorState;
|
||||||
import com.google.errorprone.bugpatterns.BugChecker;
|
import com.google.errorprone.bugpatterns.BugChecker;
|
||||||
|
import com.google.errorprone.bugpatterns.WellKnownKeep;
|
||||||
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
|
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggester;
|
||||||
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
|
import com.google.errorprone.bugpatterns.checkreturnvalue.CanIgnoreReturnValueSuggesterFactory;
|
||||||
import com.google.errorprone.matchers.Description;
|
import com.google.errorprone.matchers.Description;
|
||||||
|
|
@ -33,9 +34,10 @@ public class OtelCanIgnoreReturnValueSuggester extends BugChecker
|
||||||
private final CanIgnoreReturnValueSuggester delegate;
|
private final CanIgnoreReturnValueSuggester delegate;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags) {
|
OtelCanIgnoreReturnValueSuggester(ErrorProneFlags errorProneFlags, WellKnownKeep wellKnownKeep) {
|
||||||
delegate =
|
delegate =
|
||||||
CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(errorProneFlags);
|
CanIgnoreReturnValueSuggesterFactory.createCanIgnoreReturnValueSuggester(
|
||||||
|
errorProneFlags, wellKnownKeep);
|
||||||
}
|
}
|
||||||
|
|
||||||
public OtelCanIgnoreReturnValueSuggester() {
|
public OtelCanIgnoreReturnValueSuggester() {
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ val DEPENDENCY_BOMS = listOf(
|
||||||
|
|
||||||
val autoServiceVersion = "1.1.1"
|
val autoServiceVersion = "1.1.1"
|
||||||
val autoValueVersion = "1.11.0"
|
val autoValueVersion = "1.11.0"
|
||||||
val errorProneVersion = "2.40.0"
|
val errorProneVersion = "2.41.0"
|
||||||
val byteBuddyVersion = "1.17.6"
|
val byteBuddyVersion = "1.17.6"
|
||||||
val asmVersion = "9.8"
|
val asmVersion = "9.8"
|
||||||
val jmhVersion = "1.37"
|
val jmhVersion = "1.37"
|
||||||
|
|
|
||||||
|
|
@ -139,10 +139,10 @@ public final class ContextPropagationDebug {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Propagation {
|
private static class Propagation {
|
||||||
public final String carrierClassName;
|
final String carrierClassName;
|
||||||
public final StackTraceElement[] location;
|
final StackTraceElement[] location;
|
||||||
|
|
||||||
public Propagation(String carrierClassName, StackTraceElement[] location) {
|
Propagation(String carrierClassName, StackTraceElement[] location) {
|
||||||
this.carrierClassName = carrierClassName;
|
this.carrierClassName = carrierClassName;
|
||||||
this.location = location;
|
this.location = location;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ public class AkkaFlowWrapper
|
||||||
private class TracingLogic extends GraphStageLogic {
|
private class TracingLogic extends GraphStageLogic {
|
||||||
private final Deque<TracingRequest> requests = new ArrayDeque<>();
|
private final Deque<TracingRequest> requests = new ArrayDeque<>();
|
||||||
|
|
||||||
public TracingLogic() {
|
TracingLogic() {
|
||||||
super(shape);
|
super(shape);
|
||||||
|
|
||||||
// server pulls response, pass response from user code to server
|
// server pulls response, pass response from user code to server
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,7 @@ public class ApacheHttpClientTest {
|
||||||
private static class HttpResponseHandler implements ResponseHandler<Void> {
|
private static class HttpResponseHandler implements ResponseHandler<Void> {
|
||||||
private final HttpClientResult requestResult;
|
private final HttpClientResult requestResult;
|
||||||
|
|
||||||
public HttpResponseHandler(HttpClientResult requestResult) {
|
HttpResponseHandler(HttpClientResult requestResult) {
|
||||||
this.requestResult = requestResult;
|
this.requestResult = requestResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ class ApacheHttpAsyncClientTest {
|
||||||
private static class ResponseCallback implements FutureCallback<SimpleHttpResponse> {
|
private static class ResponseCallback implements FutureCallback<SimpleHttpResponse> {
|
||||||
private final HttpClientResult httpClientResult;
|
private final HttpClientResult httpClientResult;
|
||||||
|
|
||||||
public ResponseCallback(HttpClientResult httpClientResult) {
|
ResponseCallback(HttpClientResult httpClientResult) {
|
||||||
this.httpClientResult = httpClientResult;
|
this.httpClientResult = httpClientResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -234,7 +234,7 @@ public class ApacheHttpClientTest {
|
||||||
private static class ResponseHandler implements HttpClientResponseHandler<Void> {
|
private static class ResponseHandler implements HttpClientResponseHandler<Void> {
|
||||||
private final HttpClientResult httpClientResult;
|
private final HttpClientResult httpClientResult;
|
||||||
|
|
||||||
public ResponseHandler(HttpClientResult httpClientResult) {
|
ResponseHandler(HttpClientResult httpClientResult) {
|
||||||
this.httpClientResult = httpClientResult;
|
this.httpClientResult = httpClientResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -177,8 +177,7 @@ public class AwsLambdaWrapperTest {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("UnusedMethod")
|
static class CustomType {
|
||||||
private static class CustomType {
|
|
||||||
String key;
|
String key;
|
||||||
String value;
|
String value;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ class TracingList extends SdkInternalList<Message> {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class CallerClass extends SecurityManager {
|
private static class CallerClass extends SecurityManager {
|
||||||
public static final CallerClass INSTANCE = new CallerClass();
|
static final CallerClass INSTANCE = new CallerClass();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Class<?>[] getClassContext() {
|
public Class<?>[] getClassContext() {
|
||||||
|
|
|
||||||
|
|
@ -83,25 +83,24 @@ class ActiveContextManager {
|
||||||
private final CamelRequest request;
|
private final CamelRequest request;
|
||||||
@Nullable private final Scope scope;
|
@Nullable private final Scope scope;
|
||||||
|
|
||||||
public ContextWithScope(
|
ContextWithScope(ContextWithScope parent, Context context, CamelRequest request, Scope scope) {
|
||||||
ContextWithScope parent, Context context, CamelRequest request, Scope scope) {
|
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
this.context = context;
|
this.context = context;
|
||||||
this.request = request;
|
this.request = request;
|
||||||
this.scope = scope;
|
this.scope = scope;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ContextWithScope activate(
|
static ContextWithScope activate(
|
||||||
ContextWithScope parent, Context context, CamelRequest request) {
|
ContextWithScope parent, Context context, CamelRequest request) {
|
||||||
Scope scope = context != null ? context.makeCurrent() : null;
|
Scope scope = context != null ? context.makeCurrent() : null;
|
||||||
return new ContextWithScope(parent, context, request, scope);
|
return new ContextWithScope(parent, context, request, scope);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContextWithScope getParent() {
|
ContextWithScope getParent() {
|
||||||
return parent;
|
return parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deactivate(Exception exception) {
|
void deactivate(Exception exception) {
|
||||||
if (scope == null) {
|
if (scope == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -174,7 +174,7 @@ class SnsCamelTest {
|
||||||
private final String queueUrl;
|
private final String queueUrl;
|
||||||
private final String topicArn;
|
private final String topicArn;
|
||||||
|
|
||||||
public SnsMetadata(String queueUrl, String topicArn) {
|
SnsMetadata(String queueUrl, String topicArn) {
|
||||||
this.queueUrl = queueUrl;
|
this.queueUrl = queueUrl;
|
||||||
this.topicArn = topicArn;
|
this.topicArn = topicArn;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -340,14 +340,14 @@ class CassandraClientTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String keyspace;
|
final String keyspace;
|
||||||
public final String statement;
|
final String statement;
|
||||||
public final String expectedStatement;
|
final String expectedStatement;
|
||||||
public final String spanName;
|
final String spanName;
|
||||||
public final String operation;
|
final String operation;
|
||||||
public final String table;
|
final String table;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
String keyspace,
|
String keyspace,
|
||||||
String statement,
|
String statement,
|
||||||
String expectedStatement,
|
String expectedStatement,
|
||||||
|
|
|
||||||
|
|
@ -72,10 +72,10 @@ class CouchbaseQuerySanitizerTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final Object query;
|
final Object query;
|
||||||
public final String expected;
|
final String expected;
|
||||||
|
|
||||||
public Parameter(Object query, String expected) {
|
Parameter(Object query, String expected) {
|
||||||
this.query = query;
|
this.query = query;
|
||||||
this.expected = expected;
|
this.expected = expected;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -212,19 +212,19 @@ class ElasticsearchClientTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class AsyncRequest {
|
private static class AsyncRequest {
|
||||||
volatile InfoResponse response = null;
|
private volatile InfoResponse response = null;
|
||||||
|
|
||||||
public InfoResponse getResponse() {
|
InfoResponse getResponse() {
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setResponse(InfoResponse response) {
|
void setResponse(InfoResponse response) {
|
||||||
this.response = response;
|
this.response = response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Person {
|
static class Person {
|
||||||
public final String name;
|
private final String name;
|
||||||
|
|
||||||
Person(String name) {
|
Person(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
|
|
||||||
|
|
@ -183,22 +183,22 @@ class ElasticsearchRest7Test {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class AsyncRequest {
|
private static class AsyncRequest {
|
||||||
volatile Response requestResponse = null;
|
private volatile Response requestResponse = null;
|
||||||
volatile Exception exception = null;
|
private volatile Exception exception = null;
|
||||||
|
|
||||||
public Response getRequestResponse() {
|
Response getRequestResponse() {
|
||||||
return requestResponse;
|
return requestResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRequestResponse(Response requestResponse) {
|
void setRequestResponse(Response requestResponse) {
|
||||||
this.requestResponse = requestResponse;
|
this.requestResponse = requestResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Exception getException() {
|
Exception getException() {
|
||||||
return exception;
|
return exception;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setException(Exception exception) {
|
void setException(Exception exception) {
|
||||||
this.exception = exception;
|
this.exception = exception;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -159,22 +159,22 @@ class ElasticsearchRest7Test {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class AsyncRequest {
|
private static class AsyncRequest {
|
||||||
volatile Response requestResponse = null;
|
private volatile Response requestResponse = null;
|
||||||
volatile Exception exception = null;
|
private volatile Exception exception = null;
|
||||||
|
|
||||||
public Response getRequestResponse() {
|
Response getRequestResponse() {
|
||||||
return requestResponse;
|
return requestResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRequestResponse(Response requestResponse) {
|
void setRequestResponse(Response requestResponse) {
|
||||||
this.requestResponse = requestResponse;
|
this.requestResponse = requestResponse;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Exception getException() {
|
Exception getException() {
|
||||||
return exception;
|
return exception;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setException(Exception exception) {
|
void setException(Exception exception) {
|
||||||
this.exception = exception;
|
this.exception = exception;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ class Elasticsearch6NodeFactory implements NodeFactory {
|
||||||
InternalSettingsPreparer.prepareEnvironment(settings, null),
|
InternalSettingsPreparer.prepareEnvironment(settings, null),
|
||||||
Collections.singleton(Netty4Plugin.class)) {
|
Collections.singleton(Netty4Plugin.class)) {
|
||||||
|
|
||||||
@SuppressWarnings({"UnusedMethod", "UnusedVariable"})
|
@SuppressWarnings({"UnusedMethod", "UnusedVariable", "EffectivelyPrivate"})
|
||||||
protected void registerDerivedNodeNameWithLogger(String s) {}
|
protected void registerDerivedNodeNameWithLogger(String s) {}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,7 @@ class GrpcTest extends AbstractGrpcTest {
|
||||||
|
|
||||||
private final String valueOfKey2;
|
private final String valueOfKey2;
|
||||||
|
|
||||||
public CustomAttributesExtractorV2(String valueOfKey2) {
|
CustomAttributesExtractorV2(String valueOfKey2) {
|
||||||
this.valueOfKey2 = valueOfKey2;
|
this.valueOfKey2 = valueOfKey2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -140,11 +140,11 @@ class QueryTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String expectedSpanName;
|
final String expectedSpanName;
|
||||||
public final boolean requiresTransaction;
|
final boolean requiresTransaction;
|
||||||
public final Consumer<Session> queryInteraction;
|
final Consumer<Session> queryInteraction;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
String expectedSpanName, boolean requiresTransaction, Consumer<Session> queryInteraction) {
|
String expectedSpanName, boolean requiresTransaction, Consumer<Session> queryInteraction) {
|
||||||
this.expectedSpanName = expectedSpanName;
|
this.expectedSpanName = expectedSpanName;
|
||||||
this.requiresTransaction = requiresTransaction;
|
this.requiresTransaction = requiresTransaction;
|
||||||
|
|
|
||||||
|
|
@ -576,13 +576,13 @@ class SessionTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String methodName;
|
final String methodName;
|
||||||
public final String resource;
|
final String resource;
|
||||||
public final BiConsumer<Session, Value> sessionMethodTest;
|
final BiConsumer<Session, Value> sessionMethodTest;
|
||||||
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
||||||
public final Function<Session, Query> queryBuildMethod;
|
final Function<Session, Query> queryBuildMethod;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
String methodName,
|
String methodName,
|
||||||
String resource,
|
String resource,
|
||||||
BiConsumer<Session, Value> sessionMethodTest,
|
BiConsumer<Session, Value> sessionMethodTest,
|
||||||
|
|
|
||||||
|
|
@ -371,12 +371,12 @@ class EntityManagerTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String methodName;
|
final String methodName;
|
||||||
public final boolean attach;
|
final boolean attach;
|
||||||
public final boolean flushOnCommit;
|
final boolean flushOnCommit;
|
||||||
public final BiConsumer<EntityManager, Value> sessionMethodTest;
|
final BiConsumer<EntityManager, Value> sessionMethodTest;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
String methodName,
|
String methodName,
|
||||||
boolean attach,
|
boolean attach,
|
||||||
boolean flushOnCommit,
|
boolean flushOnCommit,
|
||||||
|
|
|
||||||
|
|
@ -225,10 +225,10 @@ class QueryTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String expectedSpanName;
|
final String expectedSpanName;
|
||||||
public final Consumer<Session> queryInteraction;
|
final Consumer<Session> queryInteraction;
|
||||||
|
|
||||||
public Parameter(String expectedSpanName, Consumer<Session> queryInteraction) {
|
Parameter(String expectedSpanName, Consumer<Session> queryInteraction) {
|
||||||
this.expectedSpanName = expectedSpanName;
|
this.expectedSpanName = expectedSpanName;
|
||||||
this.queryInteraction = queryInteraction;
|
this.queryInteraction = queryInteraction;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -851,11 +851,11 @@ class SessionTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String methodName;
|
final String methodName;
|
||||||
public final BiConsumer<Session, Value> sessionMethodTest;
|
final BiConsumer<Session, Value> sessionMethodTest;
|
||||||
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
String methodName,
|
String methodName,
|
||||||
BiConsumer<Session, Value> sessionMethodTest,
|
BiConsumer<Session, Value> sessionMethodTest,
|
||||||
BiConsumer<StatelessSession, Value> statelessSessionMethodTest) {
|
BiConsumer<StatelessSession, Value> statelessSessionMethodTest) {
|
||||||
|
|
|
||||||
|
|
@ -773,6 +773,12 @@ class SessionTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
|
final String methodName;
|
||||||
|
final String resource;
|
||||||
|
final Function<Session, SelectionQuery<?>> queryBuildMethod;
|
||||||
|
final BiConsumer<Session, Value> sessionMethodTest;
|
||||||
|
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
||||||
|
|
||||||
Parameter(
|
Parameter(
|
||||||
String methodName,
|
String methodName,
|
||||||
String resource,
|
String resource,
|
||||||
|
|
@ -785,12 +791,6 @@ class SessionTest extends AbstractHibernateTest {
|
||||||
this.queryBuildMethod = queryBuildMethod;
|
this.queryBuildMethod = queryBuildMethod;
|
||||||
this.statelessSessionMethodTest = statelessSessionMethodTest;
|
this.statelessSessionMethodTest = statelessSessionMethodTest;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final String methodName;
|
|
||||||
public final String resource;
|
|
||||||
public final Function<Session, SelectionQuery<?>> queryBuildMethod;
|
|
||||||
public final BiConsumer<Session, Value> sessionMethodTest;
|
|
||||||
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static SpanDataAssert assertSessionSpan(
|
private static SpanDataAssert assertSessionSpan(
|
||||||
|
|
|
||||||
|
|
@ -683,6 +683,12 @@ class SessionTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
|
final String methodName;
|
||||||
|
final String resource;
|
||||||
|
final Function<Session, SelectionQuery<?>> queryBuildMethod;
|
||||||
|
final BiConsumer<Session, Value> sessionMethodTest;
|
||||||
|
final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
||||||
|
|
||||||
Parameter(
|
Parameter(
|
||||||
String methodName,
|
String methodName,
|
||||||
String resource,
|
String resource,
|
||||||
|
|
@ -695,12 +701,6 @@ class SessionTest extends AbstractHibernateTest {
|
||||||
this.queryBuildMethod = queryBuildMethod;
|
this.queryBuildMethod = queryBuildMethod;
|
||||||
this.statelessSessionMethodTest = statelessSessionMethodTest;
|
this.statelessSessionMethodTest = statelessSessionMethodTest;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final String methodName;
|
|
||||||
public final String resource;
|
|
||||||
public final Function<Session, SelectionQuery<?>> queryBuildMethod;
|
|
||||||
public final BiConsumer<Session, Value> sessionMethodTest;
|
|
||||||
public final BiConsumer<StatelessSession, Value> statelessSessionMethodTest;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static SpanDataAssert assertSessionSpan(
|
private static SpanDataAssert assertSessionSpan(
|
||||||
|
|
|
||||||
|
|
@ -294,6 +294,12 @@ class EntityManagerTest extends AbstractHibernateTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
|
final String methodName;
|
||||||
|
final String resource;
|
||||||
|
final boolean attach;
|
||||||
|
final boolean flushOnCommit;
|
||||||
|
final BiConsumer<EntityManager, Value> sessionMethodTest;
|
||||||
|
final Function<EntityManager, Query> queryBuildMethod;
|
||||||
|
|
||||||
Parameter(String methodName, String resource, Function<EntityManager, Query> queryBuildMethod) {
|
Parameter(String methodName, String resource, Function<EntityManager, Query> queryBuildMethod) {
|
||||||
this.methodName = methodName;
|
this.methodName = methodName;
|
||||||
|
|
@ -317,13 +323,6 @@ class EntityManagerTest extends AbstractHibernateTest {
|
||||||
this.sessionMethodTest = sessionMethodTest;
|
this.sessionMethodTest = sessionMethodTest;
|
||||||
this.queryBuildMethod = null;
|
this.queryBuildMethod = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final String methodName;
|
|
||||||
public final String resource;
|
|
||||||
public final boolean attach;
|
|
||||||
public final boolean flushOnCommit;
|
|
||||||
public final BiConsumer<EntityManager, Value> sessionMethodTest;
|
|
||||||
public final Function<EntityManager, Query> queryBuildMethod;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation
|
@SuppressWarnings("deprecation") // TODO DB_CONNECTION_STRING deprecation
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ class HystrixObservableChainTest {
|
||||||
void testCommand() {
|
void testCommand() {
|
||||||
|
|
||||||
class TestCommand extends HystrixObservableCommand<String> {
|
class TestCommand extends HystrixObservableCommand<String> {
|
||||||
protected TestCommand(Setter setter) {
|
TestCommand(Setter setter) {
|
||||||
super(setter);
|
super(setter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@ class HystrixObservableChainTest {
|
||||||
class AnotherTestCommand extends HystrixObservableCommand<String> {
|
class AnotherTestCommand extends HystrixObservableCommand<String> {
|
||||||
private final String str;
|
private final String str;
|
||||||
|
|
||||||
protected AnotherTestCommand(Setter setter, String str) {
|
AnotherTestCommand(Setter setter, String str) {
|
||||||
super(setter);
|
super(setter);
|
||||||
this.str = str;
|
this.str = str;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ class HystrixObservableTest {
|
||||||
void testCommands(Parameter parameter) {
|
void testCommands(Parameter parameter) {
|
||||||
|
|
||||||
class TestCommand extends HystrixObservableCommand<String> {
|
class TestCommand extends HystrixObservableCommand<String> {
|
||||||
protected TestCommand(Setter setter) {
|
TestCommand(Setter setter) {
|
||||||
super(setter);
|
super(setter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -246,7 +246,7 @@ class HystrixObservableTest {
|
||||||
void testCommandFallbacks(Parameter parameter) {
|
void testCommandFallbacks(Parameter parameter) {
|
||||||
|
|
||||||
class TestCommand extends HystrixObservableCommand<String> {
|
class TestCommand extends HystrixObservableCommand<String> {
|
||||||
protected TestCommand(Setter setter) {
|
TestCommand(Setter setter) {
|
||||||
super(setter);
|
super(setter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -335,7 +335,7 @@ class HystrixObservableTest {
|
||||||
void testNoFallbackResultsInErrorForAction(Parameter parameter) {
|
void testNoFallbackResultsInErrorForAction(Parameter parameter) {
|
||||||
|
|
||||||
class TestCommand extends HystrixObservableCommand<String> {
|
class TestCommand extends HystrixObservableCommand<String> {
|
||||||
protected TestCommand(Setter setter) {
|
TestCommand(Setter setter) {
|
||||||
super(setter);
|
super(setter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -450,11 +450,11 @@ class HystrixObservableTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final Scheduler observeOn;
|
final Scheduler observeOn;
|
||||||
public final Scheduler subscribeOn;
|
final Scheduler subscribeOn;
|
||||||
public final Function<HystrixObservableCommand<String>, String> operation;
|
final Function<HystrixObservableCommand<String>, String> operation;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
Scheduler observeOn,
|
Scheduler observeOn,
|
||||||
Scheduler subscribeOn,
|
Scheduler subscribeOn,
|
||||||
Function<HystrixObservableCommand<String>, String> operation) {
|
Function<HystrixObservableCommand<String>, String> operation) {
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ class HystrixTest {
|
||||||
@MethodSource("provideCommandActionArguments")
|
@MethodSource("provideCommandActionArguments")
|
||||||
void testCommands(Function<HystrixCommand<String>, String> operation) {
|
void testCommands(Function<HystrixCommand<String>, String> operation) {
|
||||||
class TestCommand extends HystrixCommand<String> {
|
class TestCommand extends HystrixCommand<String> {
|
||||||
protected TestCommand(Setter setter) {
|
TestCommand(Setter setter) {
|
||||||
super(setter);
|
super(setter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -78,7 +78,7 @@ class HystrixTest {
|
||||||
@MethodSource("provideCommandActionArguments")
|
@MethodSource("provideCommandActionArguments")
|
||||||
void testCommandFallbacks(Function<HystrixCommand<String>, String> operation) {
|
void testCommandFallbacks(Function<HystrixCommand<String>, String> operation) {
|
||||||
class TestCommand extends HystrixCommand<String> {
|
class TestCommand extends HystrixCommand<String> {
|
||||||
protected TestCommand(Setter setter) {
|
TestCommand(Setter setter) {
|
||||||
super(setter);
|
super(setter);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -132,15 +132,15 @@ final class MetroServerSpanNameUpdater {
|
||||||
lookup.unreflect(httpServletRequestClass.getMethod("getPathInfo"));
|
lookup.unreflect(httpServletRequestClass.getMethod("getPathInfo"));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canHandle(Object httpServletRequest) {
|
boolean canHandle(Object httpServletRequest) {
|
||||||
return httpServletRequestClass.isInstance(httpServletRequest);
|
return httpServletRequestClass.isInstance(httpServletRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getServletPath(Object httpServletRequest) {
|
String getServletPath(Object httpServletRequest) {
|
||||||
return invokeSafely(getServletPathMethodHandle, httpServletRequest);
|
return invokeSafely(getServletPathMethodHandle, httpServletRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPathInfo(Object httpServletRequest) {
|
String getPathInfo(Object httpServletRequest) {
|
||||||
return invokeSafely(getPathInfoMethodHandle, httpServletRequest);
|
return invokeSafely(getPathInfoMethodHandle, httpServletRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -298,7 +298,7 @@ public final class KafkaTelemetry {
|
||||||
private final Context context;
|
private final Context context;
|
||||||
private final KafkaProducerRequest request;
|
private final KafkaProducerRequest request;
|
||||||
|
|
||||||
public ProducerCallback(
|
ProducerCallback(
|
||||||
Callback callback, Context parentContext, Context context, KafkaProducerRequest request) {
|
Callback callback, Context parentContext, Context context, KafkaProducerRequest request) {
|
||||||
this.callback = callback;
|
this.callback = callback;
|
||||||
this.parentContext = parentContext;
|
this.parentContext = parentContext;
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@ final class OpenTelemetryTracing implements Tracing {
|
||||||
this.context = Context.current();
|
this.context = Context.current();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Context getSpanContext() {
|
Context getSpanContext() {
|
||||||
return context;
|
return context;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -259,7 +259,7 @@ final class OpenTelemetryTracing implements Tracing {
|
||||||
// Added and called in 6.0+
|
// Added and called in 6.0+
|
||||||
// @Override
|
// @Override
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
@SuppressWarnings("UnusedMethod")
|
@SuppressWarnings({"UnusedMethod", "EffectivelyPrivate"})
|
||||||
public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
|
public synchronized Tracer.Span start(RedisCommand<?, ?, ?> command) {
|
||||||
start();
|
start();
|
||||||
long startNanos = System.nanoTime();
|
long startNanos = System.nanoTime();
|
||||||
|
|
|
||||||
|
|
@ -46,10 +46,10 @@ class LettuceArgSplitterTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
public final String args;
|
final String args;
|
||||||
public final List<String> result;
|
final List<String> result;
|
||||||
|
|
||||||
public Parameter(String query, List<String> result) {
|
Parameter(String query, List<String> result) {
|
||||||
this.args = query;
|
this.args = query;
|
||||||
this.result = result;
|
this.result = result;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -184,7 +184,7 @@ class LogEventToReplay implements LogEvent {
|
||||||
private final Object[] parameters;
|
private final Object[] parameters;
|
||||||
private final Throwable throwable;
|
private final Throwable throwable;
|
||||||
|
|
||||||
public MessageCopy(Message message) {
|
MessageCopy(Message message) {
|
||||||
this.formattedMessage = message.getFormattedMessage();
|
this.formattedMessage = message.getFormattedMessage();
|
||||||
this.format = message.getFormat();
|
this.format = message.getFormat();
|
||||||
this.parameters = message.getParameters();
|
this.parameters = message.getParameters();
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,7 @@ class TracingCallFactory implements Call.Factory {
|
||||||
private final Callback delegate;
|
private final Callback delegate;
|
||||||
private final Context callingContext;
|
private final Context callingContext;
|
||||||
|
|
||||||
public TracingCallback(Callback delegate, Context callingContext) {
|
TracingCallback(Callback delegate, Context callingContext) {
|
||||||
this.delegate = delegate;
|
this.delegate = delegate;
|
||||||
this.callingContext = callingContext;
|
this.callingContext = callingContext;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ public class PekkoFlowWrapper
|
||||||
private class TracingLogic extends GraphStageLogic {
|
private class TracingLogic extends GraphStageLogic {
|
||||||
private final Queue<PekkoTracingRequest> requests = new ArrayDeque<>();
|
private final Queue<PekkoTracingRequest> requests = new ArrayDeque<>();
|
||||||
|
|
||||||
public TracingLogic() {
|
TracingLogic() {
|
||||||
super(shape);
|
super(shape);
|
||||||
|
|
||||||
// server pulls response, pass response from user code to server
|
// server pulls response, pass response from user code to server
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ public class PekkoHttpServerTracer
|
||||||
private class TracingLogic extends GraphStageLogic {
|
private class TracingLogic extends GraphStageLogic {
|
||||||
private final Queue<PekkoTracingRequest> requests = new ArrayDeque<>();
|
private final Queue<PekkoTracingRequest> requests = new ArrayDeque<>();
|
||||||
|
|
||||||
public TracingLogic() {
|
TracingLogic() {
|
||||||
super(shape);
|
super(shape);
|
||||||
|
|
||||||
// server pulls response, pass response from user code to server
|
// server pulls response, pass response from user code to server
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,7 @@ abstract class PlayWsClientBaseTest<REQUEST> extends AbstractHttpClientTest<REQU
|
||||||
|
|
||||||
private static class CustomNameResolver extends InetNameResolver {
|
private static class CustomNameResolver extends InetNameResolver {
|
||||||
|
|
||||||
public CustomNameResolver(EventExecutor executor) {
|
CustomNameResolver(EventExecutor executor) {
|
||||||
super(executor);
|
super(executor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ abstract class PlayWsClientBaseTest<REQUEST> extends AbstractHttpClientTest<REQU
|
||||||
|
|
||||||
private static class CustomNameResolver extends InetNameResolver {
|
private static class CustomNameResolver extends InetNameResolver {
|
||||||
|
|
||||||
public CustomNameResolver(EventExecutor executor) {
|
CustomNameResolver(EventExecutor executor) {
|
||||||
super(executor);
|
super(executor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -238,14 +238,14 @@ public abstract class AbstractR2dbcStatementTest {
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
|
|
||||||
public final String system;
|
final String system;
|
||||||
public final String statement;
|
final String statement;
|
||||||
public final String expectedStatement;
|
final String expectedStatement;
|
||||||
public final String spanName;
|
final String spanName;
|
||||||
public final String table;
|
final String table;
|
||||||
public final String operation;
|
final String operation;
|
||||||
|
|
||||||
public Parameter(
|
Parameter(
|
||||||
String system,
|
String system,
|
||||||
String statement,
|
String statement,
|
||||||
String expectedStatement,
|
String expectedStatement,
|
||||||
|
|
@ -262,19 +262,19 @@ public abstract class AbstractR2dbcStatementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class DbSystemProps {
|
private static class DbSystemProps {
|
||||||
public final String system;
|
final String system;
|
||||||
public final String image;
|
final String image;
|
||||||
public final int port;
|
final int port;
|
||||||
public final Map<String, String> envVariables = new HashMap<>();
|
final Map<String, String> envVariables = new HashMap<>();
|
||||||
|
|
||||||
public DbSystemProps(String system, String image, int port) {
|
DbSystemProps(String system, String image, int port) {
|
||||||
this.system = system;
|
this.system = system;
|
||||||
this.image = image;
|
this.image = image;
|
||||||
this.port = port;
|
this.port = port;
|
||||||
}
|
}
|
||||||
|
|
||||||
@CanIgnoreReturnValue
|
@CanIgnoreReturnValue
|
||||||
public DbSystemProps envVariables(String... keyValues) {
|
DbSystemProps envVariables(String... keyValues) {
|
||||||
for (int i = 0; i < keyValues.length / 2; i++) {
|
for (int i = 0; i < keyValues.length / 2; i++) {
|
||||||
envVariables.put(keyValues[2 * i], keyValues[2 * i + 1]);
|
envVariables.put(keyValues[2 * i], keyValues[2 * i + 1]);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -278,7 +278,7 @@ public final class ContextPropagationOperator {
|
||||||
@SuppressWarnings({"FieldCanBeLocal", "UnusedVariable"})
|
@SuppressWarnings({"FieldCanBeLocal", "UnusedVariable"})
|
||||||
private final ReactorAsyncOperationEndStrategy asyncOperationEndStrategy;
|
private final ReactorAsyncOperationEndStrategy asyncOperationEndStrategy;
|
||||||
|
|
||||||
public Lifter(ReactorAsyncOperationEndStrategy asyncOperationEndStrategy) {
|
Lifter(ReactorAsyncOperationEndStrategy asyncOperationEndStrategy) {
|
||||||
this.asyncOperationEndStrategy = asyncOperationEndStrategy;
|
this.asyncOperationEndStrategy = asyncOperationEndStrategy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,16 +86,16 @@ public final class ReactorAsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
|
|
||||||
private final Context context;
|
private final Context context;
|
||||||
|
|
||||||
protected EndOnFirstNotificationConsumer(Context context) {
|
EndOnFirstNotificationConsumer(Context context) {
|
||||||
super(false);
|
super(false);
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T> void onSuccess(T result) {
|
<T> void onSuccess(T result) {
|
||||||
accept(result, null);
|
accept(result, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onCancel() {
|
void onCancel() {
|
||||||
if (compareAndSet(false, true)) {
|
if (compareAndSet(false, true)) {
|
||||||
if (captureExperimentalSpanAttributes) {
|
if (captureExperimentalSpanAttributes) {
|
||||||
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
|
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
|
||||||
|
|
@ -120,6 +120,6 @@ public final class ReactorAsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void end(Object result, Throwable error);
|
abstract void end(Object result, Throwable error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ public final class DecoratorFunctions {
|
||||||
private final BiConsumer<? super M, ? super Connection> delegate;
|
private final BiConsumer<? super M, ? super Connection> delegate;
|
||||||
private final boolean forceParentContext;
|
private final boolean forceParentContext;
|
||||||
|
|
||||||
protected OnMessageDecorator(
|
OnMessageDecorator(
|
||||||
BiConsumer<? super M, ? super Connection> delegate, boolean forceParentContext) {
|
BiConsumer<? super M, ? super Connection> delegate, boolean forceParentContext) {
|
||||||
this.delegate = delegate;
|
this.delegate = delegate;
|
||||||
this.forceParentContext = forceParentContext;
|
this.forceParentContext = forceParentContext;
|
||||||
|
|
@ -83,7 +83,7 @@ public final class DecoratorFunctions {
|
||||||
private abstract static class OnMessageErrorDecorator<M> implements BiConsumer<M, Throwable> {
|
private abstract static class OnMessageErrorDecorator<M> implements BiConsumer<M, Throwable> {
|
||||||
private final BiConsumer<? super M, ? super Throwable> delegate;
|
private final BiConsumer<? super M, ? super Throwable> delegate;
|
||||||
|
|
||||||
protected OnMessageErrorDecorator(BiConsumer<? super M, ? super Throwable> delegate) {
|
OnMessageErrorDecorator(BiConsumer<? super M, ? super Throwable> delegate) {
|
||||||
this.delegate = delegate;
|
this.delegate = delegate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ class ManifestResourceProviderTest {
|
||||||
private final InputStream input;
|
private final InputStream input;
|
||||||
private final Resource existing;
|
private final Resource existing;
|
||||||
|
|
||||||
public TestCase(
|
TestCase(
|
||||||
String name,
|
String name,
|
||||||
String expectedName,
|
String expectedName,
|
||||||
String expectedVersion,
|
String expectedVersion,
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
|
|
||||||
private final Context context;
|
private final Context context;
|
||||||
|
|
||||||
protected EndOnFirstNotificationConsumer(Context context) {
|
EndOnFirstNotificationConsumer(Context context) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -152,7 +152,7 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
accept(null, null);
|
accept(null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onCancelOrDispose() {
|
void onCancelOrDispose() {
|
||||||
if (compareAndSet(false, true)) {
|
if (compareAndSet(false, true)) {
|
||||||
if (captureExperimentalSpanAttributes) {
|
if (captureExperimentalSpanAttributes) {
|
||||||
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
|
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
|
||||||
|
|
@ -173,6 +173,6 @@ public final class RxJava2AsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void end(Object response, Throwable error);
|
abstract void end(Object response, Throwable error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -87,11 +87,11 @@ public class RxJava2ConcurrencyTestHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Iteration {
|
private static class Iteration {
|
||||||
public final Scheduler scheduler;
|
final Scheduler scheduler;
|
||||||
public final CountDownLatch countDown;
|
final CountDownLatch countDown;
|
||||||
public final int index;
|
final int index;
|
||||||
|
|
||||||
private Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
|
Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
|
||||||
this.scheduler = scheduler;
|
this.scheduler = scheduler;
|
||||||
this.countDown = countDown;
|
this.countDown = countDown;
|
||||||
this.index = index;
|
this.index = index;
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
|
|
||||||
private final Context context;
|
private final Context context;
|
||||||
|
|
||||||
protected EndOnFirstNotificationConsumer(Context context) {
|
EndOnFirstNotificationConsumer(Context context) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -152,7 +152,7 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
accept(null, null);
|
accept(null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onCancelOrDispose() {
|
void onCancelOrDispose() {
|
||||||
if (compareAndSet(false, true)) {
|
if (compareAndSet(false, true)) {
|
||||||
if (captureExperimentalSpanAttributes) {
|
if (captureExperimentalSpanAttributes) {
|
||||||
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
|
Span.fromContext(context).setAttribute(CANCELED_ATTRIBUTE_KEY, true);
|
||||||
|
|
@ -173,6 +173,6 @@ public final class RxJava3AsyncOperationEndStrategy implements AsyncOperationEnd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected abstract void end(Object response, Throwable error);
|
abstract void end(Object response, Throwable error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -87,11 +87,11 @@ public class RxJava3ConcurrencyTestHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Iteration {
|
private static class Iteration {
|
||||||
public final Scheduler scheduler;
|
final Scheduler scheduler;
|
||||||
public final CountDownLatch countDown;
|
final CountDownLatch countDown;
|
||||||
public final int index;
|
final int index;
|
||||||
|
|
||||||
private Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
|
Iteration(Scheduler scheduler, CountDownLatch countDown, int index) {
|
||||||
this.scheduler = scheduler;
|
this.scheduler = scheduler;
|
||||||
this.countDown = countDown;
|
this.countDown = countDown;
|
||||||
this.index = index;
|
this.index = index;
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,7 @@ class SnippetServletOutputStreamTest {
|
||||||
baos.write(b);
|
baos.write(b);
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] getBytes() {
|
byte[] getBytes() {
|
||||||
return baos.toByteArray();
|
return baos.toByteArray();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,7 @@ class SnippetServletOutputStreamTest {
|
||||||
|
|
||||||
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
|
||||||
|
|
||||||
public byte[] getBytes() {
|
byte[] getBytes() {
|
||||||
return baos.toByteArray();
|
return baos.toByteArray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -171,7 +171,7 @@ class SnippetServletOutputStreamTest {
|
||||||
public void setWriteListener(WriteListener writeListener) {}
|
public void setWriteListener(WriteListener writeListener) {}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void write(int b) throws IOException {
|
public void write(int b) {
|
||||||
baos.write(b);
|
baos.write(b);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -752,6 +752,11 @@ public class SpringWebfluxTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Parameter {
|
private static class Parameter {
|
||||||
|
final String urlPath;
|
||||||
|
final String urlPathWithVariables;
|
||||||
|
final String annotatedMethod;
|
||||||
|
final String expectedResponseBody;
|
||||||
|
|
||||||
Parameter(
|
Parameter(
|
||||||
String urlPath,
|
String urlPath,
|
||||||
String urlPathWithVariables,
|
String urlPathWithVariables,
|
||||||
|
|
@ -762,10 +767,5 @@ public class SpringWebfluxTest {
|
||||||
this.annotatedMethod = annotatedMethod;
|
this.annotatedMethod = annotatedMethod;
|
||||||
this.expectedResponseBody = expectedResponseBody;
|
this.expectedResponseBody = expectedResponseBody;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final String urlPath;
|
|
||||||
public final String urlPathWithVariables;
|
|
||||||
public final String annotatedMethod;
|
|
||||||
public final String expectedResponseBody;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -505,7 +505,7 @@ public class AgentClassLoader extends URLClassLoader {
|
||||||
|
|
||||||
private final ClassLoader platformClassLoader = getPlatformLoader();
|
private final ClassLoader platformClassLoader = getPlatformLoader();
|
||||||
|
|
||||||
public PlatformDelegatingClassLoader() {
|
PlatformDelegatingClassLoader() {
|
||||||
super(null);
|
super(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ class AdviceUninliningPoolStrategy implements AgentBuilder.PoolStrategy {
|
||||||
private static class TypePoolWrapper implements TypePool {
|
private static class TypePoolWrapper implements TypePool {
|
||||||
private final TypePool typePool;
|
private final TypePool typePool;
|
||||||
|
|
||||||
public TypePoolWrapper(TypePool typePool) {
|
TypePoolWrapper(TypePool typePool) {
|
||||||
this.typePool = typePool;
|
this.typePool = typePool;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -158,7 +158,7 @@ class AdviceUninliningPoolStrategy implements AgentBuilder.PoolStrategy {
|
||||||
|
|
||||||
private static class DelegatingMethodDescription
|
private static class DelegatingMethodDescription
|
||||||
extends MethodDescription.InDefinedShape.AbstractBase {
|
extends MethodDescription.InDefinedShape.AbstractBase {
|
||||||
protected final MethodDescription.InDefinedShape method;
|
final MethodDescription.InDefinedShape method;
|
||||||
|
|
||||||
DelegatingMethodDescription(MethodDescription.InDefinedShape method) {
|
DelegatingMethodDescription(MethodDescription.InDefinedShape method) {
|
||||||
this.method = method;
|
this.method = method;
|
||||||
|
|
|
||||||
|
|
@ -92,8 +92,7 @@ class MissingTypeTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
// com.google.common.base.Joiner is missing from runtime class path
|
// com.google.common.base.Joiner is missing from runtime class path
|
||||||
@SuppressWarnings({"UnusedMethod", "UnusedVariable", "MethodCanBeStatic"})
|
static class SomeClass {
|
||||||
private static class SomeClass {
|
|
||||||
public Joiner joiner;
|
public Joiner joiner;
|
||||||
|
|
||||||
public static boolean isInstrumented() {
|
public static boolean isInstrumented() {
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ public class ByteArrayUrl {
|
||||||
|
|
||||||
private final InputStream inputStream;
|
private final InputStream inputStream;
|
||||||
|
|
||||||
protected ByteArrayUrlConnection(URL url) {
|
ByteArrayUrlConnection(URL url) {
|
||||||
super(url);
|
super(url);
|
||||||
inputStream = new ByteArrayInputStream(binaryRepresentation);
|
inputStream = new ByteArrayInputStream(binaryRepresentation);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -318,7 +318,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
|
||||||
private final ThreadLocal<Boolean> loadingAnnotations = new ThreadLocal<>();
|
private final ThreadLocal<Boolean> loadingAnnotations = new ThreadLocal<>();
|
||||||
private final WeakReference<ClassLoader> classLoaderRef;
|
private final WeakReference<ClassLoader> classLoaderRef;
|
||||||
|
|
||||||
public AgentTypePool(
|
AgentTypePool(
|
||||||
TypePool.CacheProvider cacheProvider,
|
TypePool.CacheProvider cacheProvider,
|
||||||
ClassFileLocator classFileLocator,
|
ClassFileLocator classFileLocator,
|
||||||
ClassLoader classLoader,
|
ClassLoader classLoader,
|
||||||
|
|
@ -344,7 +344,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
|
||||||
* @param name The name of the type to resolve.
|
* @param name The name of the type to resolve.
|
||||||
* @return The resolution for the type of this name.
|
* @return The resolution for the type of this name.
|
||||||
*/
|
*/
|
||||||
protected TypePool.Resolution doResolve(String name) {
|
private TypePool.Resolution doResolve(String name) {
|
||||||
TypePool.Resolution resolution = cacheProvider.find(name);
|
TypePool.Resolution resolution = cacheProvider.find(name);
|
||||||
if (resolution == null) {
|
if (resolution == null) {
|
||||||
// calling super.doDescribe that will locate the class bytes and parse them unlike
|
// calling super.doDescribe that will locate the class bytes and parse them unlike
|
||||||
|
|
@ -691,7 +691,7 @@ public class AgentCachingPoolStrategy implements AgentBuilder.PoolStrategy {
|
||||||
|
|
||||||
private static class DelegatingMethodDescription
|
private static class DelegatingMethodDescription
|
||||||
extends MethodDescription.InDefinedShape.AbstractBase {
|
extends MethodDescription.InDefinedShape.AbstractBase {
|
||||||
protected final MethodDescription.InDefinedShape method;
|
final MethodDescription.InDefinedShape method;
|
||||||
|
|
||||||
DelegatingMethodDescription(MethodDescription.InDefinedShape method) {
|
DelegatingMethodDescription(MethodDescription.InDefinedShape method) {
|
||||||
this.method = method;
|
this.method = method;
|
||||||
|
|
|
||||||
|
|
@ -312,7 +312,7 @@ final class ReferenceCollectingClassVisitor extends ClassVisitor {
|
||||||
private class AdviceReferenceMethodVisitor extends MethodVisitor {
|
private class AdviceReferenceMethodVisitor extends MethodVisitor {
|
||||||
private int currentLineNumber = -1;
|
private int currentLineNumber = -1;
|
||||||
|
|
||||||
public AdviceReferenceMethodVisitor(MethodVisitor methodVisitor) {
|
AdviceReferenceMethodVisitor(MethodVisitor methodVisitor) {
|
||||||
super(AsmApi.VERSION, methodVisitor);
|
super(AsmApi.VERSION, methodVisitor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ final class MuzzleCodeGenerator implements AsmVisitorWrapper {
|
||||||
private boolean generateHelperClassNamesMethod = true;
|
private boolean generateHelperClassNamesMethod = true;
|
||||||
private boolean generateVirtualFieldsMethod = true;
|
private boolean generateVirtualFieldsMethod = true;
|
||||||
|
|
||||||
public GenerateMuzzleMethodsAndFields(ClassVisitor classVisitor, URLClassLoader classLoader) {
|
GenerateMuzzleMethodsAndFields(ClassVisitor classVisitor, URLClassLoader classLoader) {
|
||||||
super(AsmApi.VERSION, classVisitor);
|
super(AsmApi.VERSION, classVisitor);
|
||||||
this.classLoader = classLoader;
|
this.classLoader = classLoader;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -317,9 +317,9 @@ public class WindowsTestContainerManager extends AbstractTestContainerManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class Container {
|
private static class Container {
|
||||||
public final String imageName;
|
final String imageName;
|
||||||
public final String containerId;
|
final String containerId;
|
||||||
public final InspectContainerResponse inspectResponse;
|
final InspectContainerResponse inspectResponse;
|
||||||
|
|
||||||
private Container(
|
private Container(
|
||||||
String imageName, String containerId, InspectContainerResponse inspectResponse) {
|
String imageName, String containerId, InspectContainerResponse inspectResponse) {
|
||||||
|
|
|
||||||
|
|
@ -195,7 +195,7 @@ final class YamlFileMappingsSource implements MappingsSource {
|
||||||
final String path;
|
final String path;
|
||||||
final boolean multi;
|
final boolean multi;
|
||||||
|
|
||||||
public StubMappingFileMetadata(String path, boolean multi) {
|
StubMappingFileMetadata(String path, boolean multi) {
|
||||||
this.path = path;
|
this.path = path;
|
||||||
this.multi = multi;
|
this.multi = multi;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ public class TestAgentListener implements AgentBuilder.Listener {
|
||||||
private static class AbortTransformationException extends RuntimeException {
|
private static class AbortTransformationException extends RuntimeException {
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
public AbortTransformationException(String message) {
|
AbortTransformationException(String message) {
|
||||||
super(message);
|
super(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue