Skip to content

Commit 43e5645

Browse files
aaron-congoaaron-congo
committed
Revert ConnectionPluginFactory -> PluginFactory
1 parent bd34d6a commit 43e5645

File tree

32 files changed

+144
-144
lines changed

32 files changed

+144
-144
lines changed

‎benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/ConnectionPluginManagerBenchmarks.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import software.amazon.jdbc.JdbcMethod;
5959
import software.amazon.jdbc.NodeChangeOptions;
6060
import software.amazon.jdbc.OldConnectionSuggestedAction;
61-
import software.amazon.jdbc.PluginFactory;
61+
import software.amazon.jdbc.ConnectionPluginFactory;
6262
import software.amazon.jdbc.PluginManagerService;
6363
import software.amazon.jdbc.PluginService;
6464
import software.amazon.jdbc.PropertyDefinition;
@@ -144,7 +144,7 @@ public void setUpIteration() throws Exception {
144144
when(mockPluginService.getTelemetryFactory()).thenReturn(mockTelemetryFactory);
145145

146146
// Create a plugin chain with 10 custom test plugins.
147-
final List<Class<? extends PluginFactory>> pluginFactories = new ArrayList<>(
147+
final List<Class<? extends ConnectionPluginFactory>> pluginFactories = new ArrayList<>(
148148
Collections.nCopies(10, BenchmarkPluginFactory.class));
149149

150150
configurationProfile = ConfigurationProfileBuilder.get()

‎benchmarks/src/jmh/java/software/amazon/jdbc/benchmarks/testplugin/BenchmarkPluginFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.util.Properties;
2020
import software.amazon.jdbc.ConnectionPlugin;
21-
import software.amazon.jdbc.PluginFactory;
21+
import software.amazon.jdbc.ConnectionPluginFactory;
2222
import software.amazon.jdbc.util.FullServicesContainer;
2323

24-
public class BenchmarkPluginFactory implements PluginFactory {
24+
public class BenchmarkPluginFactory implements ConnectionPluginFactory {
2525

2626
@Override
2727
public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {

‎wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginChainBuilder.java‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@
3131
import org.checkerframework.checker.nullness.qual.Nullable;
3232
import software.amazon.jdbc.plugin.AuroraConnectionTrackerPluginFactory;
3333
import software.amazon.jdbc.plugin.AuroraInitialConnectionStrategyPluginFactory;
34-
import software.amazon.jdbc.plugin.AwsSecretsManagerPluginFactory;
35-
import software.amazon.jdbc.plugin.ConnectTimePluginFactory;
36-
import software.amazon.jdbc.plugin.DataCachePluginFactory;
34+
import software.amazon.jdbc.plugin.AwsSecretsManagerConnectionPluginFactory;
35+
import software.amazon.jdbc.plugin.ConnectTimeConnectionPluginFactory;
36+
import software.amazon.jdbc.plugin.DataCacheConnectionPluginFactory;
3737
import software.amazon.jdbc.plugin.DefaultConnectionPlugin;
38-
import software.amazon.jdbc.plugin.DriverMetaDataPluginFactory;
39-
import software.amazon.jdbc.plugin.ExecutionTimePluginFactory;
40-
import software.amazon.jdbc.plugin.LogQueryPluginFactory;
41-
import software.amazon.jdbc.plugin.bluegreen.BlueGreenPluginFactory;
38+
import software.amazon.jdbc.plugin.DriverMetaDataConnectionPluginFactory;
39+
import software.amazon.jdbc.plugin.ExecutionTimeConnectionPluginFactory;
40+
import software.amazon.jdbc.plugin.LogQueryConnectionPluginFactory;
41+
import software.amazon.jdbc.plugin.bluegreen.BlueGreenConnectionPluginFactory;
4242
import software.amazon.jdbc.plugin.customendpoint.CustomEndpointPluginFactory;
43-
import software.amazon.jdbc.plugin.dev.DeveloperPluginFactory;
44-
import software.amazon.jdbc.plugin.efm.HostMonitoringPluginFactory;
45-
import software.amazon.jdbc.plugin.failover.FailoverPluginFactory;
43+
import software.amazon.jdbc.plugin.dev.DeveloperConnectionPluginFactory;
44+
import software.amazon.jdbc.plugin.efm.HostMonitoringConnectionPluginFactory;
45+
import software.amazon.jdbc.plugin.failover.FailoverConnectionPluginFactory;
4646
import software.amazon.jdbc.plugin.federatedauth.FederatedAuthPluginFactory;
4747
import software.amazon.jdbc.plugin.federatedauth.OktaAuthPluginFactory;
48-
import software.amazon.jdbc.plugin.iam.IamAuthPluginFactory;
49-
import software.amazon.jdbc.plugin.limitless.LimitlessPluginFactory;
48+
import software.amazon.jdbc.plugin.iam.IamAuthConnectionPluginFactory;
49+
import software.amazon.jdbc.plugin.limitless.LimitlessConnectionPluginFactory;
5050
import software.amazon.jdbc.plugin.readwritesplitting.ReadWriteSplittingPluginFactory;
5151
import software.amazon.jdbc.plugin.srw.SimpleReadWriteSplittingPluginFactory;
5252
import software.amazon.jdbc.plugin.staledns.AuroraStaleDnsPluginFactory;
@@ -64,32 +64,32 @@ public class ConnectionPluginChainBuilder {
6464

6565
private static final int WEIGHT_RELATIVE_TO_PRIOR_PLUGIN = -1;
6666

67-
protected static final Map<String, PluginFactory> pluginFactoriesByCode =
68-
new HashMap<String, PluginFactory>() {
67+
protected static final Map<String, ConnectionPluginFactory> pluginFactoriesByCode =
68+
new HashMap<String, ConnectionPluginFactory>() {
6969
{
70-
put("executionTime", new ExecutionTimePluginFactory());
71-
put("logQuery", new LogQueryPluginFactory());
72-
put("dataCache", new DataCachePluginFactory());
70+
put("executionTime", new ExecutionTimeConnectionPluginFactory());
71+
put("logQuery", new LogQueryConnectionPluginFactory());
72+
put("dataCache", new DataCacheConnectionPluginFactory());
7373
put("customEndpoint", new CustomEndpointPluginFactory());
74-
put("efm", new HostMonitoringPluginFactory());
75-
put("efm2", new software.amazon.jdbc.plugin.efm2.HostMonitoringPluginFactory());
76-
put("failover", new FailoverPluginFactory());
77-
put("failover2", new software.amazon.jdbc.plugin.failover2.FailoverPluginFactory());
78-
put("iam", new IamAuthPluginFactory());
79-
put("awsSecretsManager", new AwsSecretsManagerPluginFactory());
74+
put("efm", new HostMonitoringConnectionPluginFactory());
75+
put("efm2", new software.amazon.jdbc.plugin.efm2.HostMonitoringConnectionPluginFactory());
76+
put("failover", new FailoverConnectionPluginFactory());
77+
put("failover2", new FailoverConnectionPluginFactory());
78+
put("iam", new IamAuthConnectionPluginFactory());
79+
put("awsSecretsManager", new AwsSecretsManagerConnectionPluginFactory());
8080
put("federatedAuth", new FederatedAuthPluginFactory());
8181
put("okta", new OktaAuthPluginFactory());
8282
put("auroraStaleDns", new AuroraStaleDnsPluginFactory());
8383
put("readWriteSplitting", new ReadWriteSplittingPluginFactory());
8484
put("srw", new SimpleReadWriteSplittingPluginFactory());
8585
put("auroraConnectionTracker", new AuroraConnectionTrackerPluginFactory());
86-
put("driverMetaData", new DriverMetaDataPluginFactory());
87-
put("connectTime", new ConnectTimePluginFactory());
88-
put("dev", new DeveloperPluginFactory());
86+
put("driverMetaData", new DriverMetaDataConnectionPluginFactory());
87+
put("connectTime", new ConnectTimeConnectionPluginFactory());
88+
put("dev", new DeveloperConnectionPluginFactory());
8989
put("fastestResponseStrategy", new FastestResponseStrategyPluginFactory());
9090
put("initialConnection", new AuroraInitialConnectionStrategyPluginFactory());
91-
put("limitless", new LimitlessPluginFactory());
92-
put("bg", new BlueGreenPluginFactory());
91+
put("limitless", new LimitlessConnectionPluginFactory());
92+
put("bg", new BlueGreenConnectionPluginFactory());
9393
}
9494
};
9595

@@ -98,35 +98,35 @@ public class ConnectionPluginChainBuilder {
9898
* the highest values. The first plugin of the list will have the lowest weight, and the
9999
* last one will have the highest weight.
100100
*/
101-
protected static final Map<Class<? extends PluginFactory>, Integer> pluginWeightByPluginFactory =
102-
new HashMap<Class<? extends PluginFactory>, Integer>() {
101+
protected static final Map<Class<? extends ConnectionPluginFactory>, Integer> pluginWeightByPluginFactory =
102+
new HashMap<Class<? extends ConnectionPluginFactory>, Integer>() {
103103
{
104-
put(DriverMetaDataPluginFactory.class, 100);
105-
put(DataCachePluginFactory.class, 200);
104+
put(DriverMetaDataConnectionPluginFactory.class, 100);
105+
put(DataCacheConnectionPluginFactory.class, 200);
106106
put(CustomEndpointPluginFactory.class, 380);
107107
put(AuroraInitialConnectionStrategyPluginFactory.class, 390);
108108
put(AuroraConnectionTrackerPluginFactory.class, 400);
109109
put(AuroraStaleDnsPluginFactory.class, 500);
110-
put(BlueGreenPluginFactory.class, 550);
110+
put(BlueGreenConnectionPluginFactory.class, 550);
111111
put(ReadWriteSplittingPluginFactory.class, 600);
112112
put(SimpleReadWriteSplittingPluginFactory.class, 610);
113-
put(FailoverPluginFactory.class, 700);
114-
put(software.amazon.jdbc.plugin.failover2.FailoverPluginFactory.class, 710);
115-
put(HostMonitoringPluginFactory.class, 800);
116-
put(software.amazon.jdbc.plugin.efm2.HostMonitoringPluginFactory.class, 810);
113+
put(FailoverConnectionPluginFactory.class, 700);
114+
put(FailoverConnectionPluginFactory.class, 710);
115+
put(HostMonitoringConnectionPluginFactory.class, 800);
116+
put(software.amazon.jdbc.plugin.efm2.HostMonitoringConnectionPluginFactory.class, 810);
117117
put(FastestResponseStrategyPluginFactory.class, 900);
118-
put(LimitlessPluginFactory.class, 950);
119-
put(IamAuthPluginFactory.class, 1000);
120-
put(AwsSecretsManagerPluginFactory.class, 1100);
118+
put(LimitlessConnectionPluginFactory.class, 950);
119+
put(IamAuthConnectionPluginFactory.class, 1000);
120+
put(AwsSecretsManagerConnectionPluginFactory.class, 1100);
121121
put(FederatedAuthPluginFactory.class, 1200);
122-
put(LogQueryPluginFactory.class, 1300);
123-
put(ConnectTimePluginFactory.class, WEIGHT_RELATIVE_TO_PRIOR_PLUGIN);
124-
put(ExecutionTimePluginFactory.class, WEIGHT_RELATIVE_TO_PRIOR_PLUGIN);
125-
put(DeveloperPluginFactory.class, WEIGHT_RELATIVE_TO_PRIOR_PLUGIN);
122+
put(LogQueryConnectionPluginFactory.class, 1300);
123+
put(ConnectTimeConnectionPluginFactory.class, WEIGHT_RELATIVE_TO_PRIOR_PLUGIN);
124+
put(ExecutionTimeConnectionPluginFactory.class, WEIGHT_RELATIVE_TO_PRIOR_PLUGIN);
125+
put(DeveloperConnectionPluginFactory.class, WEIGHT_RELATIVE_TO_PRIOR_PLUGIN);
126126
}
127127
};
128128

129-
protected static final ConcurrentMap<Class<? extends PluginFactory>, PluginFactory>
129+
protected static final ConcurrentMap<Class<? extends ConnectionPluginFactory>, ConnectionPluginFactory>
130130
pluginFactoriesByClass = new ConcurrentHashMap<>();
131131

132132
protected static final String DEFAULT_PLUGINS = "initialConnection,auroraConnectionTracker,failover2,efm2";
@@ -136,10 +136,10 @@ public class ConnectionPluginChainBuilder {
136136
factory and an assigned weight.
137137
*/
138138
private static class PluginFactoryInfo {
139-
public PluginFactory factory;
139+
public ConnectionPluginFactory factory;
140140
public int weight;
141141

142-
public PluginFactoryInfo(final PluginFactory factory, final int weight) {
142+
public PluginFactoryInfo(final ConnectionPluginFactory factory, final int weight) {
143143
this.factory = factory;
144144
this.weight = weight;
145145
}
@@ -153,19 +153,19 @@ public List<ConnectionPlugin> getPlugins(
153153
@Nullable ConfigurationProfile configurationProfile) throws SQLException {
154154

155155
List<ConnectionPlugin> plugins;
156-
List<PluginFactory> pluginFactories;
156+
List<ConnectionPluginFactory> pluginFactories;
157157

158158
if (configurationProfile != null && configurationProfile.getPluginFactories() != null) {
159-
List<Class<? extends PluginFactory>> pluginFactoryClasses = configurationProfile.getPluginFactories();
159+
List<Class<? extends ConnectionPluginFactory>> pluginFactoryClasses = configurationProfile.getPluginFactories();
160160
pluginFactories = new ArrayList<>(pluginFactoryClasses.size());
161161

162-
for (final Class<? extends PluginFactory> factoryClazz : pluginFactoryClasses) {
162+
for (final Class<? extends ConnectionPluginFactory> factoryClazz : pluginFactoryClasses) {
163163
final AtomicReference<InstantiationException> lastException = new AtomicReference<>(null);
164-
final PluginFactory factory = pluginFactoriesByClass.computeIfAbsent(factoryClazz, (key) -> {
164+
final ConnectionPluginFactory factory = pluginFactoriesByClass.computeIfAbsent(factoryClazz, (key) -> {
165165
try {
166166
return WrapperUtils.createInstance(
167167
factoryClazz,
168-
PluginFactory.class,
168+
ConnectionPluginFactory.class,
169169
null,
170170
(Object) null);
171171

@@ -209,7 +209,7 @@ public List<ConnectionPlugin> getPlugins(
209209
if (PropertyDefinition.AUTO_SORT_PLUGIN_ORDER.getBoolean(props)) {
210210
pluginFactories = this.sortPluginFactories(pluginFactories);
211211

212-
final List<PluginFactory> tempPluginFactories = pluginFactories;
212+
final List<ConnectionPluginFactory> tempPluginFactories = pluginFactories;
213213
LOGGER.finest(() ->
214214
"Plugins order has been rearranged. The following order is in effect: "
215215
+ tempPluginFactories.stream()
@@ -219,7 +219,7 @@ public List<ConnectionPlugin> getPlugins(
219219

220220
// make a chain of connection plugins
221221
plugins = new ArrayList<>(pluginFactories.size() + 1);
222-
for (final PluginFactory factory : pluginFactories) {
222+
for (final ConnectionPluginFactory factory : pluginFactories) {
223223
plugins.add(factory.getInstance(servicesContainer, props));
224224
}
225225
} else {
@@ -246,12 +246,12 @@ public static List<String> getPluginCodes(final Properties props) {
246246
return StringUtils.split(pluginCodes, ",", true);
247247
}
248248

249-
protected List<PluginFactory> sortPluginFactories(
250-
final List<PluginFactory> unsortedPluginFactories) {
249+
protected List<ConnectionPluginFactory> sortPluginFactories(
250+
final List<ConnectionPluginFactory> unsortedPluginFactories) {
251251

252252
final ArrayList<PluginFactoryInfo> weights = new ArrayList<>();
253253
int lastWeight = 0;
254-
for (PluginFactory pluginFactory : unsortedPluginFactories) {
254+
for (ConnectionPluginFactory pluginFactory : unsortedPluginFactories) {
255255
Integer pluginFactoryWeight = pluginWeightByPluginFactory.get(pluginFactory.getClass());
256256

257257
if (pluginFactoryWeight == null || pluginFactoryWeight == WEIGHT_RELATIVE_TO_PRIOR_PLUGIN) {

wrapper/src/main/java/software/amazon/jdbc/PluginFactory.java renamed to wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* Interface for plugin factories. This class implements ways to initialize a plugin.
2424
*/
25-
public interface PluginFactory {
25+
public interface ConnectionPluginFactory {
2626

2727
/**
2828
* Get an instance of a {@link ConnectionPlugin}.

‎wrapper/src/main/java/software/amazon/jdbc/ConnectionPluginManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void unlock() {
141141

142142
/**
143143
* Initialize a chain of {@link ConnectionPlugin} using their corresponding {@link
144-
* PluginFactory}. If {@code PropertyDefinition.PLUGINS} is provided by the user,
144+
* ConnectionPluginFactory}. If {@code PropertyDefinition.PLUGINS} is provided by the user,
145145
* initialize the chain with the given connection plugins in the order they are specified.
146146
*
147147
* <p>The {@link DefaultConnectionPlugin} will always be initialized and attached as the last

‎wrapper/src/main/java/software/amazon/jdbc/plugin/AuroraConnectionTrackerPluginFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.util.Properties;
2020
import software.amazon.jdbc.ConnectionPlugin;
21-
import software.amazon.jdbc.PluginFactory;
21+
import software.amazon.jdbc.ConnectionPluginFactory;
2222
import software.amazon.jdbc.util.FullServicesContainer;
2323

24-
public class AuroraConnectionTrackerPluginFactory implements PluginFactory {
24+
public class AuroraConnectionTrackerPluginFactory implements ConnectionPluginFactory {
2525

2626
@Override
2727
public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

‎wrapper/src/main/java/software/amazon/jdbc/plugin/AuroraInitialConnectionStrategyPluginFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.util.Properties;
2020
import software.amazon.jdbc.ConnectionPlugin;
21-
import software.amazon.jdbc.PluginFactory;
21+
import software.amazon.jdbc.ConnectionPluginFactory;
2222
import software.amazon.jdbc.util.FullServicesContainer;
2323

24-
public class AuroraInitialConnectionStrategyPluginFactory implements PluginFactory {
24+
public class AuroraInitialConnectionStrategyPluginFactory implements ConnectionPluginFactory {
2525

2626
@Override
2727
public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/AwsSecretsManagerPluginFactory.java renamed to wrapper/src/main/java/software/amazon/jdbc/plugin/AwsSecretsManagerConnectionPluginFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.util.Properties;
2020
import software.amazon.jdbc.ConnectionPlugin;
21-
import software.amazon.jdbc.PluginFactory;
21+
import software.amazon.jdbc.ConnectionPluginFactory;
2222
import software.amazon.jdbc.util.FullServicesContainer;
2323

24-
public class AwsSecretsManagerPluginFactory implements PluginFactory {
24+
public class AwsSecretsManagerConnectionPluginFactory implements ConnectionPluginFactory {
2525

2626
@Override
2727
public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/ConnectTimePluginFactory.java renamed to wrapper/src/main/java/software/amazon/jdbc/plugin/ConnectTimeConnectionPluginFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.util.Properties;
2020
import software.amazon.jdbc.ConnectionPlugin;
21-
import software.amazon.jdbc.PluginFactory;
21+
import software.amazon.jdbc.ConnectionPluginFactory;
2222
import software.amazon.jdbc.util.FullServicesContainer;
2323

24-
public class ConnectTimePluginFactory implements PluginFactory {
24+
public class ConnectTimeConnectionPluginFactory implements ConnectionPluginFactory {
2525

2626
@Override
2727
public ConnectionPlugin getInstance(FullServicesContainer servicesContainer, Properties props) {

wrapper/src/main/java/software/amazon/jdbc/plugin/DataCachePluginFactory.java renamed to wrapper/src/main/java/software/amazon/jdbc/plugin/DataCacheConnectionPluginFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import java.util.Properties;
2020
import software.amazon.jdbc.ConnectionPlugin;
21-
import software.amazon.jdbc.PluginFactory;
21+
import software.amazon.jdbc.ConnectionPluginFactory;
2222
import software.amazon.jdbc.util.FullServicesContainer;
2323

24-
public class DataCachePluginFactory implements PluginFactory {
24+
public class DataCacheConnectionPluginFactory implements ConnectionPluginFactory {
2525

2626
@Override
2727
public ConnectionPlugin getInstance(final FullServicesContainer servicesContainer, final Properties props) {

0 commit comments

Comments
 (0)