8169002: Several java/net/httpclient have undeclared dependency on java.logging module
Reviewed-by: chegar, rriggs, dfuchs
--- a/jdk/test/java/net/httpclient/APIErrors.java Thu Nov 03 13:34:27 2016 -0400
+++ b/jdk/test/java/net/httpclient/APIErrors.java Thu Nov 03 16:19:29 2016 +0300
@@ -21,10 +21,11 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8087112
* @modules java.httpclient
+ * java.logging
* jdk.httpserver
* @library /lib/testlibrary/
* @build jdk.testlibrary.SimpleSSLContext ProxyServer
@@ -35,13 +36,23 @@
*/
//package javaapplication16;
-import com.sun.net.httpserver.*;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsServer;
import java.io.IOException;
-import java.net.*;
-import java.net.http.*;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
import java.util.LinkedList;
import java.util.List;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
import java.util.function.Supplier;
/**
--- a/jdk/test/java/net/httpclient/ManyRequests.java Thu Nov 03 13:34:27 2016 -0400
+++ b/jdk/test/java/net/httpclient/ManyRequests.java Thu Nov 03 16:19:29 2016 +0300
@@ -21,10 +21,11 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8087112
* @modules java.httpclient
+ * java.logging
* jdk.httpserver
* @library /lib/testlibrary/ /
* @build jdk.testlibrary.SimpleSSLContext EchoHandler
@@ -36,7 +37,9 @@
//package javaapplication16;
-import com.sun.net.httpserver.*;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsParameters;
+import com.sun.net.httpserver.HttpsServer;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.net.http.HttpClient;
@@ -48,9 +51,10 @@
import java.util.HashMap;
import java.util.LinkedList;
import java.util.Random;
-import java.util.logging.*;
+import java.util.logging.Logger;
+import java.util.logging.Level;
import java.util.concurrent.CompletableFuture;
-import javax.net.ssl.*;
+import javax.net.ssl.SSLContext;
import jdk.testlibrary.SimpleSSLContext;
public class ManyRequests {
--- a/jdk/test/java/net/httpclient/RequestBodyTest.java Thu Nov 03 13:34:27 2016 -0400
+++ b/jdk/test/java/net/httpclient/RequestBodyTest.java Thu Nov 03 16:19:29 2016 +0300
@@ -21,9 +21,10 @@
* questions.
*/
-/**
+/*
* @test @bug 8087112
* @modules java.httpclient
+ * java.logging
* jdk.httpserver
* @library /lib/testlibrary/ /
* @compile ../../../com/sun/net/httpserver/LogFilter.java
--- a/jdk/test/java/net/httpclient/SmokeTest.java Thu Nov 03 13:34:27 2016 -0400
+++ b/jdk/test/java/net/httpclient/SmokeTest.java Thu Nov 03 16:19:29 2016 +0300
@@ -21,10 +21,11 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8087112
* @modules java.httpclient
+ * java.logging
* jdk.httpserver
* @library /lib/testlibrary/ /
* @build jdk.testlibrary.SimpleSSLContext ProxyServer EchoHandler
@@ -33,13 +34,40 @@
* @run main/othervm SmokeTest
*/
-import com.sun.net.httpserver.*;
-import java.net.*;
-import java.net.http.*;
-import java.io.*;
-import java.util.concurrent.*;
-import javax.net.ssl.*;
-import java.nio.file.*;
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsParameters;
+import com.sun.net.httpserver.HttpsServer;
+import java.net.InetSocketAddress;
+import java.net.PasswordAuthentication;
+import java.net.ProxySelector;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLParameters;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
--- a/jdk/test/java/net/httpclient/security/Driver.java Thu Nov 03 13:34:27 2016 -0400
+++ b/jdk/test/java/net/httpclient/security/Driver.java Thu Nov 03 16:19:29 2016 +0300
@@ -28,6 +28,7 @@
* @bug 8087112
* @library /lib/testlibrary/
* @modules java.httpclient
+ * java.logging
* jdk.httpserver
* @build jdk.testlibrary.SimpleSSLContext jdk.testlibrary.Utils
* @compile ../../../../com/sun/net/httpserver/LogFilter.java
--- a/jdk/test/java/net/httpclient/security/Security.java Thu Nov 03 13:34:27 2016 -0400
+++ b/jdk/test/java/net/httpclient/security/Security.java Thu Nov 03 16:19:29 2016 +0300
@@ -23,10 +23,11 @@
* questions.
*/
-/**
+/*
* @test
* @bug 8087112
* @modules java.httpclient
+ * java.logging
* jdk.httpserver
* @library /lib/testlibrary/
* @build jdk.testlibrary.SimpleSSLContext
@@ -50,14 +51,27 @@
// Tests 1, 10, 11 and 12 executed from Driver
-import com.sun.net.httpserver.*;
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpContext;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsServer;
import java.io.IOException;
import java.io.InputStream;
import java.io.File;
import java.io.OutputStream;
import java.lang.reflect.Constructor;
-import java.net.*;
-import java.net.http.*;
+import java.net.BindException;
+import java.net.InetSocketAddress;
+import java.net.ProxySelector;
+import java.net.URI;
+import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.http.HttpHeaders;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -66,13 +80,15 @@
import java.nio.file.StandardCopyOption;
import java.util.LinkedList;
import java.util.List;
-import java.util.concurrent.*;
-import java.util.function.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ExecutorService;
+import java.util.function.LongConsumer;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.lang.reflect.InvocationTargetException;
-import java.net.BindException;
/**
* Security checks test