fix(utils): replace putIfAbsent with computeIfAbsent

acdcjunior · acdcjunior · commit bdd4bbdb8cb6 · 2017-08-16T23:34:24.000-03:00
diff --git a/src/main/java/io/github/seleniumquery/utils/DriverVersionUtils.java b/src/main/java/io/github/seleniumquery/utils/DriverVersionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 seleniumQuery authors
+ * Copyright (c) 2017 seleniumQuery authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ public static void overrideSingletonInstance(DriverVersionUtils instance) {
 	}
 
 	public boolean hasNativeSupportForPseudo(WebDriver driver, String pseudoClass) {
-        Map<String, Boolean> driverMap = driverSupportedPseudos.putIfAbsent(driver, new HashMap<>());
+        Map<String, Boolean> driverMap = driverSupportedPseudos.computeIfAbsent(driver, k -> new HashMap<>());
 		Boolean supports = driverMap.get(pseudoClass);
 		if (supports == null) {
 			boolean supported = testPseudoClassNativeSupport(pseudoClass, driver);
diff --git a/src/test/java/integration/io/github/seleniumquery/by/DriverVersionUtilsTest.java b/src/test/java/integration/io/github/seleniumquery/by/DriverVersionUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 seleniumQuery authors
+ * Copyright (c) 2017 seleniumQuery authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,24 @@
 
 package integration.io.github.seleniumquery.by;
 
-import com.gargoylesoftware.htmlunit.BrowserVersion;
-import io.github.seleniumquery.utils.DriverVersionUtils;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static testinfrastructure.testdouble.org.openqa.selenium.WebDriverDummy.createWebDriverDummy;
+
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.htmlunit.HtmlUnitDriver;
+
+import com.gargoylesoftware.htmlunit.BrowserVersion;
+import io.github.seleniumquery.utils.DriverVersionUtils;
 import testinfrastructure.testdouble.PseudoTestDoubleException;
 import testinfrastructure.testdouble.org.openqa.selenium.WebDriverDummy;
 import testinfrastructure.testutils.DriverInTest;
 
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static testinfrastructure.testdouble.org.openqa.selenium.WebDriverDummy.createWebDriverDummy;
-
 public class DriverVersionUtilsTest {
 
     @Before
@@ -76,7 +79,7 @@ public void hasNativeSupportForPseudo__should_return_true_if_driver_doesnt_throw
         // given
         final String supportedPseudo = ":some-supported-pseudo";
         class WebDriverThatSupportsSomePseudo extends WebDriverDummy {
-            @Override public WebElement findElementByCssSelector(String s) { assertThat(s, is("#AAA_SomeIdThatShouldNotExist" + supportedPseudo)); return null; }
+            @Override public List<WebElement> findElementsByCssSelector(String s) { assertThat(s, is("#AAA_SomeIdThatShouldNotExist" + supportedPseudo)); return null; }
         }
         DriverVersionUtils driverVersionUtils = new DriverVersionUtils();
         WebDriver webDriver = new WebDriverThatSupportsSomePseudo();

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2016 seleniumQuery authors`
	`2`	`+ * Copyright (c) 2017 seleniumQuery authors`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -62,7 +62,7 @@ public static void overrideSingletonInstance(DriverVersionUtils instance) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public boolean hasNativeSupportForPseudo(WebDriver driver, String pseudoClass) {`
`65`		`- Map<String, Boolean> driverMap = driverSupportedPseudos.putIfAbsent(driver, new HashMap<>());`
	`65`	`+ Map<String, Boolean> driverMap = driverSupportedPseudos.computeIfAbsent(driver, k -> new HashMap<>());`
`66`	`66`	`Boolean supports = driverMap.get(pseudoClass);`
`67`	`67`	`if (supports == null) {`
`68`	`68`	`boolean supported = testPseudoClassNativeSupport(pseudoClass, driver);`