Move tests

apple · Dec 11, 2024 · 5ae052a · 5ae052a
1 parent 2d1db2a
commit 5ae052a
Show file tree

Hide file tree

Showing 50 changed files with 10 additions and 141 deletions.
diff --git a/servicetalk-examples/docs/modules/ROOT/pages/http/index.adoc b/servicetalk-examples/docs/modules/ROOT/pages/http/index.adoc
@@ -236,20 +236,18 @@ on via a client filter on the client builder.
 
 [#LoadBalancer]
 == LoadBalancer
-This example demonstrates how to use and configure the experimental link:{source-root}/servicetalk-loadbalancer-experimental/src/main/java/io/servicetalk/loadbalancer/LoadBalancers.java[LoadBalancers]:
+This example demonstrates how to use and configure link:{source-root}/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/LoadBalancers.java[LoadBalancers]:
 
-- by using link:{source-root}/servicetalk-loadbalancer-experimental/src/main/java/io/servicetalk/loadbalancer/LoadBalancerBuilder.java[LoadBalancerBuilder] to customize its setting:
-  * configuring a different link:{source-root}/servicetalk-loadbalancer-experimental/src/main/java/io/servicetalk/loadbalancer/LoadBalancingPolicy.java[LoadBalancingPolicy]
-  * configuring xDS failure detection using link:{source-root}/servicetalk-loadbalancer-experimental/src/main/java/io/servicetalk/loadbalancer/OutlierDetectorConfig.java[OutlierDetectorConfig]
+- by using link:{source-root}/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/LoadBalancerBuilder.java[LoadBalancerBuilder] to customize its setting:
+  * configuring a different link:{source-root}/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/LoadBalancingPolicy.java[LoadBalancingPolicy]
+  * configuring xDS failure detection using link:{source-root}/servicetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/OutlierDetectorConfig.java[OutlierDetectorConfig]
 - by using link:{source-root}/servicetalk-http-api/src/main/java/io/servicetalk/http/api/DefaultHttpLoadBalancerFactory.java[DefaultHttpLoadBalancerFactory] to adapt a LoadBalancer to HTTP and configure it via client builder
 
 Using the following classes:
 
 - link:{source-root}/servicetalk-examples/http/loadbalancer/src/main/java/io/servicetalk/examples/http/loadbalancer/CustomLoadBalancerClient.java[CustomLoadBalancerClient] - A client that configures custom settings for its LoadBalancer.
 - link:{source-root}/servicetalk-examples/http/loadbalancer/src/main/java/io/servicetalk/examples/http/loadbalancer/HelloWorldServer.java[HelloWorldServer] - A simple server implementation.
 
-NOTE: DefaultLoadBalancer is currently considered experimental and therefore the API is subject to change.
-
 [#OpenTracing]
 == OpenTracing
 

diff --git a/servicetalk-http-netty/build.gradle b/servicetalk-http-netty/build.gradle
@@ -29,7 +29,6 @@ dependencies {
   implementation project(":servicetalk-dns-discovery-netty")
   implementation project(":servicetalk-http-utils")
   implementation project(":servicetalk-loadbalancer")
-  implementation project(":servicetalk-loadbalancer-experimental")
   implementation project(":servicetalk-loadbalancer-experimental-provider")
   implementation project(":servicetalk-logging-slf4j-internal")
   implementation project(":servicetalk-tcp-netty-internal")

diff --git a/servicetalk-loadbalancer-experimental-provider/build.gradle b/servicetalk-loadbalancer-experimental-provider/build.gradle
@@ -21,6 +21,5 @@ dependencies {
 
   implementation project(":servicetalk-annotations")
   implementation project(":servicetalk-loadbalancer")
-  implementation project(":servicetalk-loadbalancer-experimental")
   implementation "org.slf4j:slf4j-api:$slf4jVersion"
 }
diff --git a/servicetalk-loadbalancer-experimental/build.gradle b/servicetalk-loadbalancer-experimental/build.gradle
diff --git a/servicetalk-loadbalancer-experimental/gradle.lockfile b/servicetalk-loadbalancer-experimental/gradle.lockfile
diff --git a/servicetalk-loadbalancer-experimental/gradle/checkstyle/suppressions.xml b/servicetalk-loadbalancer-experimental/gradle/checkstyle/suppressions.xml
diff --git a/servicetalk-loadbalancer-experimental/gradle/spotbugs/test-exclusions.xml b/servicetalk-loadbalancer-experimental/gradle/spotbugs/test-exclusions.xml
diff --git a/...alk-loadbalancer-experimental/README.adoc → ...alk-loadbalancer/DEFAULTLOADBALANCER.adoc b/...alk-loadbalancer-experimental/README.adoc → ...alk-loadbalancer/DEFAULTLOADBALANCER.adoc
diff --git a/servicetalk-loadbalancer/gradle/checkstyle/suppressions.xml b/servicetalk-loadbalancer/gradle/checkstyle/suppressions.xml
@@ -18,7 +18,7 @@
         "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
         "https://checkstyle.org/dtds/suppressions_1_2.dtd">
 
-<suppressions>C
+<suppressions>
     <suppress checks="LineLength"
               files="io[\\/]servicetalk[\\/]loadbalancer[\\/]OutlierDetectorConfig.java"/>
 </suppressions>
diff --git a/...xperimental/license/LICENSE.grpc-java.txt → ...oadbalancer/license/LICENSE.grpc-java.txt b/...xperimental/license/LICENSE.grpc-java.txt → ...oadbalancer/license/LICENSE.grpc-java.txt
diff --git a/...cetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/ConnectionPoolPolicies.java b/...cetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/ConnectionPoolPolicies.java
@@ -25,15 +25,6 @@ private ConnectionPoolPolicies() {
         // no instances
     }
 
-    /**
-     * Get the recommended default {@link ConnectionPoolPolicy}.
-     * @param <C> the concrete type of the {@link LoadBalancedConnection}
-     * @return the recommended default {@link ConnectionPoolPolicy}.
-     */
-    public static <C extends LoadBalancedConnection> ConnectionPoolPolicy<C> defaultPolicy() {
-        return linearSearch();
-    }
-
     /**
      * A connection selection policy that prioritizes a configurable "core" pool.
      * <p>

diff --git a/...lk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/DefaultLoadBalancerBuilder.java b/...lk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/DefaultLoadBalancerBuilder.java
@@ -39,8 +39,8 @@ final class DefaultLoadBalancerBuilder<ResolvedAddress, C extends LoadBalancedCo
     private Executor backgroundExecutor;
     @Nullable
     private LoadBalancerObserverFactory loadBalancerObserverFactory;
-    private LoadBalancingPolicy<ResolvedAddress, C> loadBalancingPolicy = LoadBalancingPolicies.defaultPolicy();
-    private ConnectionPoolPolicy<C> connectionPoolPolicy = ConnectionPoolPolicies.defaultPolicy();;
+    private LoadBalancingPolicy<ResolvedAddress, C> loadBalancingPolicy = LoadBalancingPolicies.roundRobin().build();
+    private ConnectionPoolPolicy<C> connectionPoolPolicy = ConnectionPoolPolicies.linearSearch();
     private OutlierDetectorConfig outlierDetectorConfig = OutlierDetectorConfig.DEFAULT_CONFIG;
 
     // package private constructor so users must funnel through providers in `LoadBalancers`

diff --git a/...icetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/LoadBalancingPolicies.java b/...icetalk-loadbalancer/src/main/java/io/servicetalk/loadbalancer/LoadBalancingPolicies.java
@@ -15,8 +15,6 @@
  */
 package io.servicetalk.loadbalancer;
 
-import io.servicetalk.client.api.LoadBalancedConnection;
-
 /**
  * A collections of factories for constructing a {@link LoadBalancingPolicy}.
  */
@@ -26,15 +24,6 @@ private LoadBalancingPolicies() {
         // no instances.
     }
 
-    /**
-     * Get the recommended default {@link LoadBalancingPolicy}.
-     * @return the recommended default {@link LoadBalancingPolicy}.
-     */
-    public static <ResolvedAddress, C extends LoadBalancedConnection>
-    LoadBalancingPolicy<ResolvedAddress, C> defaultPolicy() {
-        return LoadBalancingPolicies.roundRobin().build();
-    }
-
     /**
      * Builder for the round-robin {@link LoadBalancingPolicy}.
      * Round-robin load balancing is a strategy that maximizes fairness of the request distribution. This comes at the

diff --git a/...undRobinToDefaultLBMigrationProvider.java → ...undRobinToDefaultLBMigrationProvider.java b/...undRobinToDefaultLBMigrationProvider.java → ...undRobinToDefaultLBMigrationProvider.java
diff --git a/...cer.RoundRobinLoadBalancerBuilderProvider → ...cer.RoundRobinLoadBalancerBuilderProvider b/...cer.RoundRobinLoadBalancerBuilderProvider → ...cer.RoundRobinLoadBalancerBuilderProvider
diff --git a/...adbalancer/ConnectionSelectorHelpers.java → ...adbalancer/ConnectionSelectorHelpers.java b/...adbalancer/ConnectionSelectorHelpers.java → ...adbalancer/ConnectionSelectorHelpers.java
diff --git a/...ancer/CorePoolConnectionSelectorTest.java → ...ancer/CorePoolConnectionSelectorTest.java b/...ancer/CorePoolConnectionSelectorTest.java → ...ancer/CorePoolConnectionSelectorTest.java
diff --git a/...ncer/DefaultHostPriorityStrategyTest.java → ...ncer/DefaultHostPriorityStrategyTest.java b/...ncer/DefaultHostPriorityStrategyTest.java → ...ncer/DefaultHostPriorityStrategyTest.java
diff --git a/...icetalk/loadbalancer/DefaultHostTest.java → ...icetalk/loadbalancer/DefaultHostTest.java b/...icetalk/loadbalancer/DefaultHostTest.java → ...icetalk/loadbalancer/DefaultHostTest.java
diff --git a/...ancer/DefaultLoadBalancerBuilderTest.java → ...ancer/DefaultLoadBalancerBuilderTest.java b/...ancer/DefaultLoadBalancerBuilderTest.java → ...ancer/DefaultLoadBalancerBuilderTest.java
diff --git a/...loadbalancer/DefaultLoadBalancerTest.java → ...loadbalancer/DefaultLoadBalancerTest.java b/...loadbalancer/DefaultLoadBalancerTest.java → ...loadbalancer/DefaultLoadBalancerTest.java
diff --git a/...adbalancer/DefaultRequestTrackerTest.java → ...adbalancer/DefaultRequestTrackerTest.java b/...adbalancer/DefaultRequestTrackerTest.java → ...adbalancer/DefaultRequestTrackerTest.java
diff --git a/...k/loadbalancer/EagerLoadBalancerTest.java → ...k/loadbalancer/EagerLoadBalancerTest.java b/...k/loadbalancer/EagerLoadBalancerTest.java → ...k/loadbalancer/EagerLoadBalancerTest.java
diff --git a/...r/EagerNewRoundRobinLoadBalancerTest.java → ...r/EagerNewRoundRobinLoadBalancerTest.java b/...r/EagerNewRoundRobinLoadBalancerTest.java → ...r/EagerNewRoundRobinLoadBalancerTest.java
diff --git a/...oadbalancer/EagerP2CLoadBalancerTest.java → ...oadbalancer/EagerP2CLoadBalancerTest.java b/...oadbalancer/EagerP2CLoadBalancerTest.java → ...oadbalancer/EagerP2CLoadBalancerTest.java
diff --git a/...ncer/EagerRoundRobinLoadBalancerTest.java → ...ncer/EagerRoundRobinLoadBalancerTest.java b/...ncer/EagerRoundRobinLoadBalancerTest.java → ...ncer/EagerRoundRobinLoadBalancerTest.java
diff --git a/...r/LinearSearchConnectionSelectorTest.java → ...r/LinearSearchConnectionSelectorTest.java b/...r/LinearSearchConnectionSelectorTest.java → ...r/LinearSearchConnectionSelectorTest.java
diff --git a/...adbalancer/LingeringLoadBalancerTest.java → ...adbalancer/LingeringLoadBalancerTest.java b/...adbalancer/LingeringLoadBalancerTest.java → ...adbalancer/LingeringLoadBalancerTest.java
diff --git a/...ngeringNewRoundRobinLoadBalancerTest.java → ...ngeringNewRoundRobinLoadBalancerTest.java b/...ngeringNewRoundRobinLoadBalancerTest.java → ...ngeringNewRoundRobinLoadBalancerTest.java
diff --git a/...alancer/LingeringP2CLoadBalancerTest.java → ...alancer/LingeringP2CLoadBalancerTest.java b/...alancer/LingeringP2CLoadBalancerTest.java → ...alancer/LingeringP2CLoadBalancerTest.java
diff --git a/.../LingeringRoundRobinLoadBalancerTest.java → .../LingeringRoundRobinLoadBalancerTest.java b/.../LingeringRoundRobinLoadBalancerTest.java → .../LingeringRoundRobinLoadBalancerTest.java
diff --git a/...cetalk/loadbalancer/LoadBalancerTest.java → ...cetalk/loadbalancer/LoadBalancerTest.java b/...cetalk/loadbalancer/LoadBalancerTest.java → ...cetalk/loadbalancer/LoadBalancerTest.java
diff --git a/...oadbalancer/LoadBalancerTestScaffold.java → ...oadbalancer/LoadBalancerTestScaffold.java b/...oadbalancer/LoadBalancerTestScaffold.java → ...oadbalancer/LoadBalancerTestScaffold.java
diff --git a/...oadbalancer/MockLoadBalancerObserver.java → ...oadbalancer/MockLoadBalancerObserver.java b/...oadbalancer/MockLoadBalancerObserver.java → ...oadbalancer/MockLoadBalancerObserver.java
diff --git a/...adbalancer/P2CConnectionSelectorTest.java → ...adbalancer/P2CConnectionSelectorTest.java b/...adbalancer/P2CConnectionSelectorTest.java → ...adbalancer/P2CConnectionSelectorTest.java
diff --git a/...icetalk/loadbalancer/P2CSelectorTest.java → ...icetalk/loadbalancer/P2CSelectorTest.java b/...icetalk/loadbalancer/P2CSelectorTest.java → ...icetalk/loadbalancer/P2CSelectorTest.java
diff --git a/...alk/loadbalancer/RandomSubsetterTest.java → ...alk/loadbalancer/RandomSubsetterTest.java b/...alk/loadbalancer/RandomSubsetterTest.java → ...alk/loadbalancer/RandomSubsetterTest.java
diff --git a/...RoundRobinLoadBalancerBuilderAdapter.java → ...RoundRobinLoadBalancerBuilderAdapter.java b/...RoundRobinLoadBalancerBuilderAdapter.java → ...RoundRobinLoadBalancerBuilderAdapter.java
diff --git a/.../src/test/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancerBuilderProviderTest.java b/.../src/test/java/io/servicetalk/loadbalancer/RoundRobinLoadBalancerBuilderProviderTest.java
@@ -26,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static io.servicetalk.loadbalancer.RoundRobinToDefaultLBMigrationProvider.PROPERTY_NAME;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
@@ -34,11 +35,13 @@ class RoundRobinLoadBalancerBuilderProviderTest {
     @BeforeEach
     void reset() {
         TestRoundRobinLoadBalancerBuilderProvider.reset();
+        System.setProperty(PROPERTY_NAME, Boolean.FALSE.toString());
     }
 
     @AfterEach
     void deactivate() {
         TestRoundRobinLoadBalancerBuilderProvider.activated.set(false);
+        System.setProperty(PROPERTY_NAME, Boolean.TRUE.toString());
     }
 
     @Test

diff --git a/.../loadbalancer/RoundRobinSelectorTest.java → .../loadbalancer/RoundRobinSelectorTest.java b/.../loadbalancer/RoundRobinSelectorTest.java → .../loadbalancer/RoundRobinSelectorTest.java
diff --git a/...obinToDefaultLBMigrationProviderTest.java → ...obinToDefaultLBMigrationProviderTest.java b/...obinToDefaultLBMigrationProviderTest.java → ...obinToDefaultLBMigrationProviderTest.java
diff --git a/...alk/loadbalancer/SelectorTestHelpers.java → ...alk/loadbalancer/SelectorTestHelpers.java b/...alk/loadbalancer/SelectorTestHelpers.java → ...alk/loadbalancer/SelectorTestHelpers.java
diff --git a/.../loadbalancer/SequentialExecutorTest.java → .../loadbalancer/SequentialExecutorTest.java b/.../loadbalancer/SequentialExecutorTest.java → .../loadbalancer/SequentialExecutorTest.java
diff --git a/...k/loadbalancer/TestConnectionFactory.java → ...k/loadbalancer/TestConnectionFactory.java b/...k/loadbalancer/TestConnectionFactory.java → ...k/loadbalancer/TestConnectionFactory.java
diff --git a/...dbalancer/TestLoadBalancedConnection.java → ...dbalancer/TestLoadBalancedConnection.java b/...dbalancer/TestLoadBalancedConnection.java → ...dbalancer/TestLoadBalancedConnection.java
diff --git a/...ancer/UnhealthyHostConnectionFactory.java → ...ancer/UnhealthyHostConnectionFactory.java b/...ancer/UnhealthyHostConnectionFactory.java → ...ancer/UnhealthyHostConnectionFactory.java
diff --git a/.../loadbalancer/XdsHealthIndicatorTest.java → .../loadbalancer/XdsHealthIndicatorTest.java b/.../loadbalancer/XdsHealthIndicatorTest.java → .../loadbalancer/XdsHealthIndicatorTest.java
diff --git a/...ncer/XdsOutlierDetectorAlgorithmTest.java → ...ncer/XdsOutlierDetectorAlgorithmTest.java b/...ncer/XdsOutlierDetectorAlgorithmTest.java → ...ncer/XdsOutlierDetectorAlgorithmTest.java
diff --git a/.../loadbalancer/XdsOutlierDetectorTest.java → .../loadbalancer/XdsOutlierDetectorTest.java b/.../loadbalancer/XdsOutlierDetectorTest.java → .../loadbalancer/XdsOutlierDetectorTest.java
diff --git a/settings.gradle b/settings.gradle
@@ -102,7 +102,6 @@ include "servicetalk-annotations",
         "servicetalk-http-security-jersey3-jakarta10",
         "servicetalk-http-utils",
         "servicetalk-loadbalancer",
-        "servicetalk-loadbalancer-experimental",
         "servicetalk-loadbalancer-experimental-provider",
         "servicetalk-log4j2-mdc",
         "servicetalk-log4j2-mdc-utils",