IGNITE-22530 Refactor usage of CdcRegexManager

Author: lordgarrish

modules/cdc-ext/src/main/java/org/apache/ignite/cdc/CdcRegexManager.java

@@ -54,8 +54,8 @@ public CdcRegexManager(IgniteLogger log) {
     public boolean matchesFilters(String cacheName) {
         if (includeFilter.matcher(cacheName).matches() && excludeFilter.matcher(cacheName).matches()) {
             log.warning("Cache name matches both include and exclude regexp templates. Will ignore to prevent " +
-                    "ambiguity [cacheName=" + cacheName + ", includeTemplate=" + includeFilter + ", excludeTemplate=" +
-                    excludeFilter + "]");
+                "ambiguity [cacheName=" + cacheName + ", includeTemplate=" + includeFilter + ", excludeTemplate=" +
+                excludeFilter + "]");
 
             return false;
         }

modules/cdc-ext/src/main/java/org/apache/ignite/cdc/conflictresolve/CacheVersionConflictResolverPluginProvider.java

@@ -20,11 +20,9 @@
 import java.io.Serializable;
 import java.util.Set;
 import java.util.UUID;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
 
-import org.apache.ignite.IgniteException;
 import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.cdc.CdcRegexManager;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.version.CacheVersionConflictResolver;
@@ -45,9 +43,6 @@
  * @see CacheVersionConflictResolver
  */
 public class CacheVersionConflictResolverPluginProvider<C extends PluginConfiguration> implements PluginProvider<C> {
-    /** */
-    public static final String DFLT_REGEXP = "";
-
     /** Cluster id. */
     private byte clusterId;
 
@@ -72,11 +67,14 @@ public class CacheVersionConflictResolverPluginProvider<C extends PluginConfigur
     /** Custom conflict resolver. */
     private CacheVersionConflictResolver resolver;
 
+    /** Regexp manager. */
+    private CdcRegexManager regexManager;
+
     /** Include regex templates for cache names. */
-    private String includeTemplate = DFLT_REGEXP;
+    private String includeTemplate;
 
     /** Exclude regex templates for cache names. */
-    private String excludeTemplate = DFLT_REGEXP;
+    private String excludeTemplate;
 
     /** Log. */
     private IgniteLogger log;
@@ -105,13 +103,15 @@ public CacheVersionConflictResolverPluginProvider() {
     @Override public void initExtensions(PluginContext ctx, ExtensionRegistry registry) {
         this.log = ctx.log(CacheVersionConflictResolverPluginProvider.class);
         this.provider = new CacheVersionConflictResolverCachePluginProvider<>(conflictResolveField, clusterId, resolver);
+        this.regexManager = new CdcRegexManager(log);
+        regexManager.compileRegexp(includeTemplate, excludeTemplate);
     }
 
     /** {@inheritDoc} */
     @Override public CachePluginProvider createCacheProvider(CachePluginContext ctx) {
         String cacheName = ctx.igniteCacheConfiguration().getName();
 
-        if (caches.contains(cacheName) || matchesFilters(cacheName)) {
+        if (caches.contains(cacheName) || regexManager.matchesFilters(cacheName)) {
             log.info("ConflictResolver provider set for cache [cacheName=" + cacheName + ']');
 
             return provider;
@@ -201,24 +201,4 @@ public void setExcludeCacheTemplate(String excludeTemplate) {
     @Nullable @Override public <T> T createComponent(PluginContext ctx, Class<T> cls) {
         return null;
     }
-
-    /**
-     * Matches cache name with compiled regex patterns.
-     *
-     * @param cacheName Cache name.
-     * @return True if cache name matches include pattern and doesn't match exclude pattern.
-     * @throws IgniteException If the template's syntax is invalid
-     */
-    private boolean matchesFilters(String cacheName) {
-        try {
-            boolean matchesInclude = Pattern.compile(includeTemplate).matcher(cacheName).matches();
-
-            boolean matchesExclude = Pattern.compile(excludeTemplate).matcher(cacheName).matches();
-
-            return matchesInclude && !matchesExclude;
-        }
-        catch (PatternSyntaxException e) {
-            throw new IgniteException("Invalid cache regexp template", e);
-        }
-    }
 }