diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 0993429b9..8b01ad935 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -42,7 +42,7 @@ module org.redkale { exports org.redkale.util; exports org.redkale.watch; - uses org.redkale.util.YmlProvider; + uses org.redkale.util.YamlProvider; uses org.redkale.props.spi.PropertiesAgentProvider; uses org.redkale.cached.spi.CachedManagerProvider; uses org.redkale.cluster.spi.ClusterAgentProvider; diff --git a/src/main/java/org/redkale/util/AnyValue.java b/src/main/java/org/redkale/util/AnyValue.java index 40c15107b..c017ee162 100644 --- a/src/main/java/org/redkale/util/AnyValue.java +++ b/src/main/java/org/redkale/util/AnyValue.java @@ -229,7 +229,7 @@ public abstract class AnyValue { * @return AnyValue */ public static AnyValue loadFromYml(String text) { - return new YmlReader(text).read(); + return new YamlReader(text).read(); } /** @@ -1179,12 +1179,12 @@ public abstract class AnyValue { String key = prefix; int index = keyPrefixs.get(key); if (index == -1) { - key = parent + k + "[" + (++index) + "]"; + key = prefix + "[" + (++index) + "]"; props.put(key, props.remove(prefix)); } - key = parent + k + "[" + (++index) + "]"; + key = prefix + "[" + (++index) + "]"; while (props.containsKey(key)) { - key = parent + k + "[" + (++index) + "]"; + key = prefix + "[" + (++index) + "]"; } props.put(key, v); keyPrefixs.put(prefix, index); diff --git a/src/main/java/org/redkale/util/YmlProvider.java b/src/main/java/org/redkale/util/YamlProvider.java similarity index 90% rename from src/main/java/org/redkale/util/YmlProvider.java rename to src/main/java/org/redkale/util/YamlProvider.java index d600ae3c0..ea8442400 100644 --- a/src/main/java/org/redkale/util/YmlProvider.java +++ b/src/main/java/org/redkale/util/YamlProvider.java @@ -12,7 +12,7 @@ package org.redkale.util; * @since 2.8.0 * @author zhangjx */ -public interface YmlProvider { +public interface YamlProvider { /** * 将yml内容转换成AnyValue diff --git a/src/main/java/org/redkale/util/YmlReader.java b/src/main/java/org/redkale/util/YamlReader.java similarity index 67% rename from src/main/java/org/redkale/util/YmlReader.java rename to src/main/java/org/redkale/util/YamlReader.java index 7fd6de23b..654236a7a 100644 --- a/src/main/java/org/redkale/util/YmlReader.java +++ b/src/main/java/org/redkale/util/YamlReader.java @@ -20,13 +20,13 @@ import org.redkale.annotation.Nonnull; * @since 2.8.0 * @author zhangjx */ -public class YmlReader { +public class YamlReader { - private static YmlProvider currentProvider; + private static YamlProvider currentProvider; private final String text; - public YmlReader(String text) { + public YamlReader(String text) { this.text = Objects.requireNonNull(text); } @@ -37,22 +37,22 @@ public class YmlReader { /** * 加载解析器的实现对象 * - * @return YmlProvider + * @return YamlProvider */ - private static @Nonnull YmlProvider loadProvider() { + protected static @Nonnull YamlProvider loadProvider() { if (currentProvider == null) { - Iterator it = ServiceLoader.load(YmlProvider.class).iterator(); - RedkaleClassLoader.putServiceLoader(YmlProvider.class); - List providers = new ArrayList<>(); + Iterator it = ServiceLoader.load(YamlProvider.class).iterator(); + RedkaleClassLoader.putServiceLoader(YamlProvider.class); + List providers = new ArrayList<>(); while (it.hasNext()) { - YmlProvider provider = it.next(); + YamlProvider provider = it.next(); if (provider != null) { RedkaleClassLoader.putReflectionPublicConstructors( provider.getClass(), provider.getClass().getName()); providers.add(provider); } } - for (YmlProvider provider : Utility.sortPriority(providers)) { + for (YamlProvider provider : Utility.sortPriority(providers)) { currentProvider = provider; return provider; } @@ -61,7 +61,7 @@ public class YmlReader { return currentProvider; } - protected static class DefaultYmlProvider implements YmlProvider { + protected static class DefaultYmlProvider implements YamlProvider { @Override public AnyValue read(String content) {