Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mongodb] Improve code structure #1900

Merged
merged 1 commit into from
Feb 7, 2023
Merged

[mongodb] Improve code structure #1900

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions ...main/java/com/ververica/cdc/connectors/mongodb/source/utils/CollectionDiscoveryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.mongodb.MongoNamespace;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoDatabase;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.bson.BsonDocument;
import org.bson.conversions.Bson;
Expand Down Expand Up @@ -88,22 +89,21 @@ public static <T> List<T> collectionNames(
return collectionNames;
}

public static Predicate<String> databaseFilter(List<String> databaseList) {
Predicate<String> databaseFilter = CollectionDiscoveryUtils::isNotBuiltInDatabase;
if (databaseList != null && !databaseList.isEmpty()) {
List<Pattern> databasePatterns = includeListAsPatterns(databaseList);
databaseFilter = databaseFilter.and(anyMatch(databasePatterns));
private static Predicate<String> stringListFilter(
Predicate<String> filter, List<String> stringList) {
if (CollectionUtils.isNotEmpty(stringList)) {
List<Pattern> databasePatterns = includeListAsPatterns(stringList);
filter = filter.and(anyMatch(databasePatterns));
}
return databaseFilter;
return filter;
}

public static Predicate<String> databaseFilter(List<String> databaseList) {
return stringListFilter(CollectionDiscoveryUtils::isNotBuiltInDatabase, databaseList);
}

public static Predicate<String> collectionsFilter(List<String> collectionList) {
Predicate<String> collectionFilter = CollectionDiscoveryUtils::isNotBuiltInCollections;
if (collectionList != null && !collectionList.isEmpty()) {
List<Pattern> collectionPatterns = includeListAsPatterns(collectionList);
collectionFilter = collectionFilter.and(anyMatch(collectionPatterns));
}
return collectionFilter;
return stringListFilter(CollectionDiscoveryUtils::isNotBuiltInCollections, collectionList);
}

public static Predicate<String> anyMatch(List<Pattern> patterns) {
Expand Down