From 1cb20989923f5f743ed28d68966ae9324d49723d Mon Sep 17 00:00:00 2001 From: Magnus Reftel Date: Thu, 20 Apr 2023 10:05:30 +0200 Subject: [PATCH] Issue #13012: Use toASCIIString for all URIs --- .../puppycrawl/tools/checkstyle/ConfigurationLoader.java | 2 +- .../checkstyle/checks/header/AbstractHeaderCheck.java | 4 ++-- .../checkstyle/checks/imports/ImportControlCheck.java | 4 ++-- .../checkstyle/checks/imports/ImportControlLoader.java | 8 ++++---- .../tools/checkstyle/filters/SuppressionsLoader.java | 4 ++-- .../tools/checkstyle/checks/header/HeaderCheckTest.java | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java index f33d2f5c8c1..1e38f2a94c1 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/ConfigurationLoader.java @@ -262,7 +262,7 @@ public static Configuration loadConfiguration(String config, throws CheckstyleException { // figure out if this is a File or a URL final URI uri = CommonUtil.getUriByFilename(config); - final InputSource source = new InputSource(uri.toString()); + final InputSource source = new InputSource(uri.toASCIIString()); return loadConfiguration(source, overridePropsResolver, ignoredModulesOptions, threadModeSettings); } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java index d2307429716..9fcfec4b806 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/header/AbstractHeaderCheck.java @@ -116,7 +116,7 @@ private void loadHeaderFile() throws CheckstyleException { } catch (final IOException ex) { throw new CheckstyleException( - "unable to load header file " + headerFile, ex); + "unable to load header file " + headerFile.toASCIIString(), ex); } } @@ -205,7 +205,7 @@ public Set getExternalResourceLocations() { result = Collections.emptySet(); } else { - result = Collections.singleton(headerFile.toString()); + result = Collections.singleton(headerFile.toASCIIString()); } return result; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java index b0cb94c4525..3f1f752da70 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlCheck.java @@ -559,7 +559,7 @@ else if (currentImportControl != null) { @Override public Set getExternalResourceLocations() { - return Collections.singleton(file.toString()); + return Collections.singleton(file.toASCIIString()); } /** @@ -608,7 +608,7 @@ public void setFile(URI uri) { file = uri; } catch (CheckstyleException ex) { - throw new IllegalArgumentException(UNABLE_TO_LOAD + uri, ex); + throw new IllegalArgumentException(UNABLE_TO_LOAD + uri.toASCIIString(), ex); } } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java index b1737868519..aaa95e34287 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/imports/ImportControlLoader.java @@ -271,11 +271,11 @@ private static PkgImportControl load(InputSource source, return loader.getRoot(); } catch (ParserConfigurationException | SAXException ex) { - throw new CheckstyleException("unable to parse " + uri + throw new CheckstyleException("unable to parse " + uri.toASCIIString() + " - " + ex.getMessage(), ex); } catch (IOException ex) { - throw new CheckstyleException("unable to read " + uri, ex); + throw new CheckstyleException("unable to read " + uri.toASCIIString(), ex); } } @@ -292,10 +292,10 @@ private static PkgImportControl loadUri(URI uri) throws CheckstyleException { return load(source, uri); } catch (MalformedURLException ex) { - throw new CheckstyleException("syntax error in url " + uri, ex); + throw new CheckstyleException("syntax error in url " + uri.toASCIIString(), ex); } catch (IOException ex) { - throw new CheckstyleException("unable to find " + uri, ex); + throw new CheckstyleException("unable to find " + uri.toASCIIString(), ex); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java index deff903ddc0..21f1e204f59 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoader.java @@ -220,7 +220,7 @@ public static FilterSet loadSuppressions(String filename) throws CheckstyleException { // figure out if this is a File or a URL final URI uri = CommonUtil.getUriByFilename(filename); - final InputSource source = new InputSource(uri.toString()); + final InputSource source = new InputSource(uri.toASCIIString()); return loadSuppressions(source, filename); } @@ -249,7 +249,7 @@ public static Set loadXpathSuppressions(String filename) throws CheckstyleException { // figure out if this is a File or a URL final URI uri = CommonUtil.getUriByFilename(filename); - final InputSource source = new InputSource(uri.toString()); + final InputSource source = new InputSource(uri.toASCIIString()); return loadXpathSuppressions(source, filename); } diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java index 9a10a0fa58b..df32a6d4f9c 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/header/HeaderCheckTest.java @@ -297,7 +297,7 @@ public void testExternalResource() throws Exception { .isEqualTo(1); assertWithMessage("Invalid resource location") .that(results.iterator().next()) - .isEqualTo(uri.toString()); + .isEqualTo(uri.toASCIIString()); } @Test