[java] Remove deprecated "version" JWP capability

diemol · diemol · commit 293046106e58 · 2023-04-26T11:06:59.000+02:00
diff --git a/java/src/org/openqa/selenium/Capabilities.java b/java/src/org/openqa/selenium/Capabilities.java
@@ -55,8 +55,7 @@ default Platform getPlatformName() {
   }
 
   default String getBrowserVersion() {
-    return String.valueOf(Optional.ofNullable(getCapability("browserVersion")).orElse(
-      Optional.ofNullable(getCapability("version")).orElse("")));
+    return String.valueOf(Optional.ofNullable(getCapability("browserVersion")).orElse(""));
   }
 
   /**
diff --git a/java/src/org/openqa/selenium/remote/CapabilityType.java b/java/src/org/openqa/selenium/remote/CapabilityType.java
@@ -37,11 +37,6 @@ public interface CapabilityType {
    */
   @Deprecated
   String TAKES_SCREENSHOT = "takesScreenshot";
-  /**
-   * @deprecated Use {@link CapabilityType#BROWSER_VERSION}
-   */
-  @Deprecated
-  String VERSION = "version";
   /**
    * @deprecated Non W3C compliant
    */
diff --git a/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java b/java/test/org/openqa/selenium/grid/data/DefaultSlotMatcherTest.java
@@ -262,21 +262,6 @@ void shouldNotMatchIfRequestedBrowserVersionIsMissingFromStereotype() {
     assertThat(slotMatcher.matches(stereotype, capabilities)).isFalse();
   }
 
-  @Test
-  void matchesWithJsonWireProtocolCaps() {
-    Capabilities stereotype = new ImmutableCapabilities(
-      CapabilityType.BROWSER_NAME, "chrome",
-      CapabilityType.BROWSER_VERSION, "80",
-      CapabilityType.PLATFORM_NAME, Platform.WINDOWS
-    );
-    Capabilities capabilities = new ImmutableCapabilities(
-      CapabilityType.BROWSER_NAME, "chrome",
-      CapabilityType.VERSION, "80",
-      CapabilityType.PLATFORM, Platform.WINDOWS
-    );
-    assertThat(slotMatcher.matches(stereotype, capabilities)).isTrue();
-  }
-
   @Test
   void shouldNotMatchCapabilitiesThatAreDifferentButDoNotContainCommonCapabilityNames() {
     Capabilities stereotype = new ImmutableCapabilities("acceptInsecureCerts", "true");

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ default Platform getPlatformName() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`default String getBrowserVersion() {`
`58`		`- return String.valueOf(Optional.ofNullable(getCapability("browserVersion")).orElse(`
`59`		`- Optional.ofNullable(getCapability("version")).orElse("")));`
	`58`	`+ return String.valueOf(Optional.ofNullable(getCapability("browserVersion")).orElse(""));`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`/**`