From: Stephen Kitt Date: Thu, 22 Sep 2016 16:16:51 +0000 (+0200) Subject: Mechanical code cleanup (sal-dom-config) X-Git-Tag: release/carbon~484 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=6e1e4e4eb656b8f2a97e6ab6592d94531487e409 Mechanical code cleanup (sal-dom-config) * 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: I8cd5f5323c5b8cf62bc583a6fab14523deeff9dd Signed-off-by: Stephen Kitt --- diff --git a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/controller/config/yang/config/legacy_entity_ownership_service_provider/LegacyEntityOwnershipServiceProviderModule.java b/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/controller/config/yang/config/legacy_entity_ownership_service_provider/LegacyEntityOwnershipServiceProviderModule.java index 0d0b371c0c..e2585ac97b 100644 --- a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/controller/config/yang/config/legacy_entity_ownership_service_provider/LegacyEntityOwnershipServiceProviderModule.java +++ b/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/controller/config/yang/config/legacy_entity_ownership_service_provider/LegacyEntityOwnershipServiceProviderModule.java @@ -60,7 +60,7 @@ public class LegacyEntityOwnershipServiceProviderModule extends AbstractLegacyEn this.bundleContext = bundleContext; } - private static interface AutoCloseableEntityOwnershipService extends EntityOwnershipService, AutoCloseable { + private interface AutoCloseableEntityOwnershipService extends EntityOwnershipService, AutoCloseable { } } diff --git a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/ClusterSingletonServiceProviderModule.java b/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/ClusterSingletonServiceProviderModule.java index daeb0a59a4..d054b4dc71 100644 --- a/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/ClusterSingletonServiceProviderModule.java +++ b/opendaylight/md-sal/sal-dom-config/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/md/sal/config/impl/cluster/singleton/service/rev160718/ClusterSingletonServiceProviderModule.java @@ -61,7 +61,7 @@ public class ClusterSingletonServiceProviderModule extends AbstractClusterSingle this.bundleContext = bundleContext; } - private static interface AutoCloseableDOMClusterSingletonServiceProvider + private interface AutoCloseableDOMClusterSingletonServiceProvider extends ClusterSingletonServiceProvider, AutoCloseable { } } \ No newline at end of file