Skip to content

Commit 0bf110b

Browse files
committed
Rename applyDeprioritization method to apply.
1 parent 05beaf2 commit 0bf110b

3 files changed

Lines changed: 21 additions & 21 deletions

File tree

driver-core/src/main/com/mongodb/internal/connection/BaseCluster.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private static ServerSelector getCompleteServerSelector(
364364
final ClusterSettings settings) {
365365
List<ServerSelector> selectors = Stream.of(
366366
getRaceConditionPreFilteringSelector(serversSnapshot),
367-
serverDeprioritization.applyDeprioritization(serverSelector),
367+
serverDeprioritization.apply(serverSelector),
368368
settings.getServerSelector(), // may be null
369369
new LatencyMinimizingServerSelector(settings.getLocalThreshold(MILLISECONDS), MILLISECONDS),
370370
AtMostTwoRandomServerSelector.instance(),

driver-core/src/main/com/mongodb/internal/connection/OperationContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public ServerDeprioritization() {
252252
* selects using the wrapped selector again with all {@link ServerDescription}s, including deprioritized ones.</li>
253253
* </ol>
254254
*/
255-
ServerSelector applyDeprioritization(final ServerSelector wrappedSelector) {
255+
ServerSelector apply(final ServerSelector wrappedSelector) {
256256
return new DeprioritizingSelector(wrappedSelector);
257257
}
258258

driver-core/src/test/unit/com/mongodb/internal/connection/ServerDeprioritizationTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ private static Stream<Arguments> selectNoneDeprioritized() {
8585
void selectNoneDeprioritized(final List<ServerDescription> selectorResult) {
8686
ServerSelector wrappedSelector = createAssertingSelector(ALL_SERVERS, selectorResult);
8787
assertAll(
88-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(wrappedSelector).select(SHARDED_CLUSTER)),
89-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(wrappedSelector).select(REPLICA_SET_CLUSTER)),
90-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(wrappedSelector).select(UNKNOWN_CLUSTER))
88+
() -> assertEquals(selectorResult, serverDeprioritization.apply(wrappedSelector).select(SHARDED_CLUSTER)),
89+
() -> assertEquals(selectorResult, serverDeprioritization.apply(wrappedSelector).select(REPLICA_SET_CLUSTER)),
90+
() -> assertEquals(selectorResult, serverDeprioritization.apply(wrappedSelector).select(UNKNOWN_CLUSTER))
9191
);
9292
}
9393

@@ -96,10 +96,10 @@ void selectNoneDeprioritizedSingleServerCluster() {
9696
ServerSelector wrappedSelector = createAssertingSelector(singletonList(SERVER_A), singletonList(SERVER_A));
9797
ServerSelector emptyListWrappedSelector = createAssertingSelector(singletonList(SERVER_A), emptyList());
9898
assertAll(
99-
() -> assertEquals(singletonList(SERVER_A), serverDeprioritization.applyDeprioritization(wrappedSelector).select(STANDALONE_CLUSTER)),
100-
() -> assertEquals(emptyList(), serverDeprioritization.applyDeprioritization(emptyListWrappedSelector).select(STANDALONE_CLUSTER)),
101-
() -> assertEquals(singletonList(SERVER_A), serverDeprioritization.applyDeprioritization(wrappedSelector).select(LOAD_BALANCED_CLUSTER)),
102-
() -> assertEquals(emptyList(), serverDeprioritization.applyDeprioritization(emptyListWrappedSelector).select(LOAD_BALANCED_CLUSTER))
99+
() -> assertEquals(singletonList(SERVER_A), serverDeprioritization.apply(wrappedSelector).select(STANDALONE_CLUSTER)),
100+
() -> assertEquals(emptyList(), serverDeprioritization.apply(emptyListWrappedSelector).select(STANDALONE_CLUSTER)),
101+
() -> assertEquals(singletonList(SERVER_A), serverDeprioritization.apply(wrappedSelector).select(LOAD_BALANCED_CLUSTER)),
102+
() -> assertEquals(emptyList(), serverDeprioritization.apply(emptyListWrappedSelector).select(LOAD_BALANCED_CLUSTER))
103103
);
104104
}
105105

@@ -119,9 +119,9 @@ void selectSomeDeprioritized(final List<ServerDescription> selectorResult) {
119119
List<ServerDescription> expectedWrappedSelectorFilteredInput = asList(SERVER_A, SERVER_C);
120120
ServerSelector selector = createAssertingSelector(expectedWrappedSelectorFilteredInput, selectorResult);
121121
assertAll(
122-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector).select(SHARDED_CLUSTER)),
123-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector).select(REPLICA_SET_CLUSTER)),
124-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector).select(UNKNOWN_CLUSTER))
122+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector).select(SHARDED_CLUSTER)),
123+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector).select(REPLICA_SET_CLUSTER)),
124+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector).select(UNKNOWN_CLUSTER))
125125
);
126126
}
127127

@@ -133,9 +133,9 @@ void selectAllDeprioritized(final List<ServerDescription> selectorResult) {
133133
deprioritize(SERVER_C);
134134
ServerSelector selector = createAssertingSelector(ALL_SERVERS, selectorResult);
135135
assertAll(
136-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector).select(SHARDED_CLUSTER)),
137-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector).select(REPLICA_SET_CLUSTER)),
138-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector).select(UNKNOWN_CLUSTER))
136+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector).select(SHARDED_CLUSTER)),
137+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector).select(REPLICA_SET_CLUSTER)),
138+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector).select(UNKNOWN_CLUSTER))
139139
);
140140
}
141141

@@ -144,9 +144,9 @@ void selectAllDeprioritizedSingleServerCluster() {
144144
deprioritize(SERVER_A);
145145
ServerSelector selector = createAssertingSelector(singletonList(SERVER_A), singletonList(SERVER_A));
146146
assertAll(
147-
() -> assertEquals(singletonList(SERVER_A), serverDeprioritization.applyDeprioritization(selector).select(STANDALONE_CLUSTER)),
147+
() -> assertEquals(singletonList(SERVER_A), serverDeprioritization.apply(selector).select(STANDALONE_CLUSTER)),
148148
() -> assertEquals(singletonList(SERVER_A),
149-
serverDeprioritization.applyDeprioritization(selector).select(LOAD_BALANCED_CLUSTER))
149+
serverDeprioritization.apply(selector).select(LOAD_BALANCED_CLUSTER))
150150
);
151151
}
152152

@@ -171,9 +171,9 @@ public List<ServerDescription> select(final ClusterDescription clusterDescriptio
171171
};
172172

173173
assertAll(
174-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector.get()).select(SHARDED_CLUSTER)),
175-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector.get()).select(REPLICA_SET_CLUSTER)),
176-
() -> assertEquals(selectorResult, serverDeprioritization.applyDeprioritization(selector.get()).select(UNKNOWN_CLUSTER))
174+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector.get()).select(SHARDED_CLUSTER)),
175+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector.get()).select(REPLICA_SET_CLUSTER)),
176+
() -> assertEquals(selectorResult, serverDeprioritization.apply(selector.get()).select(UNKNOWN_CLUSTER))
177177
);
178178
}
179179

@@ -183,7 +183,7 @@ void onAttemptFailureIgnoresIfPoolClearedException() {
183183
serverDeprioritization.onAttemptFailure(
184184
new MongoConnectionPoolClearedException(new ServerId(new ClusterId(), new ServerAddress()), null));
185185
ServerSelector selector = createAssertingSelector(ALL_SERVERS, singletonList(SERVER_A));
186-
assertEquals(singletonList(SERVER_A), serverDeprioritization.applyDeprioritization(selector).select(SHARDED_CLUSTER));
186+
assertEquals(singletonList(SERVER_A), serverDeprioritization.apply(selector).select(SHARDED_CLUSTER));
187187
}
188188

189189
@Test

0 commit comments

Comments
 (0)