diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoader.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoader.java index d61337144..dcc5e5713 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoader.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoader.java @@ -22,6 +22,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.boot.env.OriginTrackedMapPropertySource; @@ -62,6 +63,8 @@ public class NacosJsonPropertySourceLoader extends AbstractPropertySourceLoader throws IOException { Map result = new LinkedHashMap<>(32); ObjectMapper mapper = new ObjectMapper(); + // [fix issue #3043] support comment in json config + mapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true); Map nacosDataMap = mapper.readValue(resource.getInputStream(), LinkedHashMap.class); flattenedMap(result, nacosDataMap, null); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java new file mode 100644 index 000000000..237b3126e --- /dev/null +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/test/java/com/alibaba/cloud/nacos/parser/NacosJsonPropertySourceLoaderTests.java @@ -0,0 +1,47 @@ +/* + * Copyright 2013-2022 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.alibaba.cloud.nacos.parser; + +import java.io.IOException; +import java.util.List; + +import org.junit.jupiter.api.Test; + +import org.springframework.core.env.PropertySource; +import org.springframework.core.io.ByteArrayResource; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * NacosJsonPropertySourceLoaderTests Tester. + * + * @author ruansheng + */ +public class NacosJsonPropertySourceLoaderTests { + + @Test + public void testJsonPropWithComment() throws IOException { + String propJsonStr = "{\n" + + " // test comment\n" + + " \"name\": \"jack\"\n" + + "}"; + ByteArrayResource resource = new ByteArrayResource(propJsonStr.getBytes()); + List> result = new NacosJsonPropertySourceLoader().doLoad("test.json", resource); + assertThat(result).hasSize(1); + assertThat(result.get(0).getProperty("name")).isEqualTo("jack"); + } +}