Skip to content

Commit 3f95f5c

Browse files
PerfectSlayerPerfectSlayer
committed
chore: Clean up :dd-trace-java:communication
1 parent 28e48d3 commit 3f95f5c

File tree

6 files changed

+366
-753
lines changed

6 files changed

+366
-753
lines changed

‎communication/src/main/java/datadog/communication/http/OkHttpUtils.java‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.util.Collections;
1818
import java.util.List;
1919
import java.util.Map;
20-
import okhttp3.Authenticator;
2120
import okhttp3.ConnectionPool;
2221
import okhttp3.ConnectionSpec;
2322
import okhttp3.Credentials;
@@ -27,8 +26,6 @@
2726
import okhttp3.OkHttpClient;
2827
import okhttp3.Request;
2928
import okhttp3.RequestBody;
30-
import okhttp3.Response;
31-
import okhttp3.Route;
3229
import okio.BufferedSink;
3330
import okio.GzipSink;
3431
import okio.Okio;
@@ -149,18 +146,15 @@ private static OkHttpClient buildHttpClient(
149146
builder.proxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort)));
150147
if (proxyUsername != null) {
151148
builder.proxyAuthenticator(
152-
new Authenticator() {
153-
@Override
154-
public Request authenticate(final Route route, final Response response) {
155-
final String credential =
156-
Credentials.basic(proxyUsername, proxyPassword == null ? "" : proxyPassword);
157-
158-
return response
159-
.request()
160-
.newBuilder()
161-
.header("Proxy-Authorization", credential)
162-
.build();
163-
}
149+
(route, response) -> {
150+
final String credential =
151+
Credentials.basic(proxyUsername, proxyPassword == null ? "" : proxyPassword);
152+
153+
return response
154+
.request()
155+
.newBuilder()
156+
.header("Proxy-Authorization", credential)
157+
.build();
164158
});
165159
}
166160
}

‎communication/src/test/groovy/datadog/communication/serialization/FlushingBufferTest.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,12 @@
22

33
import static org.junit.Assert.assertEquals;
44

5-
import java.nio.ByteBuffer;
65
import org.junit.Test;
76

87
public class FlushingBufferTest {
98

109
@Test
1110
public void testBufferCapacity() {
12-
assertEquals(
13-
5,
14-
new FlushingBuffer(
15-
5,
16-
new ByteBufferConsumer() {
17-
@Override
18-
public void accept(int messageCount, ByteBuffer buffer) {}
19-
})
20-
.capacity());
11+
assertEquals(5, new FlushingBuffer(5, (messageCount, buffer) -> {}).capacity());
2112
}
2213
}

‎communication/src/test/java/datadog/communication/serialization/IntPackingTest.java‎

Lines changed: 30 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -91,36 +91,36 @@ public static Object[][] inputs() {
9191
};
9292
}
9393

94+
private static long[] random(int size) {
95+
long[] random = new long[size];
96+
for (int i = 0; i < random.length; ++i) {
97+
// yeah, JDK7...
98+
int signum = ThreadLocalRandom.current().nextBoolean() ? 1 : -1;
99+
random[i] = signum * ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE);
100+
}
101+
return random;
102+
}
103+
94104
@Test
95105
public void packLongs() {
96106
ByteBuffer buffer = ByteBuffer.allocate(input.length * 9 + 10);
97107
MessageFormatter messageFormatter =
98108
new MsgPackWriter(
99109
newBuffer(
100110
input.length * 9 + 10,
101-
new ByteBufferConsumer() {
102-
@Override
103-
public void accept(int messageCount, ByteBuffer buffy) {
104-
try {
105-
MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
106-
assertEquals(1, messageCount);
107-
assertEquals(input.length, unpacker.unpackArrayHeader());
108-
for (long i : input) {
109-
assertEquals(i, unpacker.unpackLong());
110-
}
111-
} catch (IOException e) {
112-
Assert.fail(e.getMessage());
111+
(messageCount, buffy) -> {
112+
try {
113+
MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
114+
assertEquals(1, messageCount);
115+
assertEquals(input.length, unpacker.unpackArrayHeader());
116+
for (long i : input) {
117+
assertEquals(i, unpacker.unpackLong());
113118
}
119+
} catch (IOException e) {
120+
Assert.fail(e.getMessage());
114121
}
115122
}));
116-
messageFormatter.format(
117-
input,
118-
new Mapper<long[]>() {
119-
@Override
120-
public void map(long[] x, Writable w) {
121-
w.writeObject(x, null);
122-
}
123-
});
123+
messageFormatter.format(input, (x, w) -> w.writeObject(x, null));
124124
messageFormatter.flush();
125125
}
126126

@@ -134,43 +134,23 @@ public void packInts() {
134134
new MsgPackWriter(
135135
newBuffer(
136136
input.length * 5 + 10,
137-
new ByteBufferConsumer() {
138-
@Override
139-
public void accept(int messageCount, ByteBuffer buffy) {
140-
try {
141-
MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
142-
assertEquals(1, messageCount);
143-
assertEquals(asInts.length, unpacker.unpackArrayHeader());
144-
for (int i : asInts) {
145-
assertEquals(i, unpacker.unpackInt());
146-
}
147-
} catch (IOException e) {
148-
Assert.fail(e.getMessage());
137+
(messageCount, buffy) -> {
138+
try {
139+
MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
140+
assertEquals(1, messageCount);
141+
assertEquals(asInts.length, unpacker.unpackArrayHeader());
142+
for (int i : asInts) {
143+
assertEquals(i, unpacker.unpackInt());
149144
}
145+
} catch (IOException e) {
146+
Assert.fail(e.getMessage());
150147
}
151148
}));
152149

153-
messageFormatter.format(
154-
asInts,
155-
new Mapper<int[]>() {
156-
@Override
157-
public void map(int[] x, Writable w) {
158-
w.writeObject(x, null);
159-
}
160-
});
150+
messageFormatter.format(asInts, (x, w) -> w.writeObject(x, null));
161151
messageFormatter.flush();
162152
}
163153

164-
private static long[] random(int size) {
165-
long[] random = new long[size];
166-
for (int i = 0; i < random.length; ++i) {
167-
// yeah, JDK7...
168-
int signum = ThreadLocalRandom.current().nextBoolean() ? 1 : -1;
169-
random[i] = signum * ThreadLocalRandom.current().nextLong(0, Long.MAX_VALUE);
170-
}
171-
return random;
172-
}
173-
174154
private StreamingBuffer newBuffer(int capacity, ByteBufferConsumer consumer) {
175155
return new FlushingBuffer(capacity, consumer);
176156
}

‎communication/src/test/java/datadog/communication/serialization/SmokeTest.java‎

Lines changed: 53 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55

66
import datadog.communication.serialization.msgpack.MsgPackWriter;
77
import java.io.IOException;
8-
import java.nio.ByteBuffer;
98
import java.nio.charset.StandardCharsets;
10-
import java.util.*;
9+
import java.util.Arrays;
10+
import java.util.Collections;
11+
import java.util.HashMap;
12+
import java.util.List;
13+
import java.util.Map;
14+
import java.util.UUID;
1115
import java.util.concurrent.ThreadLocalRandom;
1216
import org.junit.Assert;
1317
import org.junit.Test;
@@ -57,66 +61,60 @@ public void testWriteMessage() {
5761
new MsgPackWriter(
5862
new FlushingBuffer(
5963
1024,
60-
new ByteBufferConsumer() {
61-
@Override
62-
public void accept(int messageCount, ByteBuffer buffy) {
63-
assertEquals(1, messageCount);
64-
try {
65-
MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
66-
assertEquals("id1", unpacker.unpackString());
67-
assertEquals(message.id1, unpacker.unpackLong());
68-
assertEquals("id2", unpacker.unpackString());
69-
assertEquals(message.id2, unpacker.unpackLong());
70-
assertEquals("name", unpacker.unpackString());
71-
assertEquals(message.name, unpacker.unpackString());
72-
assertEquals("values", unpacker.unpackString());
73-
int length = unpacker.unpackArrayHeader();
74-
assertEquals(message.values.length, length);
75-
for (int i : message.values) {
76-
assertEquals(i, unpacker.unpackInt());
77-
}
78-
assertEquals("tags", unpacker.unpackString());
79-
int mapHeader = unpacker.unpackMapHeader();
80-
assertEquals(message.tags.size(), mapHeader);
81-
for (int i = 0; i < mapHeader; ++i) {
82-
String key = unpacker.unpackString();
83-
Object expected = message.tags.get(key);
84-
assertNotNull(expected);
85-
if (expected instanceof Float) {
86-
assertEquals((Float) expected, unpacker.unpackFloat(), 0.0001);
87-
} else if (expected instanceof Double) {
88-
assertEquals((Double) expected, unpacker.unpackDouble(), 0.0001);
89-
} else if (expected instanceof List) {
90-
List<String> l = (List<String>) expected;
91-
assertEquals(l.size(), unpacker.unpackArrayHeader());
92-
for (String element : l) {
93-
assertEquals(element, unpacker.unpackString());
94-
}
95-
} else if (expected instanceof String) {
96-
assertEquals(expected, unpacker.unpackString());
64+
(messageCount, buffy) -> {
65+
assertEquals(1, messageCount);
66+
try {
67+
MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(buffy);
68+
assertEquals("id1", unpacker.unpackString());
69+
assertEquals(message.id1, unpacker.unpackLong());
70+
assertEquals("id2", unpacker.unpackString());
71+
assertEquals(message.id2, unpacker.unpackLong());
72+
assertEquals("name", unpacker.unpackString());
73+
assertEquals(message.name, unpacker.unpackString());
74+
assertEquals("values", unpacker.unpackString());
75+
int length = unpacker.unpackArrayHeader();
76+
assertEquals(message.values.length, length);
77+
for (int i : message.values) {
78+
assertEquals(i, unpacker.unpackInt());
79+
}
80+
assertEquals("tags", unpacker.unpackString());
81+
int mapHeader = unpacker.unpackMapHeader();
82+
assertEquals(message.tags.size(), mapHeader);
83+
for (int i = 0; i < mapHeader; ++i) {
84+
String key = unpacker.unpackString();
85+
Object expected = message.tags.get(key);
86+
assertNotNull(expected);
87+
if (expected instanceof Float) {
88+
assertEquals((Float) expected, unpacker.unpackFloat(), 0.0001);
89+
} else if (expected instanceof Double) {
90+
assertEquals((Double) expected, unpacker.unpackDouble(), 0.0001);
91+
} else if (expected instanceof List) {
92+
List<String> l = (List<String>) expected;
93+
assertEquals(l.size(), unpacker.unpackArrayHeader());
94+
for (String element : l) {
95+
assertEquals(element, unpacker.unpackString());
9796
}
97+
} else if (expected instanceof String) {
98+
assertEquals(expected, unpacker.unpackString());
9899
}
99-
} catch (IOException e) {
100-
Assert.fail(e.getMessage());
101100
}
101+
} catch (IOException e) {
102+
Assert.fail(e.getMessage());
102103
}
103104
}));
104105
packer.format(
105106
message,
106-
new Mapper<Foo>() {
107-
@Override
108-
public void map(Foo data, Writable p) {
109-
p.writeString("id1", encodingCache);
110-
p.writeLong(data.id1);
111-
p.writeString("id2", encodingCache);
112-
p.writeLong(data.id2);
113-
p.writeString("name", encodingCache);
114-
p.writeString(data.name, encodingCache);
115-
p.writeString("values", encodingCache);
116-
p.writeObject(data.values, encodingCache);
117-
p.writeString("tags", encodingCache);
118-
p.writeMap(data.tags, encodingCache);
119-
}
107+
(data, p) -> {
108+
p.writeString("id1", encodingCache);
109+
p.writeLong(data.id1);
110+
p.writeString("id2", encodingCache);
111+
p.writeLong(data.id2);
112+
p.writeString("name", encodingCache);
113+
p.writeString(data.name, encodingCache);
114+
p.writeString("values", encodingCache);
115+
p.writeObject(data.values, encodingCache);
116+
p.writeString("tags", encodingCache);
117+
p.writeMap(data.tags, encodingCache);
120118
});
121119
packer.flush();
122120
}

‎communication/src/test/java/datadog/communication/serialization/StringWritingTest.java‎

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,7 @@ public class StringWritingTest {
2525

2626
private static final Map<CharSequence, byte[]> MEMOISATION = new HashMap<>();
2727
private static final EncodingCache CACHE =
28-
new EncodingCache() {
29-
@Override
30-
public byte[] encode(CharSequence s) {
31-
byte[] utf8 = MEMOISATION.get(s);
32-
if (utf8 == null) {
33-
utf8 = ((String) s).getBytes(StandardCharsets.UTF_8);
34-
MEMOISATION.put(s, utf8);
35-
}
36-
return utf8;
37-
}
38-
};
28+
s -> MEMOISATION.computeIfAbsent(s, s1 -> ((String) s1).getBytes(StandardCharsets.UTF_8));
3929

4030
private final List<Map<String, String>> maps;
4131
private static final int TEN_KB = 10 << 10;
@@ -141,23 +131,9 @@ public static Object[][] maps() {
141131
public void testSerialiseTextMapWithCache() {
142132
MsgPackWriter packer =
143133
new MsgPackWriter(
144-
new FlushingBuffer(
145-
TEN_KB,
146-
new ByteBufferConsumer() {
147-
@Override
148-
public void accept(int messageCount, ByteBuffer buffer) {
149-
testBufferContents(buffer);
150-
}
151-
}));
134+
new FlushingBuffer(TEN_KB, (messageCount, buffer) -> testBufferContents(buffer)));
152135
for (Map<String, String> map : maps) {
153-
packer.format(
154-
map,
155-
new Mapper<Map<String, String>>() {
156-
@Override
157-
public void map(Map<String, String> m, Writable p) {
158-
p.writeMap(m, CACHE);
159-
}
160-
});
136+
packer.format(map, (m, p) -> p.writeMap(m, CACHE));
161137
}
162138
packer.flush();
163139
}
@@ -166,23 +142,9 @@ public void map(Map<String, String> m, Writable p) {
166142
public void testSerialiseTextMapWithoutCache() {
167143
MsgPackWriter packer =
168144
new MsgPackWriter(
169-
new FlushingBuffer(
170-
TEN_KB,
171-
new ByteBufferConsumer() {
172-
@Override
173-
public void accept(int messageCount, ByteBuffer buffer) {
174-
testBufferContents(buffer);
175-
}
176-
}));
145+
new FlushingBuffer(TEN_KB, (messageCount, buffer) -> testBufferContents(buffer)));
177146
for (Map<String, String> map : maps) {
178-
packer.format(
179-
map,
180-
new Mapper<Map<String, String>>() {
181-
@Override
182-
public void map(Map<String, String> m, Writable p) {
183-
p.writeMap(m, NO_CACHE);
184-
}
185-
});
147+
packer.format(map, (m, p) -> p.writeMap(m, NO_CACHE));
186148
}
187149
packer.flush();
188150
}

0 commit comments

Comments
 (0)