Remove Helium protobuff code from AppendEntries

We no longer need the pre-lithium/legacy protobuff serialization code in
AppendEntries so remove along with some legacy test code that was using it.

Change-Id: Ie68338e9ac96b3acc3b0aa208b393fe41ff6dfd6
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SerializationUtils.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SerializationUtils.java
index 7ec32440e7fdfcbe24e2a252f9859860de634ff1..9dd46e6f43925abab166207a9c227c2ed32492dd 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SerializationUtils.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SerializationUtils.java
@@ -8,19 +8,14 @@
 
 package org.opendaylight.controller.cluster.raft;
 
 
 package org.opendaylight.controller.cluster.raft;
 

-import org.opendaylight.controller.cluster.raft.messages.AppendEntries;

 import org.opendaylight.controller.cluster.raft.messages.InstallSnapshot;
 
 public class SerializationUtils {
 
     public static Object fromSerializable(Object serializable){
 import org.opendaylight.controller.cluster.raft.messages.InstallSnapshot;
 
 public class SerializationUtils {
 
     public static Object fromSerializable(Object serializable){

-        if(AppendEntries.isSerializedType(serializable)){
-            return AppendEntries.fromSerializable(serializable);
-
-        } else if (serializable.getClass().equals(InstallSnapshot.SERIALIZABLE_CLASS)) {
+        if (serializable.getClass().equals(InstallSnapshot.SERIALIZABLE_CLASS)) {

             return InstallSnapshot.fromSerializable(serializable);
         }
         return serializable;
     }
             return InstallSnapshot.fromSerializable(serializable);
         }
         return serializable;
     }

-

 }
 }

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
index 54af075e3b2786e91869692805d6f3e22916513f..2b94eb312b153867361878222001d932ad048d08 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java
@@ -624,7 +624,7 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior {
                     appendEntries);
         }
 
                     appendEntries);
         }
 

-        followerActor.tell(appendEntries.toSerializable(), actor());
+        followerActor.tell(appendEntries, actor());

     }
 
     /**
     }
 
     /**

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
index d8075f4381957a66e1958d36f7b9886c28efb5c5..896f3048bc83909512ef7d1493404c7352c00ab1 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/AppendEntries.java
@@ -8,19 +8,13 @@
 
 package org.opendaylight.controller.cluster.raft.messages;
 
 
 package org.opendaylight.controller.cluster.raft.messages;
 

-import com.google.protobuf.GeneratedMessage;

 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.List;
 import java.util.List;

-import java.util.Map;

 import org.opendaylight.controller.cluster.raft.RaftVersions;
 import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
 import org.opendaylight.controller.cluster.raft.RaftVersions;
 import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;

-import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
-import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;

 
 /**
  * Invoked by leader to replicate log entries (§5.3); also used as
 
 /**
  * Invoked by leader to replicate log entries (§5.3); also used as


@@ -29,9 +23,6 @@ import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntries
 public class AppendEntries extends AbstractRaftRPC {
     private static final long serialVersionUID = 1L;
 
 public class AppendEntries extends AbstractRaftRPC {
     private static final long serialVersionUID = 1L;
 

-    public static final Class<AppendEntriesMessages.AppendEntries> LEGACY_SERIALIZABLE_CLASS =
-            AppendEntriesMessages.AppendEntries.class;
-

     private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(AppendEntries.class);
 
     // So that follower can redirect clients
     private static final org.slf4j.Logger LOG = org.slf4j.LoggerFactory.getLogger(AppendEntries.class);
 
     // So that follower can redirect clients


@@ -126,100 +117,4 @@ public class AppendEntries extends AbstractRaftRPC {
                 .append(payloadVersion).append(", entries=").append(entries).append("]");
         return builder.toString();
     }
                 .append(payloadVersion).append(", entries=").append(entries).append("]");
         return builder.toString();
     }

-
-    public <T extends Object> Object toSerializable() {
-        return toSerializable(RaftVersions.CURRENT_VERSION);
-    }
-
-    public <T extends Object> Object toSerializable(short version) {
-        if(version < RaftVersions.LITHIUM_VERSION) {
-            return toLegacySerializable();
-        } else {
-            return this;
-        }
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private <T> Object toLegacySerializable() {
-        AppendEntriesMessages.AppendEntries.Builder to = AppendEntriesMessages.AppendEntries.newBuilder();
-        to.setTerm(this.getTerm())
-            .setLeaderId(this.getLeaderId())
-            .setPrevLogTerm(this.getPrevLogTerm())
-            .setPrevLogIndex(this.getPrevLogIndex())
-            .setLeaderCommit(this.getLeaderCommit());
-
-        for (ReplicatedLogEntry logEntry : this.getEntries()) {
-
-            AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Builder arBuilder =
-                AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.newBuilder();
-
-            AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload.Builder arpBuilder =
-                AppendEntriesMessages.AppendEntries.ReplicatedLogEntry.Payload.newBuilder();
-
-            //get the client specific payload extensions and add them to the payload builder
-            Map<GeneratedMessage.GeneratedExtension, T> map = logEntry.getData().encode();
-            Iterator<Map.Entry<GeneratedMessage.GeneratedExtension, T>> iter = map.entrySet().iterator();
-
-            while (iter.hasNext()) {
-                Map.Entry<GeneratedMessage.GeneratedExtension, T> entry = iter.next();
-                arpBuilder.setExtension(entry.getKey(), entry.getValue());
-            }
-
-            arpBuilder.setClientPayloadClassName(logEntry.getData().getClientPayloadClassName());
-
-            arBuilder.setData(arpBuilder).setIndex(logEntry.getIndex()).setTerm(logEntry.getTerm());
-            to.addLogEntries(arBuilder);
-        }
-
-        return to.build();
-    }
-
-    public static AppendEntries fromSerializable(Object serialized) {
-        if(serialized instanceof AppendEntries) {
-            return (AppendEntries)serialized;
-        }
-        else {
-            return fromLegacySerializable((AppendEntriesMessages.AppendEntries) serialized);
-        }
-    }
-
-    private static AppendEntries fromLegacySerializable(AppendEntriesMessages.AppendEntries from) {
-        List<ReplicatedLogEntry> logEntryList = new ArrayList<>();
-        for (AppendEntriesMessages.AppendEntries.ReplicatedLogEntry leProtoBuff : from.getLogEntriesList()) {
-
-            Payload payload = null ;
-            try {
-                if(leProtoBuff.getData() != null && leProtoBuff.getData().getClientPayloadClassName() != null) {
-                    String clientPayloadClassName = leProtoBuff.getData().getClientPayloadClassName();
-                    payload = (Payload) Class.forName(clientPayloadClassName).newInstance();
-                    payload = payload.decode(leProtoBuff.getData());
-                } else {
-                    LOG.error("Payload is null or payload does not have client payload class name");
-                }
-
-            } catch (InstantiationException e) {
-                LOG.error("InstantiationException when instantiating "+leProtoBuff.getData().getClientPayloadClassName(), e);
-            } catch (IllegalAccessException e) {
-                LOG.error("IllegalAccessException when accessing "+leProtoBuff.getData().getClientPayloadClassName(), e);
-            } catch (ClassNotFoundException e) {
-                LOG.error("ClassNotFoundException when loading "+leProtoBuff.getData().getClientPayloadClassName(), e);
-            }
-            ReplicatedLogEntry logEntry = new ReplicatedLogImplEntry(
-                leProtoBuff.getIndex(), leProtoBuff.getTerm(), payload);
-            logEntryList.add(logEntry);
-        }
-
-        AppendEntries to = new AppendEntries(from.getTerm(),
-            from.getLeaderId(),
-            from.getPrevLogIndex(),
-            from.getPrevLogTerm(),
-            logEntryList,
-            from.getLeaderCommit(), -1, (short)0);
-
-        return to;
-    }
-
-    public static boolean isSerializedType(Object message) {
-        return message instanceof AppendEntries || LEGACY_SERIALIZABLE_CLASS.isInstance(message);
-    }

 }
 }

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java
index aceed9ea5186df2088acb5b37d43fa1507345f51..93863147b36b4c8139542b56797ec2acb2a4e034 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/AppendEntriesTest.java
@@ -8,18 +8,13 @@
 package org.opendaylight.controller.cluster.raft.messages;
 
 import static org.junit.Assert.assertEquals;
 package org.opendaylight.controller.cluster.raft.messages;
 
 import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertSame;

 import java.util.Arrays;
 import java.util.Arrays;

-import java.util.Collections;

 import java.util.Iterator;
 import org.apache.commons.lang.SerializationUtils;
 import java.util.Iterator;
 import org.apache.commons.lang.SerializationUtils;

-import org.junit.Assert;

 import org.junit.Test;
 import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload;

-import org.opendaylight.controller.cluster.raft.RaftVersions;

 import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
 import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
 import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
 import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;

-import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;

 
 /**
  * Unit tests for AppendEntries.
 
 /**
  * Unit tests for AppendEntries.


@@ -43,30 +38,6 @@ public class AppendEntriesTest {
         verifyAppendEntries(expected, cloned);
     }
 
         verifyAppendEntries(expected, cloned);
     }
 

-    @Test
-    public void testToAndFromSerializable() {
-        AppendEntries entries = new AppendEntries(5L, "node1", 7L, 8L,
-                Collections.<ReplicatedLogEntry>emptyList(), 10L, -1, (short)0);
-
-        assertSame("toSerializable", entries, entries.toSerializable());
-        assertSame("fromSerializable", entries,
-                org.opendaylight.controller.cluster.raft.SerializationUtils.fromSerializable(entries));
-    }
-
-    @Test
-    public void testToAndFromLegacySerializable() {
-        ReplicatedLogEntry entry = new ReplicatedLogImplEntry(3, 4, new MockPayload("payload"));
-        AppendEntries entries = new AppendEntries(5L, "node1", 7L, 8L, Arrays.asList(entry), 10L, -1, (short)0);
-
-        Object serializable = entries.toSerializable(RaftVersions.HELIUM_VERSION);
-        Assert.assertTrue(serializable instanceof AppendEntriesMessages.AppendEntries);
-
-        AppendEntries entries2 = (AppendEntries)
-                org.opendaylight.controller.cluster.raft.SerializationUtils.fromSerializable(serializable);
-
-        verifyAppendEntries(entries, entries2);
-    }
-

     private static void verifyAppendEntries(AppendEntries expected, AppendEntries actual) {
         assertEquals("getLeaderId", expected.getLeaderId(), actual.getLeaderId());
         assertEquals("getTerm", expected.getTerm(), actual.getTerm());
     private static void verifyAppendEntries(AppendEntries expected, AppendEntries actual) {
         assertEquals("getLeaderId", expected.getLeaderId(), actual.getLeaderId());
         assertEquals("getTerm", expected.getTerm(), actual.getTerm());

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java
index 98f71cad4a9b5915d02cfb1519c1d1c0424d0a7f..98bc9706fbf201d1f3cb266159a2e209f0542735 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationByteStringPayloadTest.java
@@ -8,28 +8,18 @@
 
 package org.opendaylight.controller.cluster.datastore;
 
 
 package org.opendaylight.controller.cluster.datastore;
 

-import java.util.ArrayList;
-import java.util.List;
+import static junit.framework.Assert.assertTrue;

 import org.apache.commons.lang.SerializationUtils;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
 import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
 import org.apache.commons.lang.SerializationUtils;
 import org.junit.Test;
 import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
 import org.opendaylight.controller.cluster.datastore.modification.WriteModification;

-import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry;
-import org.opendaylight.controller.cluster.raft.messages.AppendEntries;

 import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationByteStringPayload;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
 import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationByteStringPayload;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
 import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;

-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;

 
 @Deprecated
 public class CompositeModificationByteStringPayloadTest {
 
 
 @Deprecated
 public class CompositeModificationByteStringPayloadTest {
 

-    private static final SchemaContext SCHEMA_CONTEXT = TestModel.createTestContext();
-

     @Test
     public void testSerialization(){
         WriteModification writeModification =
     @Test
     public void testSerialization(){
         WriteModification writeModification =


@@ -51,25 +41,4 @@ public class CompositeModificationByteStringPayloadTest {
         assertTrue(deserialize instanceof CompositeModificationByteStringPayload);
 
     }
         assertTrue(deserialize instanceof CompositeModificationByteStringPayload);
 
     }

-
-    @Test
-    public void testAppendEntries(){
-        List<ReplicatedLogEntry> entries = new ArrayList<>();
-
-        WriteModification writeModification = new WriteModification(TestModel.OUTER_LIST_PATH,
-                ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build());
-
-        MutableCompositeModification compositeModification = new MutableCompositeModification();
-
-        compositeModification.addModification(writeModification);
-
-        CompositeModificationByteStringPayload payload =
-                new CompositeModificationByteStringPayload(compositeModification.toSerializable());
-
-        payload.clearModificationReference();
-
-        entries.add(new ReplicatedLogImplEntry(0, 1, payload));
-
-        assertNotNull(new AppendEntries(10, "foobar", 10, 10, entries, 10, -1, (short)0).toSerializable());
-    }

 }
 }

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java
deleted file mode 100644 (file)
index 1e4ca0e..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/CompositeModificationPayloadTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2014, 2015 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.controller.cluster.datastore;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
-import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
-import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
-import org.opendaylight.controller.cluster.raft.RaftVersions;
-import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.messages.AppendEntries;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationPayload;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
-import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
-import org.opendaylight.controller.protobuff.messages.cluster.raft.AppendEntriesMessages;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-
-@Deprecated
-public class CompositeModificationPayloadTest {
-
-    @Test
-    public void testBasic() throws IOException {
-
-        List<ReplicatedLogEntry> entries = new ArrayList<>();
-
-        entries.add(0, new ReplicatedLogEntry() {
-            @Override public Payload getData() {
-                WriteModification writeModification =
-                    new WriteModification(TestModel.TEST_PATH, ImmutableNodes
-                        .containerNode(TestModel.TEST_QNAME));
-
-                MutableCompositeModification compositeModification =
-                    new MutableCompositeModification();
-
-                compositeModification.addModification(writeModification);
-
-                return new CompositeModificationPayload(compositeModification.toSerializable());
-            }
-
-            @Override public long getTerm() {
-                return 1;
-            }
-
-            @Override public long getIndex() {
-                return 1;
-            }
-
-            @Override
-            public int size() {
-                return getData().size();
-            }
-        });
-
-        AppendEntries appendEntries =
-            new AppendEntries(1, "member-1", 0, 100, entries, 1, -1, (short)0);
-
-        AppendEntriesMessages.AppendEntries o = (AppendEntriesMessages.AppendEntries)
-                appendEntries.toSerializable(RaftVersions.HELIUM_VERSION);
-
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        o.writeDelimitedTo(bos);
-
-        AppendEntriesMessages.AppendEntries appendEntries2 =
-            AppendEntriesMessages.AppendEntries
-                .parseDelimitedFrom(new ByteArrayInputStream(bos.toByteArray()));
-
-        AppendEntries appendEntries1 = AppendEntries.fromSerializable(appendEntries2);
-
-        Payload data = appendEntries1.getEntries().get(0).getData();
-
-
-        Assert.assertTrue(((CompositeModificationPayload) data).getModification().toString().contains(TestModel.TEST_QNAME.getNamespace().toString()));
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/programs/appendentries/Client.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/programs/appendentries/Client.java
deleted file mode 100644 (file)
index 290e233..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/programs/appendentries/Client.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.controller.programs.appendentries;
-
-import akka.actor.ActorSelection;
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.actor.UntypedActor;
-import com.typesafe.config.ConfigFactory;
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
-import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
-import org.opendaylight.controller.cluster.example.messages.KeyValue;
-import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
-import org.opendaylight.controller.cluster.raft.messages.AppendEntries;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationByteStringPayload;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationPayload;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
-import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
-
-public class Client {
-
-    private static ActorSystem actorSystem;
-
-    public static class ClientActor extends UntypedActor {
-
-        @Override public void onReceive(Object message) throws Exception {
-
-        }
-    }
-
-    public static void main(String[] args){
-        actorSystem = ActorSystem.create("appendentries", ConfigFactory
-            .load().getConfig("ODLCluster"));
-
-        ActorSelection actorSelection = actorSystem.actorSelection(
-            "akka.tcp://appendentries@127.0.0.1:2550/user/server");
-
-        AppendEntries appendEntries = modificationAppendEntries();
-
-        Payload data = appendEntries.getEntries().get(0).getData();
-        if(data instanceof CompositeModificationPayload) {
-            System.out.println(
-                "Sending : " + ((CompositeModificationPayload) data)
-                    .getModification());
-        } else {
-            System.out.println(
-                "Sending : " + ((KeyValue) data)
-                    .getKey());
-
-        }
-
-        actorSelection.tell(appendEntries.toSerializable(), null);
-
-
-
-
-        actorSystem.actorOf(Props.create(ClientActor.class), "client");
-    }
-
-    public static AppendEntries modificationAppendEntries() {
-        List<ReplicatedLogEntry> modification = new ArrayList<>();
-
-        modification.add(0, new ReplicatedLogEntry() {
-            @Override public Payload getData() {
-                WriteModification writeModification =
-                    new WriteModification(TestModel.TEST_PATH, ImmutableNodes
-                        .containerNode(TestModel.TEST_QNAME));
-
-                MutableCompositeModification compositeModification =
-                    new MutableCompositeModification();
-
-                compositeModification.addModification(writeModification);
-
-                return new CompositeModificationByteStringPayload(
-                    compositeModification.toSerializable());
-            }
-
-            @Override public long getTerm() {
-                return 1;
-            }
-
-            @Override public long getIndex() {
-                return 1;
-            }
-
-            @Override
-            public int size() {
-                return getData().size();
-            }
-        });
-
-        return new AppendEntries(1, "member-1", 0, 100, modification, 1, -1, (short)0);
-    }
-
-    public static AppendEntries keyValueAppendEntries() {
-        List<ReplicatedLogEntry> modification = new ArrayList<>();
-
-        modification.add(0, new ReplicatedLogEntry() {
-            @Override public Payload getData() {
-                return new KeyValue("moiz", "test");
-            }
-
-            @Override public long getTerm() {
-                return 1;
-            }
-
-            @Override public long getIndex() {
-                return 1;
-            }
-
-            @Override
-            public int size() {
-                return getData().size();
-            }
-        });
-
-        return new AppendEntries(1, "member-1", 0, 100, modification, 1, -1, (short)0);
-    }
-}

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/programs/appendentries/Server.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/programs/appendentries/Server.java
deleted file mode 100644 (file)
index 6b6cf32..0000000
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/programs/appendentries/Server.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.controller.programs.appendentries;
-
-import akka.actor.ActorSystem;
-import akka.actor.Props;
-import akka.actor.UntypedActor;
-import com.typesafe.config.ConfigFactory;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.CompositeModificationPayload;
-import org.opendaylight.controller.cluster.example.messages.KeyValue;
-import org.opendaylight.controller.cluster.raft.messages.AppendEntries;
-import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
-
-public class Server {
-
-    private static ActorSystem actorSystem;
-
-    public static class ServerActor extends UntypedActor {
-
-        @Override public void onReceive(Object message) throws Exception {
-            if(AppendEntries.LEGACY_SERIALIZABLE_CLASS.equals(message.getClass())){
-                AppendEntries appendEntries =
-                    AppendEntries.fromSerializable(message);
-
-                Payload data = appendEntries.getEntries()
-                    .get(0).getData();
-                if(data instanceof KeyValue){
-                    System.out.println("Received : " + ((KeyValue) appendEntries.getEntries().get(0).getData()).getKey());
-                } else {
-                    System.out.println("Received :" +
-                        ((CompositeModificationPayload) appendEntries
-                            .getEntries()
-                            .get(0).getData()).getModification().toString());
-                }
-            } else if(message instanceof String){
-                System.out.println(message);
-            }
-        }
-    }
-
-    public static void main(String[] args){
-        actorSystem = ActorSystem.create("appendentries", ConfigFactory
-            .load().getConfig("ODLCluster"));
-
-        actorSystem.actorOf(Props.create(ServerActor.class), "server");
-    }
-}

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java b/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java
index 9915911f784cb9b13523962207215cecdcca77ef..3f62b864f038566bdd2cf4917504d829bfae3d34 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/src/main/java/org/opendaylight/controller/dummy/datastore/DummyShard.java
@@ -43,9 +43,8 @@ public class DummyShard extends UntypedActor{
         if(o instanceof RequestVote){
             RequestVote req = (RequestVote) o;
             sender().tell(new RequestVoteReply(req.getTerm(), true), self());
         if(o instanceof RequestVote){
             RequestVote req = (RequestVote) o;
             sender().tell(new RequestVoteReply(req.getTerm(), true), self());

-        } else if(AppendEntries.LEGACY_SERIALIZABLE_CLASS.equals(o.getClass()) || o instanceof AppendEntries) {
-            AppendEntries req = AppendEntries.fromSerializable(o);
-            handleAppendEntries(req);
+        } else if(o instanceof AppendEntries) {
+            handleAppendEntries((AppendEntries)o);

         } else if(InstallSnapshot.SERIALIZABLE_CLASS.equals(o.getClass())) {
             InstallSnapshot req = InstallSnapshot.fromSerializable(o);
             handleInstallSnapshot(req);
         } else if(InstallSnapshot.SERIALIZABLE_CLASS.equals(o.getClass())) {
             InstallSnapshot req = InstallSnapshot.fromSerializable(o);
             handleInstallSnapshot(req);