From 36856dbb43e3fabd0b6b1dd117657416e1a3766b Mon Sep 17 00:00:00 2001 From: Jakub Morvay Date: Tue, 4 Dec 2018 13:15:32 +0100 Subject: [PATCH] Fix Java 7 IDE migration warnings - explicit type argument can be replaces with <> - identical 'catch' branches in 'try' statement Change-Id: I731a00664a50fae9d4fa5f3fe9a908779948adfb Signed-off-by: Jakub Morvay --- .../netconf/notifications/impl/osgi/Activator.java | 2 +- .../netconf/test/tool/client/stress/StressClient.java | 4 ++-- .../netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java | 4 +--- .../netconf/sal/rest/impl/PatchXmlBodyWriter.java | 4 +--- .../sal/rest/impl/RestconfDocumentedExceptionMapper.java | 4 +--- .../nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java | 4 +--- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java index cc4c57c07b..967bd08914 100644 --- a/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java +++ b/netconf/netconf-notifications-impl/src/main/java/org/opendaylight/netconf/notifications/impl/osgi/Activator.java @@ -47,7 +47,7 @@ public class Activator implements BundleActivator { final Dictionary props = new Hashtable<>(); props.put(NetconfConstants.SERVICE_NAME, NetconfConstants.NETCONF_NOTIFICATION); netconfNotificationCollectorServiceRegistration = context.registerService(NetconfNotificationCollector.class, - netconfNotificationManager, new Hashtable()); + netconfNotificationManager, new Hashtable<>()); final NetconfOperationServiceFactory netconfOperationServiceFactory = new NetconfOperationServiceFactory() { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java index 9e2d9c4193..6d02ba259a 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java @@ -128,9 +128,9 @@ public final class StressClient { final List> allPreparedMessages = new ArrayList<>(threadAmount); for (int i = 0; i < threadAmount; i++) { if (i != threadAmount - 1) { - allPreparedMessages.add(new ArrayList(requestsPerThread)); + allPreparedMessages.add(new ArrayList<>(requestsPerThread)); } else { - allPreparedMessages.add(new ArrayList(requestsPerThread + leftoverRequests)); + allPreparedMessages.add(new ArrayList<>(requestsPerThread + leftoverRequests)); } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java index 7db0081ca5..df9b4f03b6 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java @@ -92,9 +92,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter data = context.getData(); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java index 13ceb2e63c..a8ce65f18d 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/PatchXmlBodyWriter.java @@ -62,9 +62,7 @@ public class PatchXmlBodyWriter implements MessageBodyWriter final XMLStreamWriter xmlWriter = XML_FACTORY.createXMLStreamWriter(entityStream, StandardCharsets.UTF_8.name()); writeDocument(xmlWriter, patchStatusContext); - } catch (final XMLStreamException e) { - throw new IllegalStateException(e); - } catch (final FactoryConfigurationError e) { + } catch (final XMLStreamException | FactoryConfigurationError e) { throw new IllegalStateException(e); } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java index 3828abd6a7..6f96161634 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java @@ -294,9 +294,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper data = errorsNode.getData(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java index d7d264fdab..aa936e5919 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/PatchXmlBodyWriter.java @@ -62,9 +62,7 @@ public class PatchXmlBodyWriter implements MessageBodyWriter final XMLStreamWriter xmlWriter = XML_FACTORY.createXMLStreamWriter(entityStream, StandardCharsets.UTF_8.name()); writeDocument(xmlWriter, patchStatusContext); - } catch (final XMLStreamException e) { - throw new IllegalStateException(e); - } catch (final FactoryConfigurationError e) { + } catch (final XMLStreamException | FactoryConfigurationError e) { throw new IllegalStateException(e); } } -- 2.36.6