IGNITE-13581 Code review fixes.

modules/core/src/main/java/org/apache/ignite/cache/CacheEntryVersion.java

@@ -51,7 +51,7 @@ public interface CacheEntryVersion extends Comparable<CacheEntryVersion>, Serial
      *
      * @return Data center id.
      */
-    public byte dataReplicationId();
+    public byte dataCenterId();
 
     /** @return Topology version plus number of seconds from the start time of the first grid node. */
     public int topologyVersion();

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java

@@ -125,14 +125,7 @@ public int nodeOrderAndDrIdRaw() {
     }
 
     /** {@inheritDoc} */
-    @Override public byte dataReplicationId() {
-        return dataCenterId();
-    }
-
-    /**
-     * @return DR mask.
-     */
-    public byte dataCenterId() {
+    @Override public byte dataCenterId() {
         return (byte)((nodeOrderDrId >> DR_ID_SHIFT) & DR_ID_MASK);
     }
 

modules/core/src/test/java/org/apache/ignite/cdc/AbstractChangeDataCaptureTest.java

@@ -158,10 +158,10 @@ public static class TestCDCConsumer implements ChangeDataCaptureConsumer {
                 );
 
                 if (drId != -1)
-                    assertEquals(drId, evt.version().dataReplicationId());
+                    assertEquals(drId, evt.version().dataCenterId());
 
                 if (otherDrId != -1)
-                    assertEquals(otherDrId, evt.version().otherDataCenterVersion().dataReplicationId());
+                    assertEquals(otherDrId, evt.version().otherDataCenterVersion().dataCenterId());
 
                 if (evt.value() != null)
                     checkUser((User)evt.value());

modules/core/src/test/java/org/apache/ignite/cdc/ChangeDataCaptureOrderTest.java

@@ -58,13 +58,13 @@
 /** */
 public class ChangeDataCaptureOrderTest extends AbstractChangeDataCaptureTest {
     /** */
-    public static final String FOR_OTHER_DR_ID = "for-other-dr-id";
+    public static final String FOR_OTHER_DC_ID = "for-other-dc-id";
 
     /** */
-    public static final byte DFLT_DR_ID = 1;
+    public static final byte DFLT_DC_ID = 1;
 
     /** */
-    public static final byte OTHER_DR_ID = 2;
+    public static final byte OTHER_DC_ID = 2;
 
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
@@ -81,7 +81,7 @@ public class ChangeDataCaptureOrderTest extends AbstractChangeDataCaptureTest {
             }
 
             @Override public CachePluginProvider createCacheProvider(CachePluginContext ctx) {
-                if (!ctx.igniteCacheConfiguration().getName().equals(FOR_OTHER_DR_ID))
+                if (!ctx.igniteCacheConfiguration().getName().equals(FOR_OTHER_DC_ID))
                     return null;
 
                 return new AbstractCachePluginProvider() {
@@ -105,17 +105,17 @@ public void testReadAllKeysWithOtherDc() throws Exception {
 
         IgniteEx ign = startGrid(cfg);
 
-        ign.context().cache().context().versions().dataCenterId(DFLT_DR_ID);
+        ign.context().cache().context().versions().dataCenterId(DFLT_DC_ID);
         ign.cluster().state(ACTIVE);
 
         TestCDCConsumer cnsmr = new TestCDCConsumer();
 
         ChangeDataCapture cdc = new ChangeDataCapture(cfg, null, cdcConfig(cnsmr));
 
-        IgniteCache<Integer, User> cache = ign.getOrCreateCache(FOR_OTHER_DR_ID);
+        IgniteCache<Integer, User> cache = ign.getOrCreateCache(FOR_OTHER_DC_ID);
 
-        cnsmr.drId = DFLT_DR_ID;
-        cnsmr.otherDrId = OTHER_DR_ID;
+        cnsmr.drId = DFLT_DC_ID;
+        cnsmr.otherDrId = OTHER_DC_ID;
 
         addAndWaitForConsumption(cnsmr, cdc, cache, null, this::addConflictData, 0, KEYS_CNT * 2, getTestTimeout());
     }
@@ -188,7 +188,7 @@ private void addConflictData(IgniteCache<Integer, User> cache, int from, int to)
 
                 val.prepareMarshal(intCache.context().cacheObjectContext());
 
-                drMap.put(key, new GridCacheDrInfo(val, new GridCacheVersion(1, i, 1, OTHER_DR_ID)));
+                drMap.put(key, new GridCacheDrInfo(val, new GridCacheVersion(1, i, 1, OTHER_DC_ID)));
             }
 
             intCache.putAllConflict(drMap);