# HG changeset patch
# User chegar
# Date 1518697874 0
# Node ID 99f144742013b29d58bfe895fc86d4d40228936f
# Parent  c99ed32a4d12048b7494a9ad555cf30742115803
http-client-branch: minor cleanup and improve testing for response version and session

diff -r c99ed32a4d12 -r 99f144742013 src/java.net.http/share/classes/java/net/http/HttpResponse.java
--- a/src/java.net.http/share/classes/java/net/http/HttpResponse.java	Thu Feb 15 12:08:12 2018 +0000
+++ b/src/java.net.http/share/classes/java/net/http/HttpResponse.java	Thu Feb 15 12:31:14 2018 +0000
@@ -132,10 +132,12 @@
     public abstract T body();
 
     /**
-     * Returns an {@link Optional} containing the {@link javax.net.ssl.SSLSession} in effect
-     * for this response. Returns an empty {@code Optional} if this is not a HTTPS response.
+     * Returns an {@link Optional} containing the {@link SSLSession} in effect
+     * for this response. Returns an empty {@code Optional} if this is not a
+     * <i>HTTPS</i> response.
      *
-     * @return an {@code Optional} containing the SSLSession associated with the response
+     * @return an {@code Optional} containing the {@code SSLSession} associated
+     *         with the response
      */
     public abstract Optional<SSLSession> sslSession();
 
diff -r c99ed32a4d12 -r 99f144742013 test/jdk/java/net/httpclient/CustomRequestPublisher.java
--- a/test/jdk/java/net/httpclient/CustomRequestPublisher.java	Thu Feb 15 12:08:12 2018 +0000
+++ b/test/jdk/java/net/httpclient/CustomRequestPublisher.java	Thu Feb 15 12:31:14 2018 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,7 @@
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -56,6 +57,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -65,10 +67,13 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import static java.lang.System.out;
+import static java.net.http.HttpClient.Version.HTTP_1_1;
+import static java.net.http.HttpClient.Version.HTTP_2;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.net.http.HttpResponse.BodyHandler.asString;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 public class CustomRequestPublisher {
 
@@ -110,6 +115,28 @@
 
     static final int ITERATION_COUNT = 10;
 
+    /** Asserts HTTP Version, and SSLSession presence when applicable. */
+    static void assertVersionAndSession(HttpResponse response, String uri) {
+        if (uri.contains("http2") || uri.contains("https2"))
+            assertEquals(response.version(), HTTP_2);
+        else if (uri.contains("http1") || uri.contains("https1"))
+            assertEquals(response.version(), HTTP_1_1);
+        else
+            fail("Unknown HTTP version in test for: " + uri);
+
+        Optional<SSLSession> ssl = response.sslSession();
+        if (uri.contains("https")) {
+            assertTrue(ssl.isPresent(),
+                    "Expected optional containing SSLSession but got:" + ssl);
+            try {
+                ssl.get().invalidate();
+                fail("SSLSession is not immutable: " + ssl.get());
+            } catch (UnsupportedOperationException expected) { }
+        } else {
+            assertTrue(!ssl.isPresent(), "UNEXPECTED non-empty optional:" + ssl);
+        }
+    }
+
     @Test(dataProvider = "variants")
     void test(String uri, Supplier<BodyPublisher> bpSupplier, boolean sameClient)
             throws Exception
@@ -131,6 +158,8 @@
             assertTrue(resp.statusCode() == 200,
                     "Expected 200, got:" + resp.statusCode());
             assertEquals(resp.body(), bodyPublisher.bodyAsString());
+
+            assertVersionAndSession(resp, uri);
         }
     }
 
@@ -156,6 +185,8 @@
             assertTrue(resp.statusCode() == 200,
                     "Expected 200, got:" + resp.statusCode());
             assertEquals(resp.body(), bodyPublisher.bodyAsString());
+
+            assertVersionAndSession(resp, uri);
         }
     }