Skip to content

Commit c8d8d7d

Browse files
committed
chore(com): Reduce API surface
1 parent 251f993 commit c8d8d7d

7 files changed

Lines changed: 9 additions & 62 deletions

File tree

communication/src/main/java/datadog/communication/http/ahc/ApacheAsyncHttpClientFactory.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

communication/src/main/java/datadog/communication/http/ahc/ApacheAsyncHttpClient.java renamed to communication/src/main/java/datadog/communication/http/client/ahc/ApacheAsyncHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.communication.http.ahc;
1+
package datadog.communication.http.client.ahc;
22

33
import datadog.communication.http.HttpRetryPolicy;
44
import datadog.communication.http.client.HttpClient;

communication/src/main/java/datadog/communication/http/ahc/ApacheAsyncHttpClientBuilder.java renamed to communication/src/main/java/datadog/communication/http/client/ahc/ApacheAsyncHttpClientBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.communication.http.ahc;
1+
package datadog.communication.http.client.ahc;
22

33
import datadog.communication.http.HttpRetryPolicy;
44
import datadog.communication.http.client.HttpClient;

communication/src/main/java/datadog/communication/http/netty/NettyHttpClient.java renamed to communication/src/main/java/datadog/communication/http/client/netty/NettyHttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.communication.http.netty;
1+
package datadog.communication.http.client.netty;
22

33
import datadog.common.socket.NamedPipeSocketFactory;
44
import datadog.common.socket.UnixDomainSocketFactory;

communication/src/main/java/datadog/communication/http/netty/NettyHttpClientBuilder.java renamed to communication/src/main/java/datadog/communication/http/client/netty/NettyHttpClientBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.communication.http.netty;
1+
package datadog.communication.http.client.netty;
22

33
import datadog.communication.http.HttpRetryPolicy;
44
import datadog.communication.http.client.HttpClient;

communication/src/main/java/datadog/communication/http/netty/NettyHttpClientFactory.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

communication/src/test/java/datadog/communication/http/client/HttpClientContractTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
import static org.junit.jupiter.api.Assumptions.assumeTrue;
1111

1212
import datadog.communication.http.HttpRetryPolicy;
13-
import datadog.communication.http.ahc.ApacheAsyncHttpClientFactory;
14-
import datadog.communication.http.netty.NettyHttpClientBuilder;
15-
import datadog.communication.http.netty.NettyHttpClientFactory;
13+
import datadog.communication.http.client.ahc.ApacheAsyncHttpClientBuilder;
14+
import datadog.communication.http.client.netty.NettyHttpClientBuilder;
1615
import io.netty.channel.nio.NioEventLoopGroup;
1716
import java.io.Closeable;
1817
import java.io.IOException;
@@ -277,7 +276,7 @@ void shouldNotCloseExternallyManagedEventLoopGroupWhenSupported() {
277276

278277
NioEventLoopGroup externalGroup = new NioEventLoopGroup(1);
279278
try (HttpClient ignored =
280-
NettyHttpClientFactory.builder().eventLoopGroup(externalGroup, false).build()) {
279+
new NettyHttpClientBuilder().eventLoopGroup(externalGroup, false).build()) {
281280
// no-op
282281
}
283282
assertFalse(externalGroup.isShuttingDown());
@@ -333,11 +332,11 @@ public void beforeEach(ExtensionContext context) {
333332
switch (implementationValue) {
334333
case NETTY:
335334
((HttpClientContractTest) context.getRequiredTestInstance())
336-
.useBuilder(NettyHttpClientFactory.builder());
335+
.useBuilder(new NettyHttpClientBuilder());
337336
break;
338337
case AHC:
339338
((HttpClientContractTest) context.getRequiredTestInstance())
340-
.useBuilder(ApacheAsyncHttpClientFactory.builder());
339+
.useBuilder(new ApacheAsyncHttpClientBuilder());
341340
break;
342341
default:
343342
throw new IllegalStateException("Unsupported implementation: " + implementationValue);

0 commit comments

Comments
 (0)