refactor: move setHostWeightPairsProperty method from RoundRobin to HostSelectorUtils

Author: aaronchung-bitquill

wrapper/src/main/java/software/amazon/jdbc/plugin/limitless/LimitlessRouterServiceImpl.java

@@ -37,6 +37,7 @@
 import software.amazon.jdbc.RoundRobinHostSelector;
 import software.amazon.jdbc.hostavailability.HostAvailability;
 import software.amazon.jdbc.util.FullServicesContainer;
+import software.amazon.jdbc.util.HostSelectorUtils;
 import software.amazon.jdbc.util.Messages;
 import software.amazon.jdbc.util.Utils;
 import software.amazon.jdbc.util.monitoring.MonitorErrorResponse;
@@ -126,7 +127,7 @@ public void establishConnection(final LimitlessConnectionContext context) throws
       return;
     }
 
-    RoundRobinHostSelector.setRoundRobinHostWeightPairsProperty(
+    HostSelectorUtils.setHostWeightPairsProperty(RoundRobinHostSelector.ROUND_ROBIN_HOST_WEIGHT_PAIRS,
         context.getProps(),
         context.getLimitlessRouters());
     HostSpec selectedHostSpec;

wrapper/src/main/java/software/amazon/jdbc/util/HostSelectorUtils.java

@@ -0,0 +1,27 @@
+package software.amazon.jdbc.util;
+
+import java.util.List;
+import java.util.Properties;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import software.amazon.jdbc.AwsWrapperProperty;
+import software.amazon.jdbc.HostSpec;
+
+public class HostSelectorUtils {
+  public static void setHostWeightPairsProperty(
+      final @NonNull AwsWrapperProperty property,
+      final @NonNull Properties properties,
+      final @NonNull List<HostSpec> hosts) {
+    final StringBuilder builder = new StringBuilder();
+    for (int i = 0; i < hosts.size(); i++) {
+      builder
+          .append(hosts.get(i).getHostId())
+          .append(":")
+          .append(hosts.get(i).getWeight());
+      if (i < hosts.size() - 1) {
+        builder.append(",");
+      }
+    }
+    final String hostWeightPairsString = builder.toString();
+    properties.setProperty(property.name, hostWeightPairsString);
+  }
+}

wrapper/src/test/java/software/amazon/jdbc/RoundRobinHostSelectorTest.java

@@ -32,6 +32,7 @@
 import software.amazon.jdbc.HostSpecBuilder;
 import software.amazon.jdbc.RoundRobinHostSelector;
 import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
+import software.amazon.jdbc.util.HostSelectorUtils;
 
 public class RoundRobinHostSelectorTest {
   private static final int TEST_PORT = 5432;
@@ -524,34 +525,4 @@ void testGetHost_AllHostsChanged() throws SQLException {
         readerHostSpec4.getHost(),
         roundRobinHostSelector.getHost(hostsList14, HostRole.READER, defaultProps).getHost());
   }
-
-  @Test
-  void testSetRoundRobinHostWeightPairsProperty() {
-    final String expectedPropertyValue = "instance-1-id:2,instance-2-id:1,instance-3-id:0";
-
-    final List<HostSpec> hosts = Arrays.asList(
-        new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
-            .host("instance-1")
-            .hostId("instance-1-id")
-            .weight(2)
-            .build(),
-        new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
-            .host("instance-2")
-            .hostId("instance-2-id")
-            .weight(1)
-            .build(),
-        new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
-            .host("instance-3")
-            .hostId("instance-3-id")
-            .weight(0)
-            .build()
-    );
-    final Properties properties = new Properties();
-    RoundRobinHostSelector.setRoundRobinHostWeightPairsProperty(properties, hosts);
-
-    final String actualPropertyValue = properties.getProperty(
-        RoundRobinHostSelector.ROUND_ROBIN_HOST_WEIGHT_PAIRS.name);
-
-    assertEquals(expectedPropertyValue, actualPropertyValue);
-  }
 }

wrapper/src/test/java/software/amazon/jdbc/util/HostSelectorUtilsTests.java

@@ -0,0 +1,44 @@
+package software.amazon.jdbc.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import org.junit.jupiter.api.Test;
+import software.amazon.jdbc.HostSpec;
+import software.amazon.jdbc.HostSpecBuilder;
+import software.amazon.jdbc.RoundRobinHostSelector;
+import software.amazon.jdbc.hostavailability.SimpleHostAvailabilityStrategy;
+
+public class HostSelectorUtilsTests {
+  @Test
+  void testSetHostWeightPairsProperty() {
+    final String expectedPropertyValue = "instance-1-id:2,instance-2-id:1,instance-3-id:0";
+
+    final List<HostSpec> hosts = Arrays.asList(
+        new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
+            .host("instance-1")
+            .hostId("instance-1-id")
+            .weight(2)
+            .build(),
+        new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
+            .host("instance-2")
+            .hostId("instance-2-id")
+            .weight(1)
+            .build(),
+        new HostSpecBuilder(new SimpleHostAvailabilityStrategy())
+            .host("instance-3")
+            .hostId("instance-3-id")
+            .weight(0)
+            .build()
+    );
+    final Properties properties = new Properties();
+    HostSelectorUtils.setHostWeightPairsProperty(RoundRobinHostSelector.ROUND_ROBIN_HOST_WEIGHT_PAIRS, properties, hosts);
+
+    final String actualPropertyValue = properties.getProperty(
+        RoundRobinHostSelector.ROUND_ROBIN_HOST_WEIGHT_PAIRS.name);
+
+    assertEquals(expectedPropertyValue, actualPropertyValue);
+  }
+}