Skip to content

Commit 91e10e9

Browse files
committed
fix: URL constructor deprecation warning as of Java 21
1 parent c85e71e commit 91e10e9

2 files changed

Lines changed: 9 additions & 10 deletions

File tree

org.eclipse.tm4e.language_pack/updater/src/main/java/updater/AbstractSourceHandler.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
import static updater.utils.Validation.isURL;
1717

1818
import java.io.IOException;
19-
import java.net.URL;
19+
import java.net.URI;
2020
import java.nio.file.Files;
2121
import java.nio.file.Path;
2222
import java.util.Map;
23-
import java.util.function.Function;
23+
import java.util.function.UnaryOperator;
2424

2525
import javax.xml.XMLConstants;
2626
import javax.xml.parsers.DocumentBuilderFactory;
@@ -59,7 +59,7 @@ record DownloadContext(String targetNamePrefix, boolean updateExistingFiles, Pat
5959
void downloadExampleFile(final DownloadContext ctx, final String examplePathOrURL) throws IOException {
6060
if (examplePathOrURL != null) {
6161
if (isURL(examplePathOrURL)) {
62-
final var sourceURL = new URL(examplePathOrURL);
62+
final var sourceURL = URI.create(examplePathOrURL).toURL();
6363
final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + ".example." + getFileExtension(sourceURL.getPath()));
6464
if (ctx.updateExistingFiles || !Files.exists(targetFile)) {
6565
downloadFile(sourceURL, targetFile);
@@ -79,7 +79,7 @@ void downloadLangConfigurationJSONFile(final DownloadContext ctx, final String l
7979
if (isURL(langCfgPathOrURL)) {
8080
final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + ".language-configuration.json");
8181
if (ctx.updateExistingFiles || !Files.exists(targetFile)) {
82-
downloadFile(new URL(langCfgPathOrURL), targetFile);
82+
downloadFile(URI.create(langCfgPathOrURL).toURL(), targetFile);
8383
}
8484
} else {
8585
final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + ".language-configuration.json");
@@ -112,15 +112,15 @@ void downloadLicenseFile(final Path targetDir) throws IOException {
112112
* @return grammarFile
113113
*/
114114
Path downloadTextMateGrammarFile(final DownloadContext ctx, final String grammarPathOrURL) throws IOException {
115-
final Function<String, String> mapFileExt = fileExt -> switch (fileExt) {
115+
final UnaryOperator<String> mapFileExt = fileExt -> switch (fileExt) {
116116
case "json" -> ".tmLanguage.json";
117117
case "yml", "yaml", "yaml-tmlanguage" -> ".tmLanguage.yaml";
118118
case "plist", "xml", "tmlanguage" -> ".tmLanguage.plist";
119119
default -> ".tmLanguage.plist";
120120
};
121121

122122
if (isURL(grammarPathOrURL)) {
123-
final var sourceURL = new URL(grammarPathOrURL);
123+
final var sourceURL = URI.create(grammarPathOrURL).toURL();
124124
final var targetFile = ctx.targetDir.resolve(ctx.targetNamePrefix + mapFileExt.apply(getFileExtension(sourceURL.getPath())
125125
.toLowerCase()));
126126
if (ctx.updateExistingFiles || !Files.exists(targetFile)) {

org.eclipse.tm4e.registry/src/main/java/org/eclipse/tm4e/registry/TMResource.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import java.io.IOException;
1818
import java.io.InputStream;
1919
import java.net.URI;
20-
import java.net.URL;
2120
import java.nio.charset.StandardCharsets;
2221

2322
import org.eclipse.core.runtime.FileLocator;
@@ -43,7 +42,7 @@ protected TMResource() {
4342

4443
protected TMResource(final IConfigurationElement ce) {
4544
this(ce.getAttribute(XMLConstants.PATH_ATTR));
46-
this.pluginId = ce.getNamespaceIdentifier();
45+
pluginId = ce.getNamespaceIdentifier();
4746
}
4847

4948
protected TMResource(final String path) {
@@ -77,15 +76,15 @@ public URI getURI() {
7776
public InputStream getInputStream() throws IOException {
7877
return new BufferedInputStream(pluginId == null
7978
? new FileInputStream(new File(path))
80-
: new URL(PLATFORM_PLUGIN + pluginId + '/' + path).openStream());
79+
: URI.create(PLATFORM_PLUGIN + pluginId + '/' + path).toURL().openStream());
8180
}
8281

8382
@Override
8483
public long getLastModified() {
8584
try {
8685
return new File(pluginId == null //
8786
? path
88-
: FileLocator.resolve(new URL(PLATFORM_PLUGIN + pluginId + '/' + path)).getFile() //
87+
: FileLocator.resolve(URI.create(PLATFORM_PLUGIN + pluginId + '/' + path).toURL()).getFile() //
8988
).lastModified();
9089
} catch (final IOException ex) {
9190
return 0;

0 commit comments

Comments
 (0)