--- old/test/test/lib/jdk/test/lib/net/URIBuilder.java	2019-09-25 13:01:09.926439841 +0300
+++ /dev/null	2019-06-26 20:30:32.375097000 +0300
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2019, Google 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib.net;
-
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-public class URIBuilder {
-
-    public static URIBuilder newBuilder() {
-        return new URIBuilder();
-    }
-
-    private String scheme;
-    private String userInfo;
-    private String host;
-    private int port;
-    private String path;
-    private String query;
-    private String fragment;
-
-    private URIBuilder() {}
-
-    public URIBuilder scheme(String scheme) {
-        this.scheme = scheme;
-        return this;
-    }
-
-    public URIBuilder userInfo(String userInfo) {
-        this.userInfo = userInfo;
-        return this;
-    }
-
-    public URIBuilder host(String host) {
-        this.host = host;
-        return this;
-    }
-
-    public URIBuilder host(InetAddress address) {
-        String hostaddr = address.isAnyLocalAddress()
-               ? "localhost" : address.getHostAddress();
-        return host(hostaddr);
-    }
-
-    public URIBuilder loopback() {
-        return host(InetAddress.getLoopbackAddress().getHostAddress());
-    }
-
-    public URIBuilder port(int port) {
-        this.port = port;
-        return this;
-    }
-
-    public URIBuilder path(String path) {
-        this.path = path;
-        return this;
-    }
-
-    public URIBuilder query(String query) {
-        this.query = query;
-        return this;
-    }
-
-    public URIBuilder fragment(String fragment) {
-        this.fragment = fragment;
-        return this;
-    }
-
-    public URI build() throws URISyntaxException {
-        return new URI(scheme, userInfo, host, port, path, query, fragment);
-    }
-
-    public URI buildUnchecked() {
-        try {
-            return build();
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-
-    public URL toURL() throws URISyntaxException, MalformedURLException {
-        return build().toURL();
-    }
-
-    public URL toURLUnchecked() {
-        try {
-            return toURL();
-        } catch (URISyntaxException | MalformedURLException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-}