[3/5] incubator-brooklyn git commit: Added types to flags Maps and purged unused import

[heneveld]

Added types to flags Maps and purged unused import


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e1edc98e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e1edc98e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e1edc98e

Branch: refs/heads/master
Commit: e1edc98eeb6382e575d1a6d13368552ac50627e4
Parents: 68b774f
Author: John McCabe <j...@johnmccabe.net>
Authored: Mon Nov 2 11:44:19 2015 +0000
Committer: John McCabe <j...@johnmccabe.net>
Committed: Mon Nov 2 11:44:19 2015 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/test/HttpTestUtils.java   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e1edc98e/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
----------------------------------------------------------------------
diff --git 
a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java 
b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
index a554876..4625c04 100644
--- 
a/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
+++ 
b/usage/test-support/src/main/java/org/apache/brooklyn/test/HttpTestUtils.java
@@ -39,7 +39,6 @@ import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSession;
 
-import org.apache.brooklyn.test.Asserts;
 import org.apache.brooklyn.util.collections.MutableMap;
 import org.apache.brooklyn.util.crypto.SslTrustUtils;
 import org.apache.brooklyn.util.exceptions.Exceptions;
@@ -51,7 +50,6 @@ import org.testng.Assert;
 
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
 
@@ -172,10 +170,10 @@ public class HttpTestUtils {
     }
 
     public static void assertUrlUnreachableEventually(final String url) {
-        assertUrlUnreachableEventually(Maps.newLinkedHashMap(), url);
+        assertUrlUnreachableEventually(MutableMap.<String, Object>of(), url);
     }
     
-    public static void assertUrlUnreachableEventually(Map flags, final String 
url) {
+    public static void assertUrlUnreachableEventually(Map<String,?> flags, 
final String url) {
         Asserts.succeedsEventually(flags, new Runnable() {
             public void run() {
                 assertUrlUnreachable(url);
@@ -201,10 +199,10 @@ public class HttpTestUtils {
     }
 
     public static void assertHttpStatusCodeEventuallyEquals(final String url, 
final int expectedCode) {
-        assertHttpStatusCodeEventuallyEquals(Maps.newLinkedHashMap(),  url, 
expectedCode);
+        assertHttpStatusCodeEventuallyEquals(MutableMap.<String, Object>of(),  
url, expectedCode);
     }
 
-    public static void assertHttpStatusCodeEventuallyEquals(Map flags, final 
String url, final int expectedCode) {
+    public static void assertHttpStatusCodeEventuallyEquals(Map<String,?> 
flags, final String url, final int expectedCode) {
         Asserts.succeedsEventually(flags, new Runnable() {
             public void run() {
                 assertHttpStatusCodeEquals(url, expectedCode);
@@ -274,10 +272,10 @@ public class HttpTestUtils {
     }
     
     public static void assertContentEventuallyContainsText(final String url, 
final String phrase, final String ...additionalPhrases) {
-        assertContentEventuallyContainsText(MutableMap.of(), url, phrase, 
additionalPhrases);
+        assertContentEventuallyContainsText(MutableMap.<String, Object>of(), 
url, phrase, additionalPhrases);
     }
     
-    public static void assertContentEventuallyContainsText(Map flags, final 
String url, final String phrase, final String ...additionalPhrases) {
+    public static void assertContentEventuallyContainsText(Map<String,?> 
flags, final String url, final String phrase, final String 
...additionalPhrases) {
         Asserts.succeedsEventually(flags, new Runnable() {
             public void run() {
                 assertContentContainsText(url, phrase, additionalPhrases);
@@ -292,10 +290,10 @@ public class HttpTestUtils {
     }
 
     public static void assertContentEventuallyMatches(final String url, final 
String regex) {
-        assertContentEventuallyMatches(MutableMap.of(), url, regex);
+        assertContentEventuallyMatches(MutableMap.<String, Object>of(), url, 
regex);
     }
 
-    public static void assertContentEventuallyMatches(Map flags, final String 
url, final String regex) {
+    public static void assertContentEventuallyMatches(Map<String,?> flags, 
final String url, final String regex) {
         Asserts.succeedsEventually(flags, new Runnable() {
             @Override
             public void run() {