Fix yml constructor

apache · Jul 26, 2024 · f62f397 · f62f397
1 parent 6dd81e6
commit f62f397
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...moting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/codec/YamlCodec.java b/...moting-http12/src/main/java/org/apache/dubbo/remoting/http12/message/codec/YamlCodec.java
@@ -71,7 +71,7 @@ public Object decode(InputStream is, Type targetType, Charset charset) throws De
     @Override
     public Object[] decode(InputStream is, Class<?>[] targetTypes, Charset charset) throws DecodeException {
         try (InputStreamReader reader = new InputStreamReader(is, charset)) {
-            Yaml yaml = new Yaml();
+            Yaml yaml = createYaml();
             Iterator<Object> iterator = yaml.loadAll(reader).iterator();
             int len = targetTypes.length;
             Object[] results = new Object[len];

diff --git a/...in/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java b/...in/java/org/apache/dubbo/rpc/protocol/tri/rest/mapping/DefaultRequestMappingRegistry.java
@@ -19,7 +19,8 @@
 import org.apache.dubbo.common.URL;
 import org.apache.dubbo.common.config.Configuration;
 import org.apache.dubbo.common.config.ConfigurationUtils;
-import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.constants.LoggerCodeConstants;
+import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.utils.CollectionUtils;
 import org.apache.dubbo.config.nested.RestConfig;
@@ -57,7 +58,8 @@
 
 public final class DefaultRequestMappingRegistry implements RequestMappingRegistry {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultRequestMappingRegistry.class);
+    private static final ErrorTypeAwareLogger LOGGER =
+            LoggerFactory.getErrorTypeAwareLogger(DefaultRequestMappingRegistry.class);
 
     private final FrameworkModel frameworkModel;
     private final ContentNegotiator contentNegotiator;
@@ -154,9 +156,10 @@ private void register0(RequestMapping mapping, HandlerMeta handler) {
             for (PathExpression path : mapping.getPathCondition().getExpressions()) {
                 Registration exists = tree.addPath(path, registration);
                 if (exists == null) {
-                    LOGGER.debug("Register rest mapping path: '" + path + "' -> " + mapping);
-                } else {
-                    LOGGER.warn(Messages.DUPLICATE_MAPPING.format(path, mapping, exists.mapping));
+                    LOGGER.debug("Register rest mapping path: '{}' -> {}", path, mapping);
+                } else if (LOGGER.isWarnEnabled()) {
+                    String msg = Messages.DUPLICATE_MAPPING.format(path, mapping, exists.mapping);
+                    LOGGER.warn(LoggerCodeConstants.INTERNAL_ERROR, "", "", msg);
                 }
             }
         } finally {