Issue checkstyle#13012: Use toASCIIString for all URIs

reftel · Apr 21, 2023 · 1cb2098 · 1cb2098
1 parent fc2bdfe
commit 1cb2098
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git 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
@@ -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<String> 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
@@ -559,7 +559,7 @@ else if (currentImportControl != null) {
 
     @Override
     public Set<String> 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
@@ -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
@@ -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<TreeWalkerFilter> 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
@@ -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