forked from apache/dubbo
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fa967c6
commit cb7da3e
Showing
6 changed files
with
210 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
.../java/com/alibaba/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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 | ||
| * | ||
| * http://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.dubbo.config.spring.beans.factory.config; | ||
|
|
||
| import org.springframework.beans.factory.config.YamlProcessor; | ||
| import org.springframework.core.env.MapPropertySource; | ||
| import org.springframework.core.env.PropertySource; | ||
| import org.springframework.core.io.support.EncodedResource; | ||
| import org.springframework.core.io.support.PropertySourceFactory; | ||
| import org.yaml.snakeyaml.DumperOptions; | ||
| import org.yaml.snakeyaml.Yaml; | ||
| import org.yaml.snakeyaml.nodes.Tag; | ||
| import org.yaml.snakeyaml.representer.Representer; | ||
| import org.yaml.snakeyaml.resolver.Resolver; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.Map; | ||
| import java.util.Properties; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * YAML {@link PropertySourceFactory} implementation, some source code is copied Spring Boot | ||
| * org.springframework.boot.env.YamlPropertySourceLoader , see {@link #createYaml()} and {@link #process()} | ||
| * | ||
| * @since 2.6.5 | ||
| */ | ||
| public class YamlPropertySourceFactory extends YamlProcessor implements PropertySourceFactory { | ||
|
|
||
| @Override | ||
| public PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException { | ||
| setResources(resource.getResource()); | ||
| return new MapPropertySource(name, process()); | ||
| } | ||
|
|
||
| @Override | ||
| protected Yaml createYaml() { | ||
| return new Yaml(new StrictMapAppenderConstructor(), new Representer(), | ||
| new DumperOptions(), new Resolver() { | ||
| @Override | ||
| public void addImplicitResolver(Tag tag, Pattern regexp, | ||
| String first) { | ||
| if (tag == Tag.TIMESTAMP) { | ||
| return; | ||
| } | ||
| super.addImplicitResolver(tag, regexp, first); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| public Map<String, Object> process() { | ||
| final Map<String, Object> result = new LinkedHashMap<String, Object>(); | ||
| process(new MatchCallback() { | ||
| @Override | ||
| public void process(Properties properties, Map<String, Object> map) { | ||
| result.putAll(getFlattenedMap(map)); | ||
| } | ||
| }); | ||
| return result; | ||
| } | ||
|
|
||
| } |
71 changes: 71 additions & 0 deletions
71
...a/com/alibaba/dubbo/config/spring/beans/factory/config/YamlPropertySourceFactoryTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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 | ||
| * | ||
| * http://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.dubbo.config.spring.beans.factory.config; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.context.annotation.PropertySource; | ||
| import org.springframework.core.env.Environment; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
|
|
||
| /** | ||
| * {@link YamlPropertySourceFactory} Test | ||
| * | ||
| * @since 2.6.5 | ||
| */ | ||
| @RunWith(SpringRunner.class) | ||
| @PropertySource(name = "yaml-source", value = {"classpath:/META-INF/dubbo.yml"}, factory = YamlPropertySourceFactory.class) | ||
| @Configuration | ||
| @ContextConfiguration(classes = YamlPropertySourceFactoryTest.class) | ||
| public class YamlPropertySourceFactoryTest { | ||
|
|
||
| @Autowired | ||
| private Environment environment; | ||
|
|
||
| @Value("${dubbo.consumer.default}") | ||
| private Boolean isDefault; | ||
|
|
||
| @Value("${dubbo.consumer.client}") | ||
| private String client; | ||
|
|
||
| @Value("${dubbo.consumer.threadpool}") | ||
| private String threadPool; | ||
|
|
||
| @Value("${dubbo.consumer.corethreads}") | ||
| private Integer coreThreads; | ||
|
|
||
| @Value("${dubbo.consumer.threads}") | ||
| private Integer threads; | ||
|
|
||
| @Value("${dubbo.consumer.queues}") | ||
| private Integer queues; | ||
|
|
||
| @Test | ||
| public void testProperty() { | ||
| Assert.assertEquals(isDefault, environment.getProperty("dubbo.consumer.default", Boolean.class)); | ||
| Assert.assertEquals(client, environment.getProperty("dubbo.consumer.client", String.class)); | ||
| Assert.assertEquals(threadPool, environment.getProperty("dubbo.consumer.threadpool", String.class)); | ||
| Assert.assertEquals(coreThreads, environment.getProperty("dubbo.consumer.corethreads", Integer.class)); | ||
| Assert.assertEquals(threads, environment.getProperty("dubbo.consumer.threads", Integer.class)); | ||
| Assert.assertEquals(queues, environment.getProperty("dubbo.consumer.queues", Integer.class)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| dubbo: | ||
| consumer: | ||
| default: false | ||
| client: netty | ||
| threadpool: cached | ||
| corethreads: 1 | ||
| threads: 10 | ||
| queues: 99 |