Mechanical code cleanup (sal-common-impl)

* Remove unnecessary type specifiers (use Java 7 <>)
* Remove unnecessary "extends Object" declarations
* Remove unnecessary semi-colons
* Merge identical catch blocks
* Remove redundant modifiers:
  - enum constructors are private by default
  - interface properties are public static final by default
  - interface methods are public abstract by default
  - interfaces are abstract by default
  - inner interfaces are static by default
  - inner classes in interfaces are public static by default

Change-Id: I94484029e3967dfb16343e61432f0945659c14b3
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
index d75f438144c15af95c3598df1301d0ac9bf6fd4d..bbe366016342a7998c961e5028538e56a4b57f9b 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java
@@ -53,7 +53,7 @@ public abstract class DataNormalizationOperation<T extends PathArgument> impleme
     @Override
     public T getIdentifier() {
         return identifier;
     @Override
     public T getIdentifier() {
         return identifier;

-    };
+    }

 
     protected DataNormalizationOperation(final T identifier, final SchemaNode schema) {
         super();
 
     protected DataNormalizationOperation(final T identifier, final SchemaNode schema) {
         super();

diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java
index 0c79e19dfb7494fe0258471816e35bee39afae55..4c24c8a7f500c250237ce04cd4e055a42d003121 100644 (file)
--- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java
+++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataSchemaContainerProxy.java
@@ -26,7 +26,7 @@ class DataSchemaContainerProxy implements DataNodeContainer {
 
     public DataSchemaContainerProxy(final Set<DataSchemaNode> realChildSchema) {
         realChildSchemas = realChildSchema;
 
     public DataSchemaContainerProxy(final Set<DataSchemaNode> realChildSchema) {
         realChildSchemas = realChildSchema;

-        mappedChildSchemas = new HashMap<QName, DataSchemaNode>();
+        mappedChildSchemas = new HashMap<>();

         for(DataSchemaNode schema : realChildSchemas) {
             mappedChildSchemas.put(schema.getQName(),schema);
         }
         for(DataSchemaNode schema : realChildSchemas) {
             mappedChildSchemas.put(schema.getQName(),schema);
         }