From 0a5d8344a216b9f5dae145df20f3b79a0b6ce974 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Sun, 22 Dec 2024 09:12:58 +0000 Subject: [PATCH] Modernization: Using NIO2 instead of IO --- .../jakarta/ws/rs/client/FactoryFinder.java | 18 +++++++++--------- .../java/jakarta/ws/rs/ext/FactoryFinder.java | 18 +++++++++--------- .../java/jakarta/ws/rs/sse/FactoryFinder.java | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/client/FactoryFinder.java b/jaxrs-api/src/main/java/jakarta/ws/rs/client/FactoryFinder.java index 74deb0599..6a8afa20c 100644 --- a/jaxrs-api/src/main/java/jakarta/ws/rs/client/FactoryFinder.java +++ b/jaxrs-api/src/main/java/jakarta/ws/rs/client/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -16,9 +16,10 @@ package jakarta.ws.rs.client; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Properties; @@ -123,15 +124,14 @@ static Object find(final String factoryId, final Class service) throws Cl } // try to read from $java.home/lib/jaxrs.properties - FileInputStream inputStream = null; - String configFile = null; + InputStream inputStream = null; + Path configFile = null; try { String javah = System.getProperty("java.home"); - configFile = javah + File.separator + "lib" + File.separator + "jaxrs.properties"; - File f = new File(configFile); - if (f.exists()) { + configFile = Path.of(javah, "lib", "jaxrs.properties"); + if (Files.exists(configFile)) { Properties props = new Properties(); - inputStream = new FileInputStream(f); + inputStream = Files.newInputStream(configFile); props.load(inputStream); String factoryClassName = props.getProperty(factoryId); return newInstance(factoryClassName, classLoader); diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/ext/FactoryFinder.java b/jaxrs-api/src/main/java/jakarta/ws/rs/ext/FactoryFinder.java index bbd5afd96..85a63634c 100644 --- a/jaxrs-api/src/main/java/jakarta/ws/rs/ext/FactoryFinder.java +++ b/jaxrs-api/src/main/java/jakarta/ws/rs/ext/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -16,9 +16,10 @@ package jakarta.ws.rs.ext; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Properties; @@ -123,15 +124,14 @@ static Object find(final String factoryId, final Class service) throws Cl } // try to read from $java.home/lib/jaxrs.properties - FileInputStream inputStream = null; - String configFile = null; + InputStream inputStream = null; + Path configFile = null; try { String javah = System.getProperty("java.home"); - configFile = javah + File.separator + "lib" + File.separator + "jaxrs.properties"; - File f = new File(configFile); - if (f.exists()) { + configFile = Path.of(javah, "lib", "jaxrs.properties"); + if (Files.exists(configFile)) { Properties props = new Properties(); - inputStream = new FileInputStream(f); + inputStream = Files.newInputStream(configFile); props.load(inputStream); String factoryClassName = props.getProperty(factoryId); return newInstance(factoryClassName, classLoader); diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/sse/FactoryFinder.java b/jaxrs-api/src/main/java/jakarta/ws/rs/sse/FactoryFinder.java index 40440ae87..981ec52f1 100644 --- a/jaxrs-api/src/main/java/jakarta/ws/rs/sse/FactoryFinder.java +++ b/jaxrs-api/src/main/java/jakarta/ws/rs/sse/FactoryFinder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -16,9 +16,10 @@ package jakarta.ws.rs.sse; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Properties; @@ -123,15 +124,14 @@ static Object find(final String factoryId, final Class service) throws Cl } // try to read from $java.home/lib/jaxrs.properties - FileInputStream inputStream = null; - String configFile = null; + Path configFile = null; + InputStream inputStream = null; try { String javah = System.getProperty("java.home"); - configFile = javah + File.separator + "lib" + File.separator + "jaxrs.properties"; - File f = new File(configFile); - if (f.exists()) { + configFile = Path.of(javah, "lib", "jaxrs.properties"); + if (Files.exists(configFile)) { Properties props = new Properties(); - inputStream = new FileInputStream(f); + inputStream = Files.newInputStream(configFile); props.load(inputStream); String factoryClassName = props.getProperty(factoryId); return newInstance(factoryClassName, classLoader);