From bf55a2017275c13d3eeec3bea3e1a78bf13547b7 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.wu1@huawei.com>
Date: Mon, 4 Jan 2016 11:55:53 -0800
Subject: [PATCH] Remove unnecessary code

Remove unnecessary casts and @SuppressWarnings

Change-Id: I817cdf97e708e4f9c4c343c44f54de60cbcb6eff
Signed-off-by: Gary Wu <gary.wu1@huawei.com>
---
 .../md/sal/binding/compat/HydrogenDataChangeEvent.java      | 6 ++----
 .../md/sal/binding/impl/LazyDataTreeModification.java       | 2 +-
 .../controller/sal/binding/test/AugmentationVerifier.java   | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java
index 8f50d0ad2e..77f156eb62 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java
@@ -93,7 +93,6 @@ public abstract class HydrogenDataChangeEvent implements
         return null;
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     private static final class OperationalChangeEvent extends HydrogenDataChangeEvent {
 
         private final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> delegate;
@@ -125,7 +124,7 @@ public abstract class HydrogenDataChangeEvent implements
 
         @Override
         public Map<InstanceIdentifier<?>, DataObject> getOriginalOperationalData() {
-            return (Map) delegate.getOriginalData();
+            return delegate.getOriginalData();
         }
 
         @Override
@@ -149,7 +148,6 @@ public abstract class HydrogenDataChangeEvent implements
 
     }
 
-    @SuppressWarnings({ "rawtypes", "unchecked" })
     private static final class ConfigurationChangeEvent extends HydrogenDataChangeEvent {
 
         private final AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> delegate;
@@ -181,7 +179,7 @@ public abstract class HydrogenDataChangeEvent implements
 
         @Override
         public Map<InstanceIdentifier<?>, DataObject> getOriginalConfigurationData() {
-            return (Map) delegate.getOriginalData();
+            return delegate.getOriginalData();
         }
 
         @Override
diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataTreeModification.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataTreeModification.java
index 2a90f96646..af82225ea7 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataTreeModification.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataTreeModification.java
@@ -53,7 +53,7 @@ class LazyDataTreeModification<T extends DataObject> implements DataTreeModifica
             final LogicalDatastoreType datastoreType) {
         final Entry<InstanceIdentifier<?>, BindingCodecTreeNode<?>> codecCtx =
                 codec.getSubtreeCodec(domChange.getRootPath());
-        return (DataTreeModification<T>) new LazyDataTreeModification(datastoreType, codecCtx.getKey(), codecCtx.getValue(), domChange);
+        return new LazyDataTreeModification(datastoreType, codecCtx.getKey(), codecCtx.getValue(), domChange);
     }
 
     static <T extends DataObject> Collection<DataTreeModification<T>> from(final BindingToNormalizedNodeCodec codec,
diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java
index c8129e6eca..4ef25ae02e 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AugmentationVerifier.java
@@ -21,7 +21,7 @@ public class AugmentationVerifier<T extends Augmentable<T>> {
 
     public AugmentationVerifier<T> assertHasAugmentation(Class<? extends Augmentation<T>> augmentation) {
         assertHasAugmentation(object, augmentation);
-        return (AugmentationVerifier<T>) this;
+        return this;
     }
 
     public static <T extends Augmentable<T>> void assertHasAugmentation(T object,
-- 
2.36.6