Remove Jetty 9.4 specific handling for RemoteAddressTest.

PiperOrigin-RevId: 901633046
Change-Id: If90014a70a9fa0c407f405a96c19ceca9c6f4030

Author: ludoch

runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/RemoteAddressTest.java

@@ -135,19 +135,14 @@ public void testWithIPv6() throws Exception {
             .send();
     assertThat(response.getStatus(), equalTo(HttpStatus.OK_200));
     contentReceived = response.getContentAsString();
-    if (jettyVersion.equals("9.4")) {
-      assertThat(
-          contentReceived, containsString("getRemoteAddr: [2001:db8:85a3:8d3:1319:8a2e:370:7348]"));
-      assertThat(
-          contentReceived, containsString("getRemoteHost: [2001:db8:85a3:8d3:1319:8a2e:370:7348]"));
-    } else {
-      // The correct behaviour for getRemoteAddr and getRemoteHost is to not include []
-      // because they return raw IP/hostname and not URI-formatted addresses.
-      assertThat(
-          contentReceived, containsString("getRemoteAddr: 2001:db8:85a3:8d3:1319:8a2e:370:7348"));
-      assertThat(
-          contentReceived, containsString("getRemoteHost: 2001:db8:85a3:8d3:1319:8a2e:370:7348"));
-    }
+
+    // The correct behaviour for getRemoteAddr and getRemoteHost is to not include []
+    // because they return raw IP/hostname and not URI-formatted addresses.
+    assertThat(
+        contentReceived, containsString("getRemoteAddr: 2001:db8:85a3:8d3:1319:8a2e:370:7348"));
+    assertThat(
+        contentReceived, containsString("getRemoteHost: 2001:db8:85a3:8d3:1319:8a2e:370:7348"));
+
     assertThat(contentReceived, containsString("getRemotePort: 0"));
     assertThat(contentReceived, containsString("getLocalAddr: 0.0.0.0"));
     assertThat(contentReceived, containsString("getLocalName: 0.0.0.0"));