X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Ftools%2Fnetconf-testtool%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftest%2Ftool%2Frpc%2FSimulatedCreateSubscription.java;h=fc7e99a31d3cf0b72cb56b05e872a3b20f79b882;hb=4751840df618117f99f1b08b6f6a186169c82db1;hp=eab9f2c8206a56daf7090394f56f0f1cc938a5fb;hpb=bb0a5647411830d544b19fb79c35b7e563d12079;p=netconf.git diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java index eab9f2c820..fc7e99a31d 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java @@ -14,6 +14,7 @@ import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -25,7 +26,6 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; @@ -46,7 +46,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im public SimulatedCreateSubscription(final String id, final Optional notificationsFile) { super(id); - Optional notifs; + final Optional notifs; if (notificationsFile.isPresent()) { notifs = Optional.of(loadNotifications(notificationsFile.get())); @@ -56,9 +56,9 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im } if (notifs.isPresent()) { - Map preparedMessages = Maps.newHashMapWithExpectedSize( - notifs.get().getNotificationList().size()); - for (final Notification notification : notifs.get().getNotificationList()) { + final Collection toCopy = notifs.get().getNotificationList(); + final Map preparedMessages = Maps.newHashMapWithExpectedSize(toCopy.size()); + for (final Notification notification : toCopy) { final NetconfMessage parsedNotification = parseNetconfNotification(notification.getContent()); preparedMessages.put(notification, parsedNotification); } @@ -66,7 +66,6 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im } else { this.notifications = Collections.emptyMap(); } - } private static Notifications loadNotifications(final File file) { @@ -90,8 +89,7 @@ public class SimulatedCreateSubscription extends AbstractLastNetconfOperation im } @Override - protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) - throws DocumentedException { + protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) { long delayAggregator = 0; for (final Map.Entry notification : notifications.entrySet()) {