From d10d762c451fb812e76d517720402b6ad6da3609 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 27 Mar 2015 18:31:02 +0100 Subject: [PATCH] Add generic arguments This patch silences a few eclipse warnings about use of generic types without proper arguments. Change-Id: Ia260593e7b5b5fa4cb49894752a286c47aa7c049 Signed-off-by: Robert Varga --- .../controller/cluster/example/ExampleActor.java | 6 +++--- .../controller/cluster/example/messages/KeyValue.java | 4 ++-- .../controller/cluster/raft/MockRaftActorContext.java | 4 ++-- .../cluster/common/actor/AbstractConfig.java | 2 +- .../controller/cluster/common/actor/CommonConfig.java | 2 +- .../utils/serialization/NormalizedNodeSerializer.java | 2 +- .../CompositeModificationByteStringPayload.java | 4 ++-- .../client/messages/CompositeModificationPayload.java | 4 ++-- .../datastore/modification/ModificationPayload.java | 1 - .../cluster/datastore/utils/MessageTracker.java | 10 +++++----- .../cluster/datastore/utils/MessageCollectorActor.java | 2 +- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java index ed19f21ded..bafa116b55 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/ExampleActor.java @@ -36,7 +36,7 @@ import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payloa */ public class ExampleActor extends RaftActor { - private final Map state = new HashMap(); + private final Map state = new HashMap<>(); private long persistIdentifier = 1; private final Optional roleChangeNotifier; @@ -131,12 +131,12 @@ public class ExampleActor extends RaftActor { @Override protected void applySnapshot(byte [] snapshot) { state.clear(); try { - state.putAll((HashMap) toObject(snapshot)); + state.putAll((HashMap) toObject(snapshot)); } catch (Exception e) { LOG.error("Exception in applying snapshot", e); } if(LOG.isDebugEnabled()) { - LOG.debug("Snapshot applied to state : {}", ((HashMap) state).size()); + LOG.debug("Snapshot applied to state : {}", ((HashMap) state).size()); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValue.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValue.java index d2862c2baf..2eb4189eac 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValue.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/example/messages/KeyValue.java @@ -53,8 +53,8 @@ public class KeyValue extends Payload implements Serializable { } // override this method to return the protobuff related extension fields and their values - @Override public Map encode() { - Map map = new HashMap<>(); + @Override public Map, String> encode() { + Map, String> map = new HashMap<>(); map.put(KeyValueMessages.key, getKey()); map.put(KeyValueMessages.value, getValue()); return map; diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java index 63f0df2f8c..bab4a33600 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java @@ -266,8 +266,8 @@ public class MockRaftActorContext implements RaftActorContext { this.size = size; } - @Override public Map encode() { - Map map = new HashMap(); + @Override public Map, String> encode() { + Map, String> map = new HashMap<>(); map.put(MockPayloadMessages.value, value); return map; } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java index 3a66aa1181..b009fbbdb1 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java @@ -20,7 +20,7 @@ public abstract class AbstractConfig implements UnifiedConfig { return config; } - public static abstract class Builder{ + public static abstract class Builder> { protected Map configHolder; protected Config fallback; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java index 48afe40607..746ef4ebb1 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/CommonConfig.java @@ -89,7 +89,7 @@ public class CommonConfig extends AbstractConfig { return cachedMailBoxPushTimeout; } - public static class Builder extends AbstractConfig.Builder{ + public static class Builder> extends AbstractConfig.Builder{ public Builder(String actorSystemName) { super(actorSystemName); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java index fc1bd4225d..eac4fc496f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java @@ -467,7 +467,7 @@ public class NormalizedNodeSerializer { return builder.build(); } - private NormalizedNode buildDataContainer(DataContainerNodeBuilder builder, NormalizedNodeMessages.Node node){ + private NormalizedNode buildDataContainer(DataContainerNodeBuilder builder, NormalizedNodeMessages.Node node){ for(NormalizedNodeMessages.Node child : node.getChildList()){ builder.withChild((DataContainerChild) deSerialize(child)); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java index 83e10cf6af..b61b276d5e 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationByteStringPayload.java @@ -47,9 +47,9 @@ public class CompositeModificationByteStringPayload extends Payload implements @Override - public Map encode() { + public Map, PersistentMessages.CompositeModification> encode() { Preconditions.checkState(byteString!=null); - Map map = new HashMap<>(); + Map, PersistentMessages.CompositeModification> map = new HashMap<>(); map.put(org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification, getModificationInternal()); return map; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java index fe5043e73d..cef20af650 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/raft/protobuff/client/messages/CompositeModificationPayload.java @@ -31,9 +31,9 @@ public class CompositeModificationPayload extends Payload implements this.modification = (PersistentMessages.CompositeModification) Preconditions.checkNotNull(modification, "modification should not be null"); } - @Override public Map encode() { + @Override public Map, PersistentMessages.CompositeModification> encode() { Preconditions.checkState(modification!=null); - Map map = new HashMap<>(); + Map, PersistentMessages.CompositeModification> map = new HashMap<>(); map.put( org.opendaylight.controller.protobuff.messages.shard.CompositeModificationPayload.modification, this.modification); return map; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/ModificationPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/ModificationPayload.java index 2e391570c4..01d11288d2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/ModificationPayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/ModificationPayload.java @@ -66,7 +66,6 @@ public class ModificationPayload extends Payload implements Externalizable { out.write(serializedPayload); } - @SuppressWarnings("rawtypes") @Override @Deprecated public Map encode() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java index 74e61c189f..d90cf500b0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/MessageTracker.java @@ -51,7 +51,7 @@ public class MessageTracker { private static final Context NO_OP_CONTEXT = new NoOpContext(); - private final Class expectedMessageClass; + private final Class expectedMessageClass; private final long expectedArrivalInterval; @@ -73,7 +73,7 @@ public class MessageTracker { * @param expectedArrivalIntervalInMillis The expected arrival interval between two instances of the expected * message */ - public MessageTracker(Class expectedMessageClass, long expectedArrivalIntervalInMillis){ + public MessageTracker(Class expectedMessageClass, long expectedArrivalIntervalInMillis){ this.expectedMessageClass = expectedMessageClass; this.expectedArrivalInterval = expectedArrivalIntervalInMillis; } @@ -120,10 +120,10 @@ public class MessageTracker { } public static class MessageProcessingTime { - private final Class messageClass; + private final Class messageClass; private final long elapsedTimeInNanos; - MessageProcessingTime(Class messageClass, long elapsedTimeInNanos){ + MessageProcessingTime(Class messageClass, long elapsedTimeInNanos){ this.messageClass = messageClass; this.elapsedTimeInNanos = elapsedTimeInNanos; } @@ -136,7 +136,7 @@ public class MessageTracker { '}'; } - public Class getMessageClass() { + public Class getMessageClass() { return messageClass; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageCollectorActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageCollectorActor.java index d62c9dbc28..18c2985635 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageCollectorActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/MessageCollectorActor.java @@ -37,7 +37,7 @@ public class MessageCollectorActor extends UntypedActor { @Override public void onReceive(Object message) throws Exception { if(message instanceof String){ if("messages".equals(message)){ - getSender().tell(new ArrayList(messages), getSelf()); + getSender().tell(new ArrayList<>(messages), getSelf()); } } else { messages.add(message); -- 2.36.6