Merge "Fix raw references to Promise"

diff --combined opendaylight/netconf/netconf-client/src/test/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorTest.java
index 1b07f3c2803303ce7f51cc2b1ce61ab858e12dd7,ac715d87d82132e301c347a0e7d42be203a63049..187f13b2585d9fda02fdc6de209e58cc92001ebd
--- 1/opendaylight/netconf/netconf-client/src/test/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorTest.java
--- 2/opendaylight/netconf/netconf-client/src/test/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorTest.java
+++ b/opendaylight/netconf/netconf-client/src/test/java/org/opendaylight/controller/netconf/client/NetconfClientSessionNegotiatorTest.java
@@@ -103,7 -103,7 +103,7 @@@ public class NetconfClientSessionNegoti
          return pipeline;
      }
  
-     private NetconfClientSessionNegotiator createNetconfClientSessionNegotiator(final Promise promise,
+     private NetconfClientSessionNegotiator createNetconfClientSessionNegotiator(final Promise<NetconfClientSession> promise,
                                                                                  final NetconfMessage startExi) {
          ChannelProgressivePromise progressivePromise = mock(ChannelProgressivePromise.class);
          NetconfClientSessionPreferences preferences = new NetconfClientSessionPreferences(helloMessage, startExi);
@@@ -122,7 -122,7 +122,7 @@@
          NetconfClientSessionNegotiator negotiator = createNetconfClientSessionNegotiator(promise, null);
  
          negotiator.channelActive(null);
 -        Set caps = Sets.newSet("a", "b");
 +        Set<String> caps = Sets.newSet("a", "b");
          NetconfHelloMessage helloServerMessage = NetconfHelloMessage.createServerHello(caps, 10);
          negotiator.handleMessage(helloServerMessage);
          verify(promise).setSuccess(anyObject());
@@@ -137,7 -137,7 +137,7 @@@
          NetconfClientSessionNegotiator negotiator = createNetconfClientSessionNegotiator(promise, exiMessage);
  
          negotiator.channelActive(null);
 -        Set caps = Sets.newSet("exi:1.0");
 +        Set<String> caps = Sets.newSet("exi:1.0");
          NetconfHelloMessage helloMessage = NetconfHelloMessage.createServerHello(caps, 10);
  
          doAnswer(new Answer<Object>() {