ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2022-06-19 11:58:47 +08:00
parent 253ec671c1
commit bd74cdb078
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java
View File

@ -1254,7 +1254,7 @@ public class FileUtil extends PathUtil {
} }
// 相对于ClassPath路径 // 相对于ClassPath路径
final URL url = ResourceUtil.getResource(normalPath, baseClass); final URL url = ResourceUtil.getResourceUrl(normalPath, baseClass);
if (null != url) { if (null != url) {
// 对于jar中文件包含file:前缀，需要去掉此类前缀，在此做标准化，since 3.0.8 解决中文或空格路径被编码的问题 // 对于jar中文件包含file:前缀，需要去掉此类前缀，在此做标准化，since 3.0.8 解决中文或空格路径被编码的问题
return FileUtil.normalize(URLUtil.getDecodedPath(url)); return FileUtil.normalize(URLUtil.getDecodedPath(url));

2
hutool-core/src/main/java/cn/hutool/core/io/ManifestUtil.java
View File

@ -31,7 +31,7 @@ public class ManifestUtil {
* @throws IORuntimeException IO异常 * @throws IORuntimeException IO异常
*/ */
public static Manifest getManifest(final Class<?> cls) throws IORuntimeException { public static Manifest getManifest(final Class<?> cls) throws IORuntimeException {
final URL url = ResourceUtil.getResource(null, cls); final URL url = ResourceUtil.getResourceUrl(null, cls);
final URLConnection connection; final URLConnection connection;
try { try {
connection = url.openConnection(); connection = url.openConnection();

30
hutool-core/src/main/java/cn/hutool/core/io/resource/ResourceUtil.java
View File

@ -33,7 +33,7 @@ public class ResourceUtil {
* @since 3.1.1 * @since 3.1.1
*/ */
public static String readUtf8Str(final String resource) { public static String readUtf8Str(final String resource) {
return getResourceObj(resource).readUtf8Str(); return getResource(resource).readUtf8Str();
} }
/** /**
@ -45,7 +45,7 @@ public class ResourceUtil {
* @since 3.1.1 * @since 3.1.1
*/ */
public static String readStr(final String resource, final Charset charset) { public static String readStr(final String resource, final Charset charset) {
return getResourceObj(resource).readStr(charset); return getResource(resource).readStr(charset);
} }
/** /**
@ -56,7 +56,7 @@ public class ResourceUtil {
* @since 4.5.19 * @since 4.5.19
*/ */
public static byte[] readBytes(final String resource) { public static byte[] readBytes(final String resource) {
return getResourceObj(resource).readBytes(); return getResource(resource).readBytes();
} }
/** /**
@ -68,7 +68,7 @@ public class ResourceUtil {
* @since 3.1.2 * @since 3.1.2
*/ */
public static InputStream getStream(final String resource) throws NoResourceException { public static InputStream getStream(final String resource) throws NoResourceException {
return getResourceObj(resource).getStream(); return getResource(resource).getStream();
} }
/** /**
@ -80,7 +80,7 @@ public class ResourceUtil {
*/ */
public static InputStream getStreamSafe(final String resource) { public static InputStream getStreamSafe(final String resource) {
try { try {
return getResourceObj(resource).getStream(); return getResource(resource).getStream();
} catch (final NoResourceException e) { } catch (final NoResourceException e) {
// ignore // ignore
} }
@ -107,7 +107,7 @@ public class ResourceUtil {
* @since 3.1.2 * @since 3.1.2
*/ */
public static BufferedReader getReader(final String resource, final Charset charset) { public static BufferedReader getReader(final String resource, final Charset charset) {
return getResourceObj(resource).getReader(charset); return getResource(resource).getReader(charset);
} }
/** /**
@ -122,8 +122,8 @@ public class ResourceUtil {
* @param resource 资源（相对Classpath的路径） * @param resource 资源（相对Classpath的路径）
* @return 资源URL * @return 资源URL
*/ */
public static URL getResource(final String resource) throws IORuntimeException { public static URL getResourceUrl(final String resource) throws IORuntimeException {
return getResource(resource, null); return getResourceUrl(resource, null);
} }
/** /**
@ -138,8 +138,8 @@ public class ResourceUtil {
* @param resource 资源路径 * @param resource 资源路径
* @return 资源列表 * @return 资源列表
*/ */
public static List<URL> getResources(final String resource) { public static List<URL> getResourceUrls(final String resource) {
return getResources(resource, null); return getResourceUrls(resource, null);
} }
/** /**
@ -155,8 +155,8 @@ public class ResourceUtil {
* @param filter 过滤器，用于过滤不需要的资源，{@code null}表示不过滤，保留所有元素 * @param filter 过滤器，用于过滤不需要的资源，{@code null}表示不过滤，保留所有元素
* @return 资源列表 * @return 资源列表
*/ */
public static List<URL> getResources(final String resource, final Predicate<URL> filter) { public static List<URL> getResourceUrls(final String resource, final Predicate<URL> filter) {
return IterUtil.filterToList(getResourceIter(resource), filter); return IterUtil.filterToList(getResourceUrlIter(resource), filter);
} }
/** /**
@ -172,7 +172,7 @@ public class ResourceUtil {
* @return 资源列表 * @return 资源列表
* @since 4.1.5 * @since 4.1.5
*/ */
public static EnumerationIter<URL> getResourceIter(final String resource) { public static EnumerationIter<URL> getResourceUrlIter(final String resource) {
final Enumeration<URL> resources; final Enumeration<URL> resources;
try { try {
resources = ClassLoaderUtil.getClassLoader().getResources(resource); resources = ClassLoaderUtil.getClassLoader().getResources(resource);
@ -189,7 +189,7 @@ public class ResourceUtil {
* @param baseClass 基准Class，获得的相对路径相对于此Class所在路径，如果为{@code null}则相对ClassPath * @param baseClass 基准Class，获得的相对路径相对于此Class所在路径，如果为{@code null}则相对ClassPath
* @return {@link URL} * @return {@link URL}
*/ */
public static URL getResource(String resource, final Class<?> baseClass) { public static URL getResourceUrl(String resource, final Class<?> baseClass) {
resource = StrUtil.nullToEmpty(resource); resource = StrUtil.nullToEmpty(resource);
return (null != baseClass) ? baseClass.getResource(resource) : ClassLoaderUtil.getClassLoader().getResource(resource); return (null != baseClass) ? baseClass.getResource(resource) : ClassLoaderUtil.getClassLoader().getResource(resource);
} }
@ -202,7 +202,7 @@ public class ResourceUtil {
* @return {@link Resource} 资源对象 * @return {@link Resource} 资源对象
* @since 3.2.1 * @since 3.2.1
*/ */
public static Resource getResourceObj(final String path) { public static Resource getResource(final String path) {
if (StrUtil.isNotBlank(path)) { if (StrUtil.isNotBlank(path)) {
if (path.startsWith(URLUtil.FILE_URL_PREFIX) || FileUtil.isAbsolutePath(path)) { if (path.startsWith(URLUtil.FILE_URL_PREFIX) || FileUtil.isAbsolutePath(path)) {
return new FileResource(path); return new FileResource(path);

2
hutool-core/src/main/java/cn/hutool/core/lang/ClassScanner.java
View File

@ -236,7 +236,7 @@ public class ClassScanner implements Serializable {
* @since 5.7.5 * @since 5.7.5
*/ */
public Set<Class<?>> scan(final boolean forceScanJavaClassPaths) { public Set<Class<?>> scan(final boolean forceScanJavaClassPaths) {
for (final URL url : ResourceUtil.getResourceIter(this.packagePath)) { for (final URL url : ResourceUtil.getResourceUrlIter(this.packagePath)) {
switch (url.getProtocol()) { switch (url.getProtocol()) {
case "file": case "file":
scanFile(new File(URLDecoder.decode(url.getFile(), this.charset)), null); scanFile(new File(URLDecoder.decode(url.getFile(), this.charset)), null);

8
hutool-core/src/main/java/cn/hutool/core/net/URLUtil.java
View File

@ -207,10 +207,10 @@ public class URLUtil {
* *
* @param pathBaseClassLoader 相对路径（相对于classes） * @param pathBaseClassLoader 相对路径（相对于classes）
* @return URL * @return URL
* @see ResourceUtil#getResource(String) * @see ResourceUtil#getResourceUrl(String)
*/ */
public static URL getURL(final String pathBaseClassLoader) { public static URL getURL(final String pathBaseClassLoader) {
return ResourceUtil.getResource(pathBaseClassLoader); return ResourceUtil.getResourceUrl(pathBaseClassLoader);
} }
/** /**
@ -219,10 +219,10 @@ public class URLUtil {
* @param path 相对给定 class所在的路径 * @param path 相对给定 class所在的路径
* @param clazz 指定class * @param clazz 指定class
* @return URL * @return URL
* @see ResourceUtil#getResource(String, Class) * @see ResourceUtil#getResourceUrl(String, Class)
*/ */
public static URL getURL(final String path, final Class<?> clazz) { public static URL getURL(final String path, final Class<?> clazz) {
return ResourceUtil.getResource(path, clazz); return ResourceUtil.getResourceUrl(path, clazz);
} }
/** /**

2
hutool-core/src/main/java/cn/hutool/core/reflect/ClassUtil.java
View File

@ -315,7 +315,7 @@ public class ClassUtil {
* @since 3.2.1 * @since 3.2.1
*/ */
public static String getClassPath(final boolean isEncoded) { public static String getClassPath(final boolean isEncoded) {
final URL classPathURL = ResourceUtil.getResource(StrUtil.EMPTY); final URL classPathURL = ResourceUtil.getResourceUrl(StrUtil.EMPTY);
final String url = isEncoded ? classPathURL.getPath() : URLUtil.getDecodedPath(classPathURL); final String url = isEncoded ? classPathURL.getPath() : URLUtil.getDecodedPath(classPathURL);
return FileUtil.normalize(url); return FileUtil.normalize(url);
} }

2
hutool-log/src/main/java/cn/hutool/log/LogFactory.java
View File

@ -176,7 +176,7 @@ public abstract class LogFactory {
} }
// 未找到任何可支持的日志库时判断依据：当JDK Logging的配置文件位于classpath中，使用JDK Logging，否则使用Console // 未找到任何可支持的日志库时判断依据：当JDK Logging的配置文件位于classpath中，使用JDK Logging，否则使用Console
final URL url = ResourceUtil.getResource("logging.properties"); final URL url = ResourceUtil.getResourceUrl("logging.properties");
return (null != url) ? new JdkLogFactory() : new ConsoleLogFactory(); return (null != url) ? new JdkLogFactory() : new ConsoleLogFactory();
} }
// ------------------------------------------------------------------------- Static end // ------------------------------------------------------------------------- Static end

2
hutool-setting/src/main/java/cn/hutool/setting/Setting.java
View File

@ -125,7 +125,7 @@ public class Setting extends AbsSetting implements Map<String, String> {
*/ */
public Setting(final String path, final Charset charset, final boolean isUseVariable) { public Setting(final String path, final Charset charset, final boolean isUseVariable) {
Assert.notBlank(path, "Blank setting path !"); Assert.notBlank(path, "Blank setting path !");
this.init(ResourceUtil.getResourceObj(path), charset, isUseVariable); this.init(ResourceUtil.getResource(path), charset, isUseVariable);
} }
/** /**

2
hutool-setting/src/main/java/cn/hutool/setting/dialect/Props.java
View File

@ -142,7 +142,7 @@ public final class Props extends Properties implements BasicTypeGetter<String>,
if (null != charset) { if (null != charset) {
this.charset = charset; this.charset = charset;
} }
this.load(ResourceUtil.getResourceObj(path)); this.load(ResourceUtil.getResource(path));
} }
/** /**