8367114: Update jdk.test.lib.net.SimpleHttpServer to use SimpleFileServer

[mahendrachhipa]

Update SimpleHttpServer class to use SimpleFileServer.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8367114: Update jdk.test.lib.net.SimpleHttpServer to use SimpleFileServer (Enhancement - P4)

Reviewers

• Volkan Yazici (@vy - Committer) 🔄 Re-review required (review applies to 15e71bba)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/27608/head:pull/27608
$ git checkout pull/27608

Update a local copy of the PR:
$ git checkout pull/27608
$ git pull https://git.openjdk.org/jdk.git pull/27608/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27608

View PR using the GUI difftool:
$ git pr show -t 27608

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27608.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back mchhipa! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

[openjdk]

@mahendrachhipa The following label will be automatically applied to this pull request:

• net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mahendrachhipa]

Hi @JoeWang-Java , @dfuch , Could you please review this PR.

[mlbridge]

Webrevs

• 01: Full - Incremental (64cad93a)
• 00: Full (15e71bba)

[vy]

Nice clean up, thanks @mahendrachhipa! 💯
I see that Tier1-3 pass, LGTM.

[jaikiran]

Hello Mahendra, it's good that we are moving to use the com.sun.net.httpserver.SimpleFileServer in this test library class. However, it looks like before this change, this test library class was using a Executor which allowed it to handle multiple requests concurrently and thus serve the files concurrently. With this change, the requests will now be handled serially because the lack of any executor being configured on the internal HttpServer instance backing the SimpleFileServer instance.

Looking at the references of this jdk.test.lib.net.SimpleHttpServer test library class, I see only 3 tests using it. I wonder if we should just delete this class altogether and instead using the the SimpleFileServer at the call sites as and how necessary.

[jaikiran]

Interestingly, there's even a test/jdk/com/sun/net/httpserver/SimpleFileServer.java class which is neither a test nor a test library class. As far as I can see, it's not being used anywhere. Maybe we should remove that one too. These similarly named classes add to confusion.

[dfuch]

The SimpleHttpServer class that Mahendra is updating is used by multi-relase jars and jaxp catalog tests. It could be prudent to update the class first, check that everything remains stable, and then replace usage in a followup issue.
It seems this class is only being used by three tests however - so maybe updating those three tests to use the SimpleFileServer directly won't be too bad.
If we do that then make sure we keep the same behaviour = keep the executor as @jaikiran suggested.

Good find about test/jdk/com/sun/net/httpserver/SimpleFileServer.java - let's attempt to remove it - it does not appear to be used anywhere.

[openjdk]

@mahendrachhipa core-libs has been added to this pull request based on files touched in new commit(s).

[mahendrachhipa]

Hello Mahendra, it's good that we are moving to use the com.sun.net.httpserver.SimpleFileServer in this test library class. However, it looks like before this change, this test library class was using a Executor which allowed it to handle multiple requests concurrently and thus serve the files concurrently. With this change, the requests will now be handled serially because the lack of any executor being configured on the internal HttpServer instance backing the SimpleFileServer instance.

Looking at the references of this jdk.test.lib.net.SimpleHttpServer test library class, I see only 3 tests using it. I wonder if we should just delete this class altogether and instead using the the SimpleFileServer at the call sites as and how necessary.

Thanks. Now SimpleFileServer is being used in tests and jdk.test.lib.net.SimpleHttpServer is deleted now.

[mahendrachhipa]

/open

[openjdk]

@mahendrachhipa This pull request is now open

[mahendrachhipa]

The SimpleHttpServer class that Mahendra is updating is used by multi-relase jars and jaxp catalog tests. It could be prudent to update the class first, check that everything remains stable, and then replace usage in a followup issue. It seems this class is only being used by three tests however - so maybe updating those three tests to use the SimpleFileServer directly won't be too bad. If we do that then make sure we keep the same behaviour = keep the executor as @jaikiran suggested.

Good find about test/jdk/com/sun/net/httpserver/SimpleFileServer.java - let's attempt to remove it - it does not appear to be used anywhere.

Thanks, Now test/jdk/com/sun/net/httpserver/SimpleFileServer.java is removed.

[dfuch]

Suggested change

	remoteFilePath = "http:" + jdk.test.lib.net.URIBuilder.newBuilder().host(httpserver.getAddress().getAddress()).
	port(httpserver.getAddress().getPort()).build().toString() + REMOTE_FILE_LOCATION;
	remoteFilePath = jdk.test.lib.net.URIBuilder.newBuilder()
	.scheme("http")
	.host(httpserver.getAddress().getAddress())
	.port(httpserver.getAddress().getPort())
	.build().toString() + REMOTE_FILE_LOCATION;

[dfuch]

Is there another URIBuilder that prevents importing jdk.test.lib.net.URIBuilder?