Skip to content

Commit a2b1a8a

Browse files
committed
[Java] Remove use of FileOutputStream.
1 parent 3b3cd9c commit a2b1a8a

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,15 @@
1919
import baseline.CarDecoder.PerformanceFiguresDecoder.AccelerationDecoder;
2020
import org.agrona.concurrent.UnsafeBuffer;
2121

22-
import java.io.FileOutputStream;
2322
import java.io.UnsupportedEncodingException;
2423
import java.nio.ByteBuffer;
2524
import java.nio.channels.FileChannel;
2625
import java.nio.charset.StandardCharsets;
26+
import java.nio.file.Paths;
27+
28+
import static java.nio.file.StandardOpenOption.CREATE;
29+
import static java.nio.file.StandardOpenOption.READ;
30+
import static java.nio.file.StandardOpenOption.WRITE;
2731

2832
public class ExampleUsingGeneratedStub
2933
{
@@ -69,7 +73,7 @@ public static void main(final String[] args) throws Exception
6973
final String encodingFilename = System.getProperty(ENCODING_FILENAME);
7074
if (encodingFilename != null)
7175
{
72-
try (FileChannel channel = new FileOutputStream(encodingFilename).getChannel())
76+
try (FileChannel channel = FileChannel.open(Paths.get(encodingFilename), READ, WRITE, CREATE))
7377
{
7478
byteBuffer.limit(encodingLengthPlusHeader);
7579
channel.write(byteBuffer);

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
import extension.MessageHeaderEncoder;
2222
import org.agrona.concurrent.UnsafeBuffer;
2323

24-
import java.io.FileOutputStream;
2524
import java.io.UnsupportedEncodingException;
2625
import java.nio.ByteBuffer;
2726
import java.nio.channels.FileChannel;
27+
import java.nio.file.Paths;
2828

2929
import static extension.CarEncoder.cupHolderCountNullValue;
30+
import static java.nio.file.StandardOpenOption.CREATE;
31+
import static java.nio.file.StandardOpenOption.READ;
32+
import static java.nio.file.StandardOpenOption.WRITE;
3033

3134
public class ExampleUsingGeneratedStubExtension
3235
{
@@ -73,7 +76,7 @@ public static void main(final String[] args) throws Exception
7376
final String encodingFilename = System.getProperty(ENCODING_FILENAME);
7477
if (encodingFilename != null)
7578
{
76-
try (FileChannel channel = new FileOutputStream(encodingFilename).getChannel())
79+
try (FileChannel channel = FileChannel.open(Paths.get(encodingFilename), READ, WRITE, CREATE))
7780
{
7881
byteBuffer.limit(encodingLengthPlusHeader);
7982
channel.write(byteBuffer);

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/cpp/NamespaceOutputManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.agrona.Verify;
2020

2121
import java.io.*;
22+
import java.nio.charset.StandardCharsets;
23+
import java.nio.file.Files;
2224

2325
import static java.io.File.separatorChar;
2426

@@ -66,6 +68,6 @@ public NamespaceOutputManager(final String baseDirectoryName, final String names
6668
public Writer createOutput(final String name) throws IOException
6769
{
6870
final File targetFile = new File(outputDir, name + ".h");
69-
return new BufferedWriter(new OutputStreamWriter(new FileOutputStream(targetFile), "UTF-8"));
71+
return Files.newBufferedWriter(targetFile.toPath(), StandardCharsets.UTF_8);
7072
}
7173
}

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/golang/GolangOutputManager.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.agrona.Verify;
2020

2121
import java.io.*;
22+
import java.nio.charset.StandardCharsets;
23+
import java.nio.file.Files;
2224

2325
import static java.io.File.separatorChar;
2426

@@ -34,7 +36,7 @@ public class GolangOutputManager implements OutputManager
3436
* Create a new {@link OutputManager} for generating golang source files into a given package.
3537
*
3638
* @param baseDirectoryName for the generated source code.
37-
* @param namespaceName for the generated source code relative to the baseDirectoryName.
39+
* @param namespaceName for the generated source code relative to the baseDirectoryName.
3840
* @throws IOException if an error occurs during output
3941
*/
4042
public GolangOutputManager(final String baseDirectoryName, final String namespaceName)
@@ -66,6 +68,7 @@ public GolangOutputManager(final String baseDirectoryName, final String namespac
6668
public Writer createOutput(final String name) throws IOException
6769
{
6870
final File targetFile = new File(outputDir, name + ".go");
69-
return new BufferedWriter(new OutputStreamWriter(new FileOutputStream(targetFile), "UTF-8"));
71+
72+
return Files.newBufferedWriter(targetFile.toPath(), StandardCharsets.UTF_8);
7073
}
7174
}

0 commit comments

Comments
 (0)