Skip to content

Commit 8feb225

Browse files
lordgarrishlordgarrish
committed
IGNITE-22530 Add minor refactoring
1 parent ba5de70 commit 8feb225

11 files changed

Lines changed: 31 additions & 34 deletions

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.ignite.cdc;
1919

20-
import java.nio.file.Path;
2120
import java.util.Iterator;
2221
import java.util.List;
2322
import java.util.Set;
@@ -120,7 +119,7 @@ public abstract class AbstractIgniteCdcStreamer implements CdcConsumerEx {
120119
}
121120

122121
/** {@inheritDoc} */
123-
@Override public void start(MetricRegistry reg, Path cdcDir, List<String> cacheNames) {
122+
@Override public void start(MetricRegistry reg, List<String> cacheNames) {
124123
A.notEmpty(caches, "caches");
125124

126125
regexManager = new CdcRegexManager();
@@ -285,7 +284,7 @@ public AbstractIgniteCdcStreamer setCaches(Set<String> caches) {
285284
* @param includeTemplate Include regex template
286285
* @return {@code this} for chaining.
287286
*/
288-
public AbstractIgniteCdcStreamer setIncludeTemplate(String includeTemplate) {
287+
public AbstractIgniteCdcStreamer setIncludeCacheTemplate(String includeTemplate) {
289288
this.includeTemplate = includeTemplate;
290289

291290
return this;
@@ -297,7 +296,7 @@ public AbstractIgniteCdcStreamer setIncludeTemplate(String includeTemplate) {
297296
* @param excludeTemplate Exclude regex template
298297
* @return {@code this} for chaining.
299298
*/
300-
public AbstractIgniteCdcStreamer setExcludeTemplate(String excludeTemplate) {
299+
public AbstractIgniteCdcStreamer setExcludeCacheTemplate(String excludeTemplate) {
301300
this.excludeTemplate = excludeTemplate;
302301

303302
return this;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.ignite.cdc;
1919

20-
import java.nio.file.Path;
2120
import java.util.List;
2221

2322
import org.apache.ignite.IgniteException;
@@ -62,8 +61,8 @@ public class IgniteToIgniteCdcStreamer extends AbstractIgniteCdcStreamer impleme
6261
private volatile boolean alive = true;
6362

6463
/** {@inheritDoc} */
65-
@Override public void start(MetricRegistry mreg, Path cdcDir, List<String> cacheNames) {
66-
super.start(mreg, cdcDir, cacheNames);
64+
@Override public void start(MetricRegistry mreg, List<String> cacheNames) {
65+
super.start(mreg, cacheNames);
6766

6867
if (log.isInfoEnabled())
6968
log.info("Ignite To Ignite Streamer [cacheIds=" + cachesIds + ']');

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ public void setConflictResolver(CacheVersionConflictResolver resolver) {
158158
}
159159

160160
/** @param includeTemplate Include regex template */
161-
public void setIncludeTemplate(String includeTemplate) {
161+
public void setIncludeCacheTemplate(String includeTemplate) {
162162
this.includeTemplate = includeTemplate;
163163
}
164164

165165
/** @param excludeTemplate Exclude regex template */
166-
public void setExcludeTemplate(String excludeTemplate) {
166+
public void setExcludeCacheTemplate(String excludeTemplate) {
167167
this.excludeTemplate = excludeTemplate;
168168
}
169169

‎modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/IgniteToKafkaCdcStreamer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.ignite.cdc.kafka;
1919

20-
import java.nio.file.Path;
2120
import java.util.ArrayList;
2221
import java.util.Collection;
2322
import java.util.Iterator;
@@ -336,7 +335,7 @@ private <T> void sendOneBatch(
336335
}
337336

338337
/** {@inheritDoc} */
339-
@Override public void start(MetricRegistry reg, Path cdcDir, List<String> cacheNames) {
338+
@Override public void start(MetricRegistry reg, List<String> cacheNames) {
340339
A.notNull(kafkaProps, "Kafka properties");
341340
A.notNull(evtTopic, "Kafka topic");
342341
A.notNull(metadataTopic, "Kafka metadata topic");
@@ -472,7 +471,7 @@ public IgniteToKafkaCdcStreamer setCaches(Collection<String> caches) {
472471
* @param includeTemplate Include regex template.
473472
* @return {@code this} for chaining.
474473
*/
475-
public IgniteToKafkaCdcStreamer setIncludeTemplate(String includeTemplate) {
474+
public IgniteToKafkaCdcStreamer setIncludeCacheTemplate(String includeTemplate) {
476475
this.includeTemplate = includeTemplate;
477476

478477
return this;
@@ -484,7 +483,7 @@ public IgniteToKafkaCdcStreamer setIncludeTemplate(String includeTemplate) {
484483
* @param excludeTemplate Exclude regex template.
485484
* @return {@code this} for chaining.
486485
*/
487-
public IgniteToKafkaCdcStreamer setExcludeTemplate(String excludeTemplate) {
486+
public IgniteToKafkaCdcStreamer setExcludeCacheTemplate(String excludeTemplate) {
488487
this.excludeTemplate = excludeTemplate;
489488

490489
return this;

‎modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteCdcStreamerApplier.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ public KafkaToIgniteCdcStreamerApplier(
181181
this.log = log.getLogger(KafkaToIgniteCdcStreamerApplier.class);
182182
this.metrics = metrics;
183183
this.streamer = streamer;
184-
this.includeTemplate = streamerCfg.getIncludeTemplate();
185-
this.excludeTemplate = streamerCfg.getExcludeTemplate();
184+
this.includeTemplate = streamerCfg.getIncludeCacheTemplate();
185+
this.excludeTemplate = streamerCfg.getExcludeCacheTemplate();
186186
}
187187

188188
/** {@inheritDoc} */

‎modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteCdcStreamerConfiguration.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,28 +183,28 @@ public void setCaches(Collection<String> caches) {
183183
/**
184184
* @return Include regex template.
185185
*/
186-
public String getIncludeTemplate() {
186+
public String getIncludeCacheTemplate() {
187187
return includeTemplate;
188188
}
189189

190190
/**
191191
* @param includeTemplate Include regex template.
192192
*/
193-
public void setIncludeTemplate(String includeTemplate) {
193+
public void setIncludeCacheTemplate(String includeTemplate) {
194194
this.includeTemplate = includeTemplate;
195195
}
196196

197197
/**
198198
* @return Exclude regex template
199199
*/
200-
public String getExcludeTemplate() {
200+
public String getExcludeCacheTemplate() {
201201
return excludeTemplate;
202202
}
203203

204204
/**
205205
* @param excludeTemplate Exclude regex template.
206206
*/
207-
public void setExcludeTemplate(String excludeTemplate) {
207+
public void setExcludeCacheTemplate(String excludeTemplate) {
208208
this.excludeTemplate = excludeTemplate;
209209
}
210210

‎modules/cdc-ext/src/main/java/org/apache/ignite/cdc/thin/IgniteToIgniteClientCdcStreamer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.ignite.cdc.thin;
1919

20-
import java.nio.file.Path;
2120
import java.util.List;
2221

2322
import org.apache.ignite.Ignition;
@@ -69,8 +68,8 @@ public class IgniteToIgniteClientCdcStreamer extends AbstractIgniteCdcStreamer {
6968
private long aliveCheckTimeout = DFLT_ALIVE_CHECK_TIMEOUT;
7069

7170
/** {@inheritDoc} */
72-
@Override public void start(MetricRegistry mreg, Path cdcDir, List<String> cacheNames) {
73-
super.start(mreg, cdcDir, cacheNames);
71+
@Override public void start(MetricRegistry mreg, List<String> cacheNames) {
72+
super.start(mreg, cacheNames);
7473

7574
if (log.isInfoEnabled())
7675
log.info("Ignite To Ignite Client Streamer [cacheIds=" + cachesIds + ']');

‎modules/cdc-ext/src/test/java/org/apache/ignite/cdc/AbstractReplicationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ private enum WaitDataMode {
212212

213213
cfgPlugin1.setClusterId(clusterId);
214214
cfgPlugin1.setCaches(new HashSet<>(Arrays.asList(ACTIVE_PASSIVE_CACHE, ACTIVE_ACTIVE_CACHE)));
215-
cfgPlugin1.setIncludeTemplate(REGEX_INCLUDE_PATTERN);
216-
cfgPlugin1.setExcludeTemplate(REGEX_EXCLUDE_PATTERN);
215+
cfgPlugin1.setIncludeCacheTemplate(REGEX_INCLUDE_PATTERN);
216+
cfgPlugin1.setExcludeCacheTemplate(REGEX_EXCLUDE_PATTERN);
217217
cfgPlugin1.setConflictResolveField("reqId");
218218

219219
cfg.setPluginProviders(cfgPlugin1);

‎modules/cdc-ext/src/test/java/org/apache/ignite/cdc/CdcIgniteToIgniteReplicationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ protected IgniteInternalFuture<?> igniteToIgnite(
133133

134134
streamer.setMaxBatchSize(KEYS_CNT);
135135
streamer.setCaches(Collections.singleton(cache));
136-
streamer.setIncludeTemplate(includeTemplate);
137-
streamer.setExcludeTemplate(excludeTemplate);
136+
streamer.setIncludeCacheTemplate(includeTemplate);
137+
streamer.setExcludeCacheTemplate(excludeTemplate);
138138

139139
cdcCfg.setConsumer(streamer);
140140
cdcCfg.setMetricExporterSpi(new JmxMetricExporterSpi());

‎modules/cdc-ext/src/test/java/org/apache/ignite/cdc/RegexFiltersSelfTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ private IgniteInternalFuture<?> startCdc(
124124
return runAsync(() -> {
125125
CdcConfiguration cdcCfg = new CdcConfiguration();
126126

127-
streamer = new TestI2IClientCdcStreamer()
127+
streamer = new TestI2IClientCdcStreamer()
128128
.setDestinationClientConfiguration(new ClientConfiguration()
129129
.setAddresses(F.first(dest.localNode().addresses()) + ":"
130130
+ dest.localNode().attribute(ClientListenerProcessor.CLIENT_LISTENER_PORT)));
131131

132132
streamer.setMaxBatchSize(KEYS_CNT);
133133
streamer.setCaches(Collections.singleton(cache));
134-
streamer.setIncludeTemplate(includeTemplate);
135-
streamer.setExcludeTemplate(excludeTemplate);
134+
streamer.setIncludeCacheTemplate(includeTemplate);
135+
streamer.setExcludeCacheTemplate(excludeTemplate);
136136

137137
cdcCfg.setConsumer(streamer);
138138
cdcCfg.setMetricExporterSpi(new JmxMetricExporterSpi());
@@ -316,7 +316,7 @@ public void testRegexExcludeFilters() throws Exception {
316316

317317
assertTrue(waitForCondition(() -> srcCache.size() == KEYS_CNT, getTestTimeout()));
318318

319-
TestI2IClientCdcStreamer strmr = (TestI2IClientCdcStreamer) streamer;
319+
TestI2IClientCdcStreamer strmr = (TestI2IClientCdcStreamer)streamer;
320320

321321
assertEquals(1, strmr.getCacheIds().size());
322322

@@ -327,6 +327,7 @@ public void testRegexExcludeFilters() throws Exception {
327327

328328
/** */
329329
private static class TestI2IClientCdcStreamer extends IgniteToIgniteClientCdcStreamer {
330+
/** */
330331
public Set<Integer> getCacheIds() {
331332
return cachesIds;
332333
}

0 commit comments

Comments
 (0)