|
1 | 1 | /* |
2 | | - * Copyright 2002-2023 the original author or authors. |
| 2 | + * Copyright 2002-2024 the original author or authors. |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
|
51 | 51 | */ |
52 | 52 | class PathMatchingResourcePatternResolverTests { |
53 | 53 |
|
54 | | -private static final String[] CLASSES_IN_CORE_IO_SUPPORT = { "EncodedResource.class", |
| 54 | +private static final String[] CLASSES_IN_CORE_IO_SUPPORT = {"EncodedResource.class", |
55 | 55 | "LocalizedResourceHelper.class", "PathMatchingResourcePatternResolver.class", "PropertiesLoaderSupport.class", |
56 | 56 | "PropertiesLoaderUtils.class", "ResourceArrayPropertyEditor.class", "ResourcePatternResolver.class", |
57 | | -"ResourcePatternUtils.class", "SpringFactoriesLoader.class" }; |
| 57 | +"ResourcePatternUtils.class", "SpringFactoriesLoader.class"}; |
58 | 58 |
|
59 | | -private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT = { "PathMatchingResourcePatternResolverTests.class" }; |
| 59 | +private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT = {"PathMatchingResourcePatternResolverTests.class"}; |
60 | 60 |
|
61 | | -private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATION = { "NonNull.class", "NonNullApi.class", "Nullable.class" }; |
| 61 | +private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATION = {"NonNull.class", "NonNullApi.class", "Nullable.class"}; |
62 | 62 |
|
63 | 63 |
|
64 | 64 | private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); |
@@ -200,7 +200,7 @@ private List<String> getSubPathsIgnoringClassFilesEtc(String pattern, String pat |
200 | 200 | } |
201 | 201 |
|
202 | 202 | @Test |
203 | | -void usingFileProtocolWithoutWildcardInPatternAndEndingInSlashStarStar() { |
| 203 | +void usingFileProtocolWithoutWildcardInPatternAndEndingInSlashStarStar() { |
204 | 204 | Path testResourcesDir = Paths.get("src/test/resources").toAbsolutePath(); |
205 | 205 | String pattern = String.format("file:%s/scanned-resources/**", testResourcesDir); |
206 | 206 | String pathPrefix = ".+?resources/"; |
@@ -329,8 +329,8 @@ private void assertExactSubPaths(String pattern, String pathPrefix, String... su |
329 | 329 | } |
330 | 330 |
|
331 | 331 | private String getPath(Resource resource) { |
332 | | -// Tests fail if we use resouce.getURL().getPath(). They would also fail on Mac OS when |
333 | | -// using resouce.getURI().getPath() if the resource paths are not Unicode normalized. |
| 332 | +// Tests fail if we use resource.getURL().getPath(). They would also fail on macOS when |
| 333 | +// using resource.getURI().getPath() if the resource paths are not Unicode normalized. |
334 | 334 | // |
335 | 335 | // On the JVM, all tests should pass when using resouce.getFile().getPath(); however, |
336 | 336 | // we use FileSystemResource#getPath since this test class is sometimes run within a |
|
0 commit comments