From: Tony Tkacik <ttkacik@cisco.com>
Date: Mon, 10 Nov 2014 10:45:00 +0000 (+0000)
Subject: Merge "Add serialVersionUID to Serializable classes"
X-Git-Tag: release/lithium~896
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9ac3b56cbe61d32a4e62b60c3b43595c8651cada;hp=-c

Merge "Add serialVersionUID to Serializable classes"
---

9ac3b56cbe61d32a4e62b60c3b43595c8651cada
diff --combined opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
index b0a144c7b3,90827fcc81..9eb2fb757b
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorTest.java
@@@ -85,6 -85,7 +85,7 @@@ public class RaftActorTest extends Abst
          private final RaftActor delegate;
  
          public static final class MockRaftActorCreator implements Creator<MockRaftActor> {
+             private static final long serialVersionUID = 1L;
              private final Map<String, String> peerAddresses;
              private final String id;
              private final Optional<ConfigParams> config;
@@@ -237,7 -238,7 +238,7 @@@
              super(actorSystem);
  
              raftActor = this.getSystem().actorOf(MockRaftActor.props(actorName,
 -                    Collections.EMPTY_MAP, Optional.<ConfigParams>absent()), actorName);
 +                    Collections.<String,String>emptyMap(), Optional.<ConfigParams>absent()), actorName);
  
          }
  
@@@ -314,7 -315,7 +315,7 @@@
              config.setHeartBeatInterval(new FiniteDuration(1, TimeUnit.DAYS));
  
              ActorRef followerActor = getSystem().actorOf(MockRaftActor.props(persistenceId,
 -                    Collections.EMPTY_MAP, Optional.<ConfigParams>of(config)), persistenceId);
 +                    Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config)), persistenceId);
  
              watch(followerActor);
  
@@@ -368,7 -369,7 +369,7 @@@
  
              //reinstate the actor
              TestActorRef<MockRaftActor> ref = TestActorRef.create(getSystem(),
 -                    MockRaftActor.props(persistenceId, Collections.EMPTY_MAP,
 +                    MockRaftActor.props(persistenceId, Collections.<String,String>emptyMap(),
                              Optional.<ConfigParams>of(config)));
  
              ref.underlyingActor().waitForRecoveryComplete();
@@@ -401,7 -402,7 +402,7 @@@
                  config.setHeartBeatInterval(new FiniteDuration(1, TimeUnit.DAYS));
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config)), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config)), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -470,7 -471,7 +471,7 @@@
                  config.setHeartBeatInterval(new FiniteDuration(1, TimeUnit.DAYS));
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), new DataPersistenceProviderMonitor()), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), new DataPersistenceProviderMonitor()), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -535,7 -536,7 +536,7 @@@
                  dataPersistenceProviderMonitor.setPersistLatch(persistLatch);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProviderMonitor), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProviderMonitor), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -562,7 -563,7 +563,7 @@@
                  DataPersistenceProvider dataPersistenceProvider = mock(DataPersistenceProvider.class);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -591,7 -592,7 +592,7 @@@
                  DataPersistenceProvider dataPersistenceProvider = mock(DataPersistenceProvider.class);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -620,7 -621,7 +621,7 @@@
                  DataPersistenceProvider dataPersistenceProvider = mock(DataPersistenceProvider.class);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -647,7 -648,7 +648,7 @@@
                  DataPersistenceProvider dataPersistenceProvider = mock(DataPersistenceProvider.class);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(),
 -                    MockRaftActor.props(persistenceId,Collections.EMPTY_MAP,
 +                    MockRaftActor.props(persistenceId,Collections.<String,String>emptyMap(),
                          Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
@@@ -687,7 -688,7 +688,7 @@@
                  DataPersistenceProvider dataPersistenceProvider = mock(DataPersistenceProvider.class);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -746,7 -747,7 +747,7 @@@
                  DataPersistenceProvider dataPersistenceProvider = mock(DataPersistenceProvider.class);
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProvider), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -776,7 -777,7 +777,7 @@@
                  DataPersistenceProviderMonitor dataPersistenceProviderMonitor = new DataPersistenceProviderMonitor();
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProviderMonitor), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProviderMonitor), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
@@@ -831,7 -832,7 +832,7 @@@
                  DataPersistenceProviderMonitor dataPersistenceProviderMonitor = new DataPersistenceProviderMonitor();
  
                  TestActorRef<MockRaftActor> mockActorRef = TestActorRef.create(getSystem(), MockRaftActor.props(persistenceId,
 -                        Collections.EMPTY_MAP, Optional.<ConfigParams>of(config), dataPersistenceProviderMonitor), persistenceId);
 +                        Collections.<String,String>emptyMap(), Optional.<ConfigParams>of(config), dataPersistenceProviderMonitor), persistenceId);
  
                  MockRaftActor mockRaftActor = mockActorRef.underlyingActor();
  
diff --combined opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
index 7517efeb90,2a6735abd0..f1a78194a9
--- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
+++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/MeteredBoundedMailbox.java
@@@ -55,7 -55,7 +55,7 @@@ public class MeteredBoundedMailbox impl
              return; //there's no actor to monitor
          }
          String actorName = owner.get().path().toStringWithoutAddress();
 -        String metricName = registry.name(actorName, QUEUE_SIZE);
 +        String metricName = MetricRegistry.name(actorName, QUEUE_SIZE);
  
          if (registry.getMetrics().containsKey(metricName))
              return; //already registered
@@@ -66,6 -66,7 +66,7 @@@
  
  
      public static class MeteredMessageQueue extends BoundedDequeBasedMailbox.MessageQueue {
+         private static final long serialVersionUID = 1L;
  
          public MeteredMessageQueue(int capacity, FiniteDuration pushTimeOut) {
              super(capacity, pushTimeOut);