starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-06-08 14:52:56 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Use Files.newInputStream()/newOutputStream() where appropriate (#383)

Browse Source 
Use `Files.newInputStream(path)` instead of `new FileInputStream(path.toFile())`
and `Files.newOutputStream(path)` instead of `new FileOutputStream(path.toFile())`.
This commit is contained in:
translatenix
2024-04-04 16:04:14 -07:00
committed by GitHub
parent 57f45c80c6
commit d916345d2c
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkl-core/src/main/java/org/pkl/core/module/ModulePathResolver.java
+1 -2
View File
@@ -15,7 +15,6 @@
*/ */
package org.pkl.core.module; package org.pkl.core.module;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
@@ -171,7 +170,7 @@ public class ModulePathResolver implements AutoCloseable {
if (path.endsWith(".jar") || path.endsWith(".zip")) return true; if (path.endsWith(".jar") || path.endsWith(".zip")) return true;
byte[] buffer; byte[] buffer;
try (var fis = new FileInputStream(path.toFile())) { try (var fis = Files.newInputStream(path)) {
buffer = fis.readNBytes(39); buffer = fis.readNBytes(39);
} catch (IOException e) { } catch (IOException e) {
return false; return false;
pkl-core/src/main/java/org/pkl/core/packages/PackageResolvers.java
+1 -2
View File
@@ -16,7 +16,6 @@
package org.pkl.core.packages; package org.pkl.core.packages;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@@ -590,7 +589,7 @@ class PackageResolvers {
var cacheFile = packageDir.resolve(packageDir.getFileName() + ".json"); var cacheFile = packageDir.resolve(packageDir.getFileName() + ".json");
if (Files.exists(cacheFile)) { if (Files.exists(cacheFile)) {
return readDependencyMetadataAndComputeChecksum( return readDependencyMetadataAndComputeChecksum(
packageUri, new FileInputStream(cacheFile.toFile())); packageUri, Files.newInputStream(cacheFile));
} }
return super.getDependencyMetadataAndComputeChecksum(packageUri); return super.getDependencyMetadataAndComputeChecksum(packageUri);
} }
pkl-core/src/main/java/org/pkl/core/project/ProjectPackager.java
+2 -4
View File
@@ -16,7 +16,6 @@
package org.pkl.core.project; package org.pkl.core.project;
import com.oracle.truffle.api.source.SourceSection; import com.oracle.truffle.api.source.SourceSection;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UncheckedIOException; import java.io.UncheckedIOException;
@@ -198,7 +197,7 @@ public class ProjectPackager {
private String createDependencyMetadataAndComputeChecksum( private String createDependencyMetadataAndComputeChecksum(
Project project, Package pkg, Path metadataFile, String zipFileChecksum) throws IOException { Project project, Package pkg, Path metadataFile, String zipFileChecksum) throws IOException {
var dependencyMetadata = createDependencyMetadata(project, pkg, zipFileChecksum); var dependencyMetadata = createDependencyMetadata(project, pkg, zipFileChecksum);
try (var fos = newDigestOutputStream(new FileOutputStream(metadataFile.toFile()))) { try (var fos = newDigestOutputStream(Files.newOutputStream((metadataFile)))) {
dependencyMetadata.writeTo(fos); dependencyMetadata.writeTo(fos);
return ByteArrayUtils.toHex(fos.getMessageDigest().digest()); return ByteArrayUtils.toHex(fos.getMessageDigest().digest());
} }
@@ -287,9 +286,8 @@ public class ProjectPackager {
Project project, List<Path> files, Path outputZipFile) { Project project, List<Path> files, Path outputZipFile) {
DigestOutputStream digestOutputStream; DigestOutputStream digestOutputStream;
try { try {
var outputFile = outputZipFile.toFile();
Files.createDirectories(outputZipFile.getParent()); Files.createDirectories(outputZipFile.getParent());
digestOutputStream = newDigestOutputStream(new FileOutputStream(outputFile)); digestOutputStream = newDigestOutputStream(Files.newOutputStream(outputZipFile));
} catch (IOException e) { } catch (IOException e) {
throw new UncheckedIOException(e); throw new UncheckedIOException(e);
} }
pkl-core/src/main/java/org/pkl/core/util/IoUtils.java
+1 -2
View File
@@ -17,7 +17,6 @@ package org.pkl.core.util;
import com.oracle.truffle.api.TruffleOptions; import com.oracle.truffle.api.TruffleOptions;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.Reader; import java.io.Reader;
@@ -145,7 +144,7 @@ public final class IoUtils {
} }
public static void zipDirectory(Path sourceDir, Path targetFile) throws IOException { public static void zipDirectory(Path sourceDir, Path targetFile) throws IOException {
try (var zipStream = new ZipOutputStream(new FileOutputStream(targetFile.toFile()))) { try (var zipStream = new ZipOutputStream(Files.newOutputStream(targetFile))) {
Files.walkFileTree( Files.walkFileTree(
sourceDir, sourceDir,
new SimpleFileVisitor<>() { new SimpleFileVisitor<>() {