chore: move read write splitting files into a read_write_splitting directory (#609)

Author: karenc-bq

common/lib/connection_plugin_chain_builder.ts

@@ -29,7 +29,7 @@ import { FailoverPluginFactory } from "./plugins/failover/failover_plugin_factor
 import { Failover2PluginFactory } from "./plugins/failover2/failover2_plugin_factory";
 import { StaleDnsPluginFactory } from "./plugins/stale_dns/stale_dns_plugin_factory";
 import { FederatedAuthPluginFactory } from "./plugins/federated_auth/federated_auth_plugin_factory";
-import { ReadWriteSplittingPluginFactory } from "./plugins/read_write_splitting_plugin_factory";
+import { ReadWriteSplittingPluginFactory } from "./plugins/read_write_splitting/read_write_splitting_plugin_factory";
 import { OktaAuthPluginFactory } from "./plugins/federated_auth/okta_auth_plugin_factory";
 import { HostMonitoringPluginFactory } from "./plugins/efm/host_monitoring_plugin_factory";
 import { AuroraInitialConnectionStrategyFactory } from "./plugins/aurora_initial_connection_strategy_plugin_factory";

…b/plugins/read_write_splitting_plugin.ts …splitting/read_write_splitting_plugin.tscommon/lib/plugins/read_write_splitting_plugin.ts renamed to common/lib/plugins/read_write_splitting/read_write_splitting_plugin.ts common/lib/plugins/read_write_splitting_plugin.ts renamed to common/lib/plugins/read_write_splitting/read_write_splitting_plugin.ts

@@ -1,37 +1,37 @@
 /*
-  Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
- 
-  Licensed under the Apache License, Version 2.0 (the "License").
-  You may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-*/
-
-import { AbstractConnectionPlugin } from "../abstract_connection_plugin";
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { AbstractConnectionPlugin } from "../../abstract_connection_plugin";
 import {
   HostInfo,
   FailoverError,
   HostRole
-} from "../";
-import { PluginService } from "../plugin_service";
-import { HostListProviderService } from "../host_list_provider_service";
-import { OldConnectionSuggestionAction } from "../old_connection_suggestion_action";
-import { HostChangeOptions } from "../host_change_options";
-import { WrapperProperties } from "../wrapper_property";
-import { Messages } from "../utils/messages";
-import { logger } from "../../logutils";
-import { SqlMethodUtils } from "../utils/sql_method_utils";
-import { ClientWrapper } from "../client_wrapper";
-import { getWriter, logAndThrowError } from "../utils/utils";
-import { CanReleaseResources } from "../can_release_resources";
-import { PoolClientWrapper } from "../pool_client_wrapper";
+} from "../../index";
+import { PluginService } from "../../plugin_service";
+import { HostListProviderService } from "../../host_list_provider_service";
+import { OldConnectionSuggestionAction } from "../../old_connection_suggestion_action";
+import { HostChangeOptions } from "../../host_change_options";
+import { WrapperProperties } from "../../wrapper_property";
+import { Messages } from "../../utils/messages";
+import { logger } from "../../../logutils";
+import { SqlMethodUtils } from "../../utils/sql_method_utils";
+import { ClientWrapper } from "../../client_wrapper";
+import { getWriter, logAndThrowError } from "../../utils/utils";
+import { CanReleaseResources } from "../../can_release_resources";
+import { PoolClientWrapper } from "../../pool_client_wrapper";
 
 export class ReadWriteSplittingPlugin extends AbstractConnectionPlugin implements CanReleaseResources {
   private static readonly subscribedMethods: Set<string> = new Set(["initHostProvider", "connect", "notifyConnectionChanged", "query"]);

common/lib/plugins/read_write_splitting/read_write_splitting_plugin_factory.ts

@@ -0,0 +1,36 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ConnectionPluginFactory } from "../../plugin_factory";
+import { PluginService } from "../../plugin_service";
+import { ConnectionPlugin } from "../../connection_plugin";
+import { AwsWrapperError } from "../../utils/errors";
+import { Messages } from "../../utils/messages";
+
+export class ReadWriteSplittingPluginFactory extends ConnectionPluginFactory {
+  private static readWriteSplittingPlugin: any;
+
+  async getInstance(pluginService: PluginService, properties: Map<string, any>): Promise<ConnectionPlugin> {
+    try {
+      if (!ReadWriteSplittingPluginFactory.readWriteSplittingPlugin) {
+        ReadWriteSplittingPluginFactory.readWriteSplittingPlugin = await import("./read_write_splitting_plugin");
+      }
+      return new ReadWriteSplittingPluginFactory.readWriteSplittingPlugin.ReadWriteSplittingPlugin(pluginService, properties);
+    } catch (error: any) {
+      throw new AwsWrapperError(Messages.get("ConnectionPluginChainBuilder.errorImportingPlugin", error.message, "readWriteSplittingPlugin"));
+    }
+  }
+}

common/lib/plugins/read_write_splitting_plugin_factory.ts

@@ -20,7 +20,7 @@ import { WrapperProperties } from "../wrapper_property";
 import { HostMonitoringPluginFactory } from "../plugins/efm/host_monitoring_plugin_factory";
 import { AuroraInitialConnectionStrategyFactory } from "../plugins/aurora_initial_connection_strategy_plugin_factory";
 import { AuroraConnectionTrackerPluginFactory } from "../plugins/connection_tracker/aurora_connection_tracker_plugin_factory";
-import { ReadWriteSplittingPluginFactory } from "../plugins/read_write_splitting_plugin_factory";
+import { ReadWriteSplittingPluginFactory } from "../plugins/read_write_splitting/read_write_splitting_plugin_factory";
 import { FailoverPluginFactory } from "../plugins/failover/failover_plugin_factory";
 import { InternalPooledConnectionProvider } from "../internal_pooled_connection_provider";
 import { AwsPoolConfig } from "../aws_pool_config";

common/lib/profile/driver_configuration_profiles.ts

@@ -27,7 +27,7 @@ export { ConnectTimePlugin } from "./common/lib/plugins/connect_time_plugin";
 export { ExecuteTimePlugin } from "./common/lib/plugins/execute_time_plugin";
 export { AuroraInitialConnectionStrategyPlugin } from "./common/lib/plugins/aurora_initial_connection_strategy_plugin";
 export { DefaultPlugin } from "./common/lib/plugins/default_plugin";
-export { ReadWriteSplittingPlugin } from "./common/lib/plugins/read_write_splitting_plugin";
+export { ReadWriteSplittingPlugin } from "./common/lib/plugins/read_write_splitting/read_write_splitting_plugin";
 export { FailoverPlugin } from "./common/lib/plugins/failover/failover_plugin";
 export { Failover2Plugin } from "./common/lib/plugins/failover2/failover2_plugin";
 export { HostMonitoringConnectionPlugin } from "./common/lib/plugins/efm/host_monitoring_connection_plugin";

index.ts

@@ -29,7 +29,7 @@ import { PluginServiceImpl } from "../../common/lib/plugin_service";
 import { AwsMySQLClient } from "../../mysql/lib";
 import { anything, instance, mock, reset, spy, verify, when } from "ts-mockito";
 import { HostListProviderService } from "../../common/lib/host_list_provider_service";
-import { ReadWriteSplittingPlugin } from "../../common/lib/plugins/read_write_splitting_plugin";
+import { ReadWriteSplittingPlugin } from "../../common/lib/plugins/read_write_splitting/read_write_splitting_plugin";
 import { SimpleHostAvailabilityStrategy } from "../../common/lib/host_availability/simple_host_availability_strategy";
 import { MySQLDatabaseDialect } from "../../mysql/lib/dialect/mysql_database_dialect";
 import { HostChangeOptions } from "../../common/lib/host_change_options";