Skip to content

Commit 28e48d3

Browse files
PerfectSlayerPerfectSlayer
committed
feat: Remove functional interface backport
1 parent 9ff3b3d commit 28e48d3

138 files changed

Lines changed: 350 additions & 445 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import datadog.communication.monitor.Monitoring;
77
import datadog.trace.api.Config;
88
import datadog.trace.api.Platform;
9-
import datadog.trace.api.function.Supplier;
109
import java.lang.reflect.Constructor;
1110
import java.lang.reflect.InvocationTargetException;
1211
import java.util.concurrent.TimeUnit;
12+
import java.util.function.Supplier;
1313
import okhttp3.HttpUrl;
1414
import okhttp3.OkHttpClient;
1515
import org.slf4j.Logger;

‎communication/src/main/java/datadog/communication/monitor/DDAgentStatsDClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.timgroup.statsd.ServiceCheck;
44
import datadog.trace.api.StatsDClient;
5-
import datadog.trace.api.function.Function;
5+
import java.util.function.Function;
66

77
final class DDAgentStatsDClient implements StatsDClient {
88
private final DDAgentStatsDConnection connection;

‎communication/src/main/java/datadog/communication/monitor/DDAgentStatsDClientManager.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import static datadog.trace.bootstrap.instrumentation.api.WriterConstants.LOGGING_WRITER_TYPE;
55

66
import datadog.trace.api.Config;
7-
import datadog.trace.api.Functions;
87
import datadog.trace.api.StatsDClient;
98
import datadog.trace.api.StatsDClientManager;
109
import datadog.trace.api.cache.DDCache;
1110
import datadog.trace.api.cache.DDCaches;
12-
import datadog.trace.api.function.Function;
1311
import java.util.concurrent.ConcurrentHashMap;
1412
import java.util.concurrent.atomic.AtomicInteger;
13+
import java.util.function.Function;
1514

1615
public final class DDAgentStatsDClientManager implements StatsDClientManager {
1716
private static final DDAgentStatsDClientManager INSTANCE = new DDAgentStatsDClientManager();
@@ -45,8 +44,8 @@ public StatsDClient statsDClient(
4544
final String namedPipe,
4645
final String namespace,
4746
final String[] constantTags) {
48-
Function<String, String> nameMapping = Functions.<String>zero();
49-
Function<String[], String[]> tagMapping = Functions.<String[]>zero();
47+
Function<String, String> nameMapping = Function.identity();
48+
Function<String[], String[]> tagMapping = Function.identity();
5049

5150
if (null != namespace) {
5251
nameMapping = new NameResolver(namespace);
@@ -124,15 +123,12 @@ static final class TagCombiner implements Function<String[], String[]> {
124123
public TagCombiner(final String[] constantTags) {
125124
this.packedTags = pack(constantTags);
126125
this.tagsInserter =
127-
new Function<String[], String[]>() {
128-
@Override
129-
public String[] apply(final String[] tags) {
130-
// extend per-call array by one to add the pre-packed constant tags
131-
String[] result = new String[tags.length + 1];
132-
System.arraycopy(tags, 0, result, 1, tags.length);
133-
result[0] = packedTags[0];
134-
return result;
135-
}
126+
tags -> {
127+
// extend per-call array by one to add the pre-packed constant tags
128+
String[] result = new String[tags.length + 1];
129+
System.arraycopy(tags, 0, result, 1, tags.length);
130+
result[0] = packedTags[0];
131+
return result;
136132
};
137133
}
138134

‎communication/src/main/java/datadog/communication/monitor/LoggingStatsDClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import static datadog.communication.monitor.DDAgentStatsDClient.serviceCheckStatus;
44

55
import datadog.trace.api.StatsDClient;
6-
import datadog.trace.api.function.Function;
76
import java.text.DecimalFormat;
87
import java.text.DecimalFormatSymbols;
98
import java.util.Locale;
9+
import java.util.function.Function;
1010
import org.slf4j.Logger;
1111
import org.slf4j.LoggerFactory;
1212

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/InstanceStore.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.bootstrap;
22

33
import datadog.trace.api.GenericClassValue;
4-
import datadog.trace.api.function.Function;
4+
import java.util.function.Function;
55

66
/**
77
* An {@code InstanceStore} is a class global map for registering instances. This can be useful when
@@ -16,12 +16,7 @@ private InstanceStore() {}
1616

1717
private static final ClassValue<? super ContextStore<String, ?>> classInstanceStore =
1818
GenericClassValue.of(
19-
new Function<Class<?>, ContextStore<String, ?>>() {
20-
@Override
21-
public ContextStore<String, ?> apply(Class<?> input) {
22-
return new WeakMapContextStore<>(100);
23-
}
24-
});
19+
(Function<Class<?>, ContextStore<String, ?>>) input -> new WeakMapContextStore<>(100));
2520

2621
@SuppressWarnings("unchecked")
2722
public static <T> ContextStore<String, T> of(Class<T> type) {

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.bootstrap;
22

3-
import datadog.trace.api.function.Function;
3+
import java.util.function.Function;
44

55
public interface WeakCache<K, V> {
66
V getIfPresent(final K key);

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/WeakMap.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.bootstrap;
22

3-
import datadog.trace.api.function.Function;
3+
import java.util.function.Function;
44

55
public interface WeakMap<K, V> {
66
int size();

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import datadog.trace.api.DDTags;
88
import datadog.trace.api.Functions;
99
import datadog.trace.api.cache.QualifiedClassNameCache;
10-
import datadog.trace.api.function.Function;
1110
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
1211
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1312
import datadog.trace.bootstrap.instrumentation.api.Tags;
@@ -17,6 +16,7 @@
1716
import java.net.InetAddress;
1817
import java.net.InetSocketAddress;
1918
import java.util.concurrent.ExecutionException;
19+
import java.util.function.Function;
2020

2121
public abstract class BaseDecorator {
2222

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import datadog.trace.api.Functions;
77
import datadog.trace.api.cache.DDCache;
88
import datadog.trace.api.cache.DDCaches;
9-
import datadog.trace.api.function.Function;
109
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1110
import datadog.trace.bootstrap.instrumentation.api.Tags;
11+
import java.util.function.Function;
1212

1313
public abstract class DatabaseClientDecorator<CONNECTION> extends ClientDecorator {
1414

‎dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import datadog.trace.api.Config;
88
import datadog.trace.api.DDTags;
9-
import datadog.trace.api.function.*;
10-
import datadog.trace.api.function.Function;
9+
import datadog.trace.api.function.TriConsumer;
10+
import datadog.trace.api.function.TriFunction;
1111
import datadog.trace.api.gateway.CallbackProvider;
1212
import datadog.trace.api.gateway.Flow;
1313
import datadog.trace.api.gateway.IGSpanInfo;
@@ -28,6 +28,9 @@
2828
import java.net.InetAddress;
2929
import java.util.BitSet;
3030
import java.util.Map;
31+
import java.util.function.BiFunction;
32+
import java.util.function.Function;
33+
import java.util.function.Supplier;
3134
import javax.annotation.Nonnull;
3235
import org.slf4j.Logger;
3336
import org.slf4j.LoggerFactory;
@@ -455,8 +458,7 @@ public Flow<Void> done() {
455458
}
456459

457460
private static final class ResponseHeaderTagClassifier implements AgentPropagation.KeyClassifier {
458-
static final ResponseHeaderTagClassifier create(
459-
AgentSpan span, Map<String, String> headerTags) {
461+
static ResponseHeaderTagClassifier create(AgentSpan span, Map<String, String> headerTags) {
460462
if (span == null || headerTags == null || headerTags.isEmpty()) {
461463
return null;
462464
}

0 commit comments

Comments
 (0)