Switch ABIVersion.current() to CHLORINE_SR2

We should be safe to enable this version by default, reaping
serialization overhead benefits. This impacts envelope serialization
tests, as those are picking up default versions and flipping it enables
new codepath.

JIRA: CONTROLLER-2051
Change-Id: I7720871775777bf187137482ad72d473acbece16
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java
index b4278f7d7909a6c0f7f3ed9dfe59893b4672e38f..7045158de6de5c99b38fc86175aa3487117a8a9d 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java
+++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java
@@ -123,7 +123,7 @@ public enum ABIVersion implements WritableObject {
      * @return Current {@link ABIVersion}
      */
     public static @NonNull ABIVersion current() {
-        return MAGNESIUM;
+        return CHLORINE_SR2;
     }
 
     /**

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java
index 805c0dd528e4b598502a79bcfbe0e7363c915f59..21d1173c2300382b01ffb11eb887f5c9ddb2e9ca 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestFailureTest.java
@@ -58,8 +58,8 @@ public abstract class AbstractRequestFailureTest<T extends RequestFailure<?, T>>
     @Test
     public void serializationTest() {
         final var bytes = SerializationUtils.serialize(object);
-        assertEquals(legacySize, bytes.length);
-        assertEquals(expectedSize, SerializationUtils.serialize(object.toVersion(ABIVersion.CHLORINE_SR2)).length);
+        assertEquals(expectedSize, bytes.length);
+        assertEquals(legacySize, SerializationUtils.serialize(object.toVersion(ABIVersion.MAGNESIUM)).length);
 
         @SuppressWarnings("unchecked")
         final var deserialize = (T) SerializationUtils.deserialize(bytes);

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java
index f4ff5eca0db6c49c8c5f70dbe974cb7f723ad79f..2cd7c9e6ffef0045ece8036972ef1b46878aa99e 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java
@@ -40,8 +40,8 @@ public abstract class AbstractRequestSuccessTest<T extends RequestSuccess<?, T>>
     @Test
     public void serializationTest() {
         final var bytes = SerializationUtils.serialize(object);
-        assertEquals(legacySize, bytes.length);
-        assertEquals(expectedSize, SerializationUtils.serialize(object.toVersion(ABIVersion.CHLORINE_SR2)).length);
+        assertEquals(expectedSize, bytes.length);
+        assertEquals(legacySize, SerializationUtils.serialize(object.toVersion(ABIVersion.MAGNESIUM)).length);
 
         @SuppressWarnings("unchecked")
         final var deserialize = (T) SerializationUtils.deserialize(bytes);

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java
index 99e72f456a9b38125e6eff60e5de063348cb6331..3c4330417ea9bae882405667757c2ab0e4092881 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestTest.java
@@ -60,10 +60,10 @@ public abstract class AbstractRequestTest<T extends Request<?, T>> {
 
     @Test
     public void serializationTest() {
-        assertEquals(expectedSize, SerializationUtils.serialize(object.cloneAsVersion(ABIVersion.CHLORINE_SR2)).length);
+        assertEquals(legacySize, SerializationUtils.serialize(object.cloneAsVersion(ABIVersion.MAGNESIUM)).length);
 
         final byte[] bytes = SerializationUtils.serialize(object);
-        assertEquals(legacySize, bytes.length);
+        assertEquals(expectedSize, bytes.length);
         @SuppressWarnings("unchecked")
         final T deserialize = (T) SerializationUtils.deserialize(bytes);
 

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java
index 97015e9aff9ed7b07c912d41d8732499d8550c47..a53996676bc6eb019ecb1685666dd3b6fbc770b8 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java
@@ -21,7 +21,7 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest<FailureEnvelope> {
         final var cause = new RuntimeRequestException("msg", new RuntimeException());
         final int causeSize = SerializationUtils.serialize(cause).length;
         return new EnvelopeDetails<>(new FailureEnvelope(new MockFailure(OBJECT, cause, 42), 1L, 2L, 11L),
-            causeSize + 687);
+            causeSize + 485);
     }
 
     @Override

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java
index f5e1f28590f3e470680d101923435c1d26681daf..30366c99f1a52a9e1167eb24e93e68e9de58c796 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeTest.java
@@ -41,7 +41,7 @@ public class RequestEnvelopeTest extends AbstractEnvelopeTest<RequestEnvelope> {
         final int refSize = replyTo.path().toSerializationFormat().length();
 
         return new EnvelopeDetails<>(new RequestEnvelope(new TransactionPurgeRequest(OBJECT, 2L, replyTo), 1L, 2L),
-            refSize + 584);
+            refSize + 179);
     }
 
     @Override

diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java
index c7a01ef0ecb7a0e6dddd2adc035d166aad9fe7e7..9d1aa40b61f151cf38082e89a908692e995faed2 100644 (file)
--- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java
+++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeTest.java
@@ -14,7 +14,7 @@ import org.opendaylight.controller.cluster.access.commands.TransactionAbortSucce
 public class SuccessEnvelopeTest extends AbstractEnvelopeTest<SuccessEnvelope> {
     @Override
     protected EnvelopeDetails<SuccessEnvelope> createEnvelope() {
-        return new EnvelopeDetails<>(new SuccessEnvelope(new TransactionAbortSuccess(OBJECT, 2L), 1L, 2L, 11L), 769);
+        return new EnvelopeDetails<>(new SuccessEnvelope(new TransactionAbortSuccess(OBJECT, 2L), 1L, 2L, 11L), 180);
     }
 
     @Override