From serb at openjdk.java.net  Tue Feb 23 15:23:54 2021
From: serb at openjdk.java.net (Sergey Bylokhov)
Date: Tue, 23 Feb 2021 15:23:54 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
Message-ID: <h8azogOoMJNjjuE1Foqob6JKY4_20yY1rZ_t7j0rmDI=.face8167-4841-4470-98b0-00c9aebb1448@github.com>

On Mon, 21 Dec 2020 07:54:17 GMT, Andrey Turbanov <github.com+741251+turbanoff at openjdk.org> wrote:

> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
> 1. java.io.InputStream#readAllBytes
> 2. java.io.InputStream#transferTo
> 3. java.nio.file.Files#copy
> 
> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272

The changes look fine, I'll run the tests.

src/java.desktop/windows/classes/sun/print/Win32PrintJob.java line 435:

> 433:             if (mDestination != null) { // if destination attribute is set
> 434:                 try {
> 435:                     Files.copy(instream, Path.of(mDestination));

Looks like the new code unlike the old one will throw an exception if the file is exists already. WIll it affect the printing functionality?

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From github.com+741251+turbanoff at openjdk.java.net  Tue Feb 23 15:23:54 2021
From: github.com+741251+turbanoff at openjdk.java.net (Andrey Turbanov)
Date: Tue, 23 Feb 2021 15:23:54 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to new
 convinient methods in java.desktop
Message-ID: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>

Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
1. java.io.InputStream#readAllBytes
2. java.io.InputStream#transferTo
3. java.nio.file.Files#copy

Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272

-------------

Commit messages:
 - [PATCH] Refactor manual I/O stream copying to new convenient methods in java.desktop
 - [PATCH] Refactor I/O stream copying to use java.io.InputStream.transferTo in java.desktop

Changes: https://git.openjdk.java.net/jdk/pull/1856/files
 Webrev: https://webrevs.openjdk.java.net/?repo=jdk&pr=1856&range=00
  Issue: https://bugs.openjdk.java.net/browse/JDK-8262161
  Stats: 134 lines in 11 files changed: 3 ins; 102 del; 29 mod
  Patch: https://git.openjdk.java.net/jdk/pull/1856.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/1856/head:pull/1856

PR: https://git.openjdk.java.net/jdk/pull/1856

From github.com+741251+turbanoff at openjdk.java.net  Tue Feb 23 15:23:55 2021
From: github.com+741251+turbanoff at openjdk.java.net (Andrey Turbanov)
Date: Tue, 23 Feb 2021 15:23:55 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <h8azogOoMJNjjuE1Foqob6JKY4_20yY1rZ_t7j0rmDI=.face8167-4841-4470-98b0-00c9aebb1448@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
 <h8azogOoMJNjjuE1Foqob6JKY4_20yY1rZ_t7j0rmDI=.face8167-4841-4470-98b0-00c9aebb1448@github.com>
Message-ID: <inC9D7UdcLMS940dgUNoCEw9NuHxjFVVrDMVIx-MY0A=.2396e96b-a550-45c9-9036-b7705609d3c8@github.com>

On Sun, 3 Jan 2021 03:08:31 GMT, Sergey Bylokhov <serb at openjdk.org> wrote:

>> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
>> 1. java.io.InputStream#readAllBytes
>> 2. java.io.InputStream#transferTo
>> 3. java.nio.file.Files#copy
>> 
>> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272
>
> src/java.desktop/windows/classes/sun/print/Win32PrintJob.java line 435:
> 
>> 433:             if (mDestination != null) { // if destination attribute is set
>> 434:                 try {
>> 435:                     Files.copy(instream, Path.of(mDestination));
> 
> Looks like the new code unlike the old one will throw an exception if the file is exists already. WIll it affect the printing functionality?

good catch! Added `StandardCopyOption.REPLACE_EXISTING` to preserve behavior.

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From serb at openjdk.java.net  Tue Feb 23 15:23:54 2021
From: serb at openjdk.java.net (Sergey Bylokhov)
Date: Tue, 23 Feb 2021 15:23:54 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <h8azogOoMJNjjuE1Foqob6JKY4_20yY1rZ_t7j0rmDI=.face8167-4841-4470-98b0-00c9aebb1448@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
 <h8azogOoMJNjjuE1Foqob6JKY4_20yY1rZ_t7j0rmDI=.face8167-4841-4470-98b0-00c9aebb1448@github.com>
Message-ID: <RODtj4KbZLN99dWWRZ7WsepGE0WlCzc5J6f6dql918Y=.4066a888-d75b-4447-bdf5-06d44ce2131c@github.com>

On Mon, 22 Feb 2021 18:38:36 GMT, Sergey Bylokhov <serb at openjdk.org> wrote:

>> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
>> 1. java.io.InputStream#readAllBytes
>> 2. java.io.InputStream#transferTo
>> 3. java.nio.file.Files#copy
>> 
>> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272
>
> The changes look fine, I'll run the tests.

I have filed https://bugs.openjdk.java.net/browse/JDK-8262161

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From psadhukhan at openjdk.java.net  Tue Feb 23 15:49:44 2021
From: psadhukhan at openjdk.java.net (Prasanta Sadhukhan)
Date: Tue, 23 Feb 2021 15:49:44 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
Message-ID: <UttuZLHmHMQV4jkEEfeXQz91QIlWAXCbwg4BHocMfq8=.91bc5fb8-b85d-4aa6-93be-dea79846e885@github.com>

On Mon, 21 Dec 2020 07:54:17 GMT, Andrey Turbanov <github.com+741251+turbanoff at openjdk.org> wrote:

> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
> 1. java.io.InputStream#readAllBytes
> 2. java.io.InputStream#transferTo
> 3. java.nio.file.Files#copy
> 
> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272

src/java.desktop/windows/classes/sun/print/Win32PrintJob.java line 436:

> 434:             if (mDestination != null) { // if destination attribute is set
> 435:                 try {
> 436:                     Files.copy(instream, Path.of(mDestination), StandardCopyOption.REPLACE_EXISTING);

Don't we need to close the instream in finally block?

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From github.com+741251+turbanoff at openjdk.java.net  Tue Feb 23 16:46:48 2021
From: github.com+741251+turbanoff at openjdk.java.net (Andrey Turbanov)
Date: Tue, 23 Feb 2021 16:46:48 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <UttuZLHmHMQV4jkEEfeXQz91QIlWAXCbwg4BHocMfq8=.91bc5fb8-b85d-4aa6-93be-dea79846e885@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
 <UttuZLHmHMQV4jkEEfeXQz91QIlWAXCbwg4BHocMfq8=.91bc5fb8-b85d-4aa6-93be-dea79846e885@github.com>
Message-ID: <Q-Dp2PT3AU61UJeChalX-1psXfVitlZVEB4Us_FnkTk=.40b29b0c-13f4-4610-ac14-5a04d57dae22@github.com>

On Tue, 23 Feb 2021 15:47:20 GMT, Prasanta Sadhukhan <psadhukhan at openjdk.org> wrote:

>> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
>> 1. java.io.InputStream#readAllBytes
>> 2. java.io.InputStream#transferTo
>> 3. java.nio.file.Files#copy
>> 
>> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272
>
> src/java.desktop/windows/classes/sun/print/Win32PrintJob.java line 436:
> 
>> 434:             if (mDestination != null) { // if destination attribute is set
>> 435:                 try {
>> 436:                     Files.copy(instream, Path.of(mDestination), StandardCopyOption.REPLACE_EXISTING);
> 
> Don't we need to close the instream in finally block?

It will be closed in `notifyEvent(PrintJobEvent.JOB_FAILED);` -> `closeDataStreams` in case of IOException.
And there shouldn't be any other kinds of exceptions.

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From prr at openjdk.java.net  Thu Feb 25 22:20:42 2021
From: prr at openjdk.java.net (Phil Race)
Date: Thu, 25 Feb 2021 22:20:42 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
Message-ID: <eniXGnIegGbn5FUZh57MJ7SrIVwI2neTC-Xu1k0LvgU=.6da35b30-2139-4248-9fe2-4d5e9bcbe78d@github.com>

On Mon, 21 Dec 2020 07:54:17 GMT, Andrey Turbanov <github.com+741251+turbanoff at openjdk.org> wrote:

> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
> 1. java.io.InputStream#readAllBytes
> 2. java.io.InputStream#transferTo
> 3. java.nio.file.Files#copy
> 
> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272

src/java.desktop/unix/classes/sun/print/UnixPrintJob.java line 601:

> 599:             try (BufferedInputStream bin = new BufferedInputStream(instream);
> 600:                  BufferedOutputStream bout = new BufferedOutputStream(output)) {
> 601:                 bin.transferTo(bout);

https://docs.oracle.com/en/java/javase/15/docs/api/java.base/java/io/InputStream.html#transferTo(java.io.OutputStream)

This method does not close either stream.

---

So this doesn't look right.

src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java line 990:

> 988:             AudioInputStream stream = AudioSystem.getAudioInputStream(
> 989:                     audioformat, (AudioInputStream)sample.getData());
> 990:             stream.transferTo(data_chunk);

Are all these audio streams buffered ? transferTo docs don't say anything in terms of guarantees of what API they call. If it is unbuffered and it just calls read(byte) over and over it would be really slow.

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From serb at openjdk.java.net  Thu Feb 25 22:59:42 2021
From: serb at openjdk.java.net (Sergey Bylokhov)
Date: Thu, 25 Feb 2021 22:59:42 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
Message-ID: <cln_Eq1igadNLEi0PVinQ1wNOm4MKVSoz5WvQFIwOa4=.f228c5c5-d795-4e6e-b163-f6d259300c10@github.com>

On Mon, 21 Dec 2020 07:54:17 GMT, Andrey Turbanov <github.com+741251+turbanoff at openjdk.org> wrote:

> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
> 1. java.io.InputStream#readAllBytes
> 2. java.io.InputStream#transferTo
> 3. java.nio.file.Files#copy
> 
> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272

The direct replacement of the old API by the new one looks fine. The tests are green.

-------------

Marked as reviewed by serb (Reviewer).

PR: https://git.openjdk.java.net/jdk/pull/1856

From serb at openjdk.java.net  Fri Feb 26 20:31:45 2021
From: serb at openjdk.java.net (Sergey Bylokhov)
Date: Fri, 26 Feb 2021 20:31:45 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <eniXGnIegGbn5FUZh57MJ7SrIVwI2neTC-Xu1k0LvgU=.6da35b30-2139-4248-9fe2-4d5e9bcbe78d@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
 <eniXGnIegGbn5FUZh57MJ7SrIVwI2neTC-Xu1k0LvgU=.6da35b30-2139-4248-9fe2-4d5e9bcbe78d@github.com>
Message-ID: <vw_YMaMjjhWCP72u3Q6pI7BNOOe7nSTolVuOYDjP27w=.fcd999e1-d2bd-4c7b-bd28-1776760fef01@github.com>

On Wed, 24 Feb 2021 20:48:29 GMT, Phil Race <prr at openjdk.org> wrote:

>> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
>> 1. java.io.InputStream#readAllBytes
>> 2. java.io.InputStream#transferTo
>> 3. java.nio.file.Files#copy
>> 
>> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272
>
> src/java.desktop/unix/classes/sun/print/UnixPrintJob.java line 601:
> 
>> 599:             try (BufferedInputStream bin = new BufferedInputStream(instream);
>> 600:                  BufferedOutputStream bout = new BufferedOutputStream(output)) {
>> 601:                 bin.transferTo(bout);
> 
> https://docs.oracle.com/en/java/javase/15/docs/api/java.base/java/io/InputStream.html#transferTo(java.io.OutputStream)
> 
> This method does not close either stream.
> 
> ---
> 
> So this doesn't look right.

The method itself does not close it, but the "try-with-res" around it should.

> src/java.desktop/share/classes/com/sun/media/sound/DLSSoundbank.java line 990:
> 
>> 988:             AudioInputStream stream = AudioSystem.getAudioInputStream(
>> 989:                     audioformat, (AudioInputStream)sample.getData());
>> 990:             stream.transferTo(data_chunk);
> 
> Are all these audio streams buffered ? transferTo docs don't say anything in terms of guarantees of what API they call. If it is unbuffered and it just calls read(byte) over and over it would be really slow.

It read the data in chunks of "8192" bytes.

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From prr at openjdk.java.net  Sat Feb 27 00:48:38 2021
From: prr at openjdk.java.net (Phil Race)
Date: Sat, 27 Feb 2021 00:48:38 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <vw_YMaMjjhWCP72u3Q6pI7BNOOe7nSTolVuOYDjP27w=.fcd999e1-d2bd-4c7b-bd28-1776760fef01@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
 <eniXGnIegGbn5FUZh57MJ7SrIVwI2neTC-Xu1k0LvgU=.6da35b30-2139-4248-9fe2-4d5e9bcbe78d@github.com>
 <vw_YMaMjjhWCP72u3Q6pI7BNOOe7nSTolVuOYDjP27w=.fcd999e1-d2bd-4c7b-bd28-1776760fef01@github.com>
Message-ID: <1Jdv9_gjRYFjbjuWFkqZslSZAMKt0iwaPaXQ4mRhaNI=.4dc06a05-aa8f-4523-851f-565ead337814@github.com>

On Fri, 26 Feb 2021 20:21:21 GMT, Sergey Bylokhov <serb at openjdk.org> wrote:

>> src/java.desktop/unix/classes/sun/print/UnixPrintJob.java line 601:
>> 
>>> 599:             try (BufferedInputStream bin = new BufferedInputStream(instream);
>>> 600:                  BufferedOutputStream bout = new BufferedOutputStream(output)) {
>>> 601:                 bin.transferTo(bout);
>> 
>> https://docs.oracle.com/en/java/javase/15/docs/api/java.base/java/io/InputStream.html#transferTo(java.io.OutputStream)
>> 
>> This method does not close either stream.
>> 
>> ---
>> 
>> So this doesn't look right.
>
> The method itself does not close it, but the "try-with-res" around it should.

ah yes

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856

From prr at openjdk.java.net  Sat Feb 27 00:48:37 2021
From: prr at openjdk.java.net (Phil Race)
Date: Sat, 27 Feb 2021 00:48:37 GMT
Subject: <Sound Dev> RFR: 8262161 Refactor manual I/O stream copying to
 new convinient methods in java.desktop
In-Reply-To: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
References: <ufDL14NgeugRfIkjQ4_Uz8z-xcT0eQ40GuPEERyOPhY=.70440aa1-c77e-462a-9e48-2ccf00044875@github.com>
Message-ID: <fPlt_EPdXAncEkMSJXwZXYWlUXnc8rUF1siWVex4IKk=.8b46bbc1-392e-4a10-b4dc-9f6d00439a46@github.com>

On Mon, 21 Dec 2020 07:54:17 GMT, Andrey Turbanov <github.com+741251+turbanoff at openjdk.org> wrote:

> Cleanup code to use new handy methods in `java.io.InputStream`/`java.nio.file.Files` instead of manual stream copy:
> 1. java.io.InputStream#readAllBytes
> 2. java.io.InputStream#transferTo
> 3. java.nio.file.Files#copy
> 
> Similar issue - https://bugs.openjdk.java.net/browse/JDK-8080272

Marked as reviewed by prr (Reviewer).

-------------

PR: https://git.openjdk.java.net/jdk/pull/1856