Skip to content

Commit f30c82c

Browse files
committed
refactor(common): move ReproducibleHttpRequestDuplicator into common, package-private
The duplicator was public only to be reachable across the internal.common -> common package boundary from ReproducibleHttpRequest#toDuplicator. It has no external consumers, so co-locating it with its sole caller in com.linecorp.armeria.common lets it (and its constructor) become package-private, matching the sibling DefaultHttpRequestDuplicator. No behavior change. Co-authored-by: Isaac
1 parent fa94f5c commit f30c82c

3 files changed

Lines changed: 4 additions & 14 deletions

File tree

core/src/main/java/com/linecorp/armeria/common/ReproducibleHttpRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.reactivestreams.Publisher;
2525

2626
import com.linecorp.armeria.common.stream.StreamMessage;
27-
import com.linecorp.armeria.internal.common.ReproducibleHttpRequestDuplicator;
2827
import com.linecorp.armeria.internal.common.stream.NonOverridableStreamMessageWrapper;
2928

3029
import io.netty.util.concurrent.EventExecutor;

core/src/main/java/com/linecorp/armeria/internal/common/ReproducibleHttpRequestDuplicator.java renamed to core/src/main/java/com/linecorp/armeria/common/ReproducibleHttpRequestDuplicator.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* under the License.
1515
*/
1616

17-
package com.linecorp.armeria.internal.common;
17+
package com.linecorp.armeria.common;
1818

1919
import static java.util.Objects.requireNonNull;
2020

@@ -25,10 +25,6 @@
2525
import java.util.Set;
2626
import java.util.function.Supplier;
2727

28-
import com.linecorp.armeria.common.HttpObject;
29-
import com.linecorp.armeria.common.HttpRequest;
30-
import com.linecorp.armeria.common.HttpRequestDuplicator;
31-
import com.linecorp.armeria.common.RequestHeaders;
3228
import com.linecorp.armeria.common.annotation.Nullable;
3329
import com.linecorp.armeria.common.stream.StreamMessage;
3430

@@ -53,7 +49,7 @@
5349
* {@code duplicate}, and {@code duplicate} then throws instead of returning a request that would never
5450
* be torn down.
5551
*/
56-
public final class ReproducibleHttpRequestDuplicator implements HttpRequestDuplicator {
52+
final class ReproducibleHttpRequestDuplicator implements HttpRequestDuplicator {
5753

5854
private final RequestHeaders headers;
5955
private final Supplier<? extends StreamMessage<? extends HttpObject>> bodyFactory;
@@ -65,7 +61,7 @@ public final class ReproducibleHttpRequestDuplicator implements HttpRequestDupli
6561
@Nullable
6662
private Throwable abortCause;
6763

68-
public ReproducibleHttpRequestDuplicator(
64+
ReproducibleHttpRequestDuplicator(
6965
RequestHeaders headers,
7066
Supplier<? extends StreamMessage<? extends HttpObject>> bodyFactory) {
7167
this.headers = requireNonNull(headers, "headers");

core/src/test/java/com/linecorp/armeria/internal/common/ReproducibleHttpRequestDuplicatorTest.java renamed to core/src/test/java/com/linecorp/armeria/common/ReproducibleHttpRequestDuplicatorTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* under the License.
1515
*/
1616

17-
package com.linecorp.armeria.internal.common;
17+
package com.linecorp.armeria.common;
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -24,11 +24,6 @@
2424

2525
import org.junit.jupiter.api.Test;
2626

27-
import com.linecorp.armeria.common.HttpData;
28-
import com.linecorp.armeria.common.HttpMethod;
29-
import com.linecorp.armeria.common.HttpObject;
30-
import com.linecorp.armeria.common.HttpRequest;
31-
import com.linecorp.armeria.common.RequestHeaders;
3227
import com.linecorp.armeria.common.stream.StreamMessage;
3328

3429
class ReproducibleHttpRequestDuplicatorTest {

0 commit comments

Comments
 (0)