DerekYRC
3 years ago
committed by
GitHub
commit
d4d8b24c19
@ -1,34 +0,0 @@
|
|||||||
name: Codecov
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- hoxton
|
|
||||||
- 2021.0
|
|
||||||
- 2020.0
|
|
||||||
- greenwich
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- hoxton
|
|
||||||
- 2021.0
|
|
||||||
- 2020.0
|
|
||||||
- greenwich
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout codes
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
- name: Set up JDK 8
|
|
||||||
uses: actions/setup-java@v3
|
|
||||||
with:
|
|
||||||
distribution: 'temurin'
|
|
||||||
java-version: 8
|
|
||||||
- name: Test with Maven
|
|
||||||
run: mvn -B test --file pom.xml
|
|
||||||
- name: Upload coverage to Codecov
|
|
||||||
uses: codecov/codecov-action@v3
|
|
||||||
with:
|
|
||||||
file: ${{ github.workspace }}/target/site/jacoco/jacoco.xml
|
|
||||||
@ -1,17 +1,4 @@
|
|||||||
# Change Log
|
# Change Log
|
||||||
---
|
---
|
||||||
|
|
||||||
- [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/596)
|
- [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/668)
|
||||||
- [Optimize: optimize configuration conditional & optimize config data tips"](https://github.com/Tencent/spring-cloud-tencent/pull/604)
|
|
||||||
- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/608)
|
|
||||||
- [Optimize: InstanceId of PolarisRegistration and PolarisServiceRegistry](https://github.com/Tencent/spring-cloud-tencent/pull/611)
|
|
||||||
- [Bugfix: fix feign report call result error when using feign direct call](https://github.com/Tencent/spring-cloud-tencent/pull/622)
|
|
||||||
- [remove useless code for router](https://github.com/Tencent/spring-cloud-tencent/pull/625)
|
|
||||||
- [Feature: support spring-retry router](https://github.com/Tencent/spring-cloud-tencent/pull/633)
|
|
||||||
- [Bugfix: fix throw npe when router context is null](https://github.com/Tencent/spring-cloud-tencent/pull/634)
|
|
||||||
- [feat:Transfer http headers specified by environment variables](https://github.com/Tencent/spring-cloud-tencent/pull/637)
|
|
||||||
- [feat:support new label expression](https://github.com/Tencent/spring-cloud-tencent/pull/641)
|
|
||||||
- [feat:support read config file from local file system.](https://github.com/Tencent/spring-cloud-tencent/pull/643)
|
|
||||||
- [feat:report the labels when using RestTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/644)
|
|
||||||
- [Optimize: optimize transfer metadata code](https://github.com/Tencent/spring-cloud-tencent/pull/650)
|
|
||||||
- [feat: publish spring event named ConfigChangeSpringEvent when the configuration is changed](https://github.com/Tencent/spring-cloud-tencent/pull/652)
|
|
||||||
|
|||||||
@ -0,0 +1,17 @@
|
|||||||
|
# Change Log
|
||||||
|
---
|
||||||
|
|
||||||
|
- [Optimize: remove discovery module useless code](https://github.com/Tencent/spring-cloud-tencent/pull/596)
|
||||||
|
- [Optimize: optimize configuration conditional & optimize config data tips"](https://github.com/Tencent/spring-cloud-tencent/pull/604)
|
||||||
|
- [Optimize: Maybe remove Chinese characters](https://github.com/Tencent/spring-cloud-tencent/pull/608)
|
||||||
|
- [Optimize: InstanceId of PolarisRegistration and PolarisServiceRegistry](https://github.com/Tencent/spring-cloud-tencent/pull/611)
|
||||||
|
- [Bugfix: fix feign report call result error when using feign direct call](https://github.com/Tencent/spring-cloud-tencent/pull/622)
|
||||||
|
- [remove useless code for router](https://github.com/Tencent/spring-cloud-tencent/pull/625)
|
||||||
|
- [Feature: support spring-retry router](https://github.com/Tencent/spring-cloud-tencent/pull/633)
|
||||||
|
- [Bugfix: fix throw npe when router context is null](https://github.com/Tencent/spring-cloud-tencent/pull/634)
|
||||||
|
- [feat:Transfer http headers specified by environment variables](https://github.com/Tencent/spring-cloud-tencent/pull/637)
|
||||||
|
- [feat:support new label expression](https://github.com/Tencent/spring-cloud-tencent/pull/641)
|
||||||
|
- [feat:support read config file from local file system.](https://github.com/Tencent/spring-cloud-tencent/pull/643)
|
||||||
|
- [feat:report the labels when using RestTemplate.](https://github.com/Tencent/spring-cloud-tencent/pull/644)
|
||||||
|
- [Optimize: optimize transfer metadata code](https://github.com/Tencent/spring-cloud-tencent/pull/650)
|
||||||
|
- [feat: publish spring event named ConfigChangeSpringEvent when the configuration is changed](https://github.com/Tencent/spring-cloud-tencent/pull/652)
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
# Change Log
|
||||||
|
---
|
||||||
|
|
||||||
|
- [fix:fix transfer http headers not working bug.](https://github.com/Tencent/spring-cloud-tencent/pull/665)
|
||||||
@ -1,126 +0,0 @@
|
|||||||
/*
|
|
||||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
|
||||||
*
|
|
||||||
* Licensed under the BSD 3-Clause License (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://opensource.org/licenses/BSD-3-Clause
|
|
||||||
*
|
|
||||||
* 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.tencent.cloud.polaris.config.spring.property;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import com.google.common.collect.LinkedListMultimap;
|
|
||||||
import com.google.common.collect.Maps;
|
|
||||||
import com.google.common.collect.Multimap;
|
|
||||||
import com.google.common.collect.Sets;
|
|
||||||
import com.tencent.cloud.polaris.config.config.PolarisConfigProperties;
|
|
||||||
|
|
||||||
import org.springframework.beans.BeansException;
|
|
||||||
import org.springframework.beans.MutablePropertyValues;
|
|
||||||
import org.springframework.beans.PropertyValue;
|
|
||||||
import org.springframework.beans.factory.config.BeanDefinition;
|
|
||||||
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
|
|
||||||
import org.springframework.beans.factory.config.TypedStringValue;
|
|
||||||
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
|
||||||
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
|
|
||||||
import org.springframework.lang.NonNull;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To process xml config placeholders, e.g.
|
|
||||||
*
|
|
||||||
* <pre>
|
|
||||||
* <bean class="com.demo.bean.XmlBean">
|
|
||||||
* <property name="timeout" value="${timeout:200}"/>
|
|
||||||
* <property name="batch" value="${batch:100}"/>
|
|
||||||
* </bean>
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* This source file was originally from:
|
|
||||||
* <code><a href=https://github.com/apolloconfig/apollo/blob/master/apollo-client/src/main/java/com/ctrip/framework/apollo/spring/property/SpringValueDefinitionProcessor.java>
|
|
||||||
* SpringValueDefinitionProcessor</a></code>
|
|
||||||
*
|
|
||||||
* @author weihubeats 2022-7-10
|
|
||||||
*/
|
|
||||||
public class SpringValueDefinitionProcessor implements BeanDefinitionRegistryPostProcessor {
|
|
||||||
private static final Map<BeanDefinitionRegistry, Multimap<String, SpringValueDefinition>> beanName2SpringValueDefinitions =
|
|
||||||
Maps.newConcurrentMap();
|
|
||||||
private static final Set<BeanDefinitionRegistry> PROPERTY_VALUES_PROCESSED_BEAN_FACTORIES = Sets.newConcurrentHashSet();
|
|
||||||
|
|
||||||
private final PlaceholderHelper placeholderHelper;
|
|
||||||
|
|
||||||
private final PolarisConfigProperties polarisConfigProperties;
|
|
||||||
|
|
||||||
public SpringValueDefinitionProcessor(PlaceholderHelper placeholderHelper, PolarisConfigProperties polarisConfigProperties) {
|
|
||||||
this.polarisConfigProperties = polarisConfigProperties;
|
|
||||||
this.placeholderHelper = placeholderHelper;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Multimap<String, SpringValueDefinition> getBeanName2SpringValueDefinitions(BeanDefinitionRegistry registry) {
|
|
||||||
Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(registry);
|
|
||||||
if (springValueDefinitions == null) {
|
|
||||||
springValueDefinitions = LinkedListMultimap.create();
|
|
||||||
}
|
|
||||||
|
|
||||||
return springValueDefinitions;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void postProcessBeanDefinitionRegistry(@NonNull BeanDefinitionRegistry registry) throws BeansException {
|
|
||||||
if (polarisConfigProperties.isAutoRefresh()) {
|
|
||||||
processPropertyValues(registry);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void postProcessBeanFactory(@NonNull ConfigurableListableBeanFactory beanFactory) throws BeansException {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void processPropertyValues(BeanDefinitionRegistry beanRegistry) {
|
|
||||||
if (!PROPERTY_VALUES_PROCESSED_BEAN_FACTORIES.add(beanRegistry)) {
|
|
||||||
// already initialized
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!beanName2SpringValueDefinitions.containsKey(beanRegistry)) {
|
|
||||||
beanName2SpringValueDefinitions.put(beanRegistry, LinkedListMultimap.create());
|
|
||||||
}
|
|
||||||
|
|
||||||
Multimap<String, SpringValueDefinition> springValueDefinitions = beanName2SpringValueDefinitions.get(beanRegistry);
|
|
||||||
|
|
||||||
String[] beanNames = beanRegistry.getBeanDefinitionNames();
|
|
||||||
for (String beanName : beanNames) {
|
|
||||||
BeanDefinition beanDefinition = beanRegistry.getBeanDefinition(beanName);
|
|
||||||
MutablePropertyValues mutablePropertyValues = beanDefinition.getPropertyValues();
|
|
||||||
List<PropertyValue> propertyValues = mutablePropertyValues.getPropertyValueList();
|
|
||||||
for (PropertyValue propertyValue : propertyValues) {
|
|
||||||
Object value = propertyValue.getValue();
|
|
||||||
if (!(value instanceof TypedStringValue)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
String placeholder = ((TypedStringValue) value).getValue();
|
|
||||||
Set<String> keys = placeholderHelper.extractPlaceholderKeys(placeholder);
|
|
||||||
|
|
||||||
if (keys.isEmpty()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (String key : keys) {
|
|
||||||
springValueDefinitions.put(beanName, new SpringValueDefinition(key, placeholder, propertyValue.getName()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,75 +0,0 @@
|
|||||||
/*
|
|
||||||
* Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
|
|
||||||
*
|
|
||||||
* Licensed under the BSD 3-Clause License (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* https://opensource.org/licenses/BSD-3-Clause
|
|
||||||
*
|
|
||||||
* 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.tencent.cloud.polaris.config.spring.property;
|
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
import com.tencent.polaris.api.utils.CollectionUtils;
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.Test;
|
|
||||||
|
|
||||||
import org.springframework.beans.factory.BeanFactory;
|
|
||||||
import org.springframework.context.support.ClassPathXmlApplicationContext;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Test for {@link SpringValueDefinitionProcessor}.
|
|
||||||
*
|
|
||||||
* @author lingxiao.wlx
|
|
||||||
*/
|
|
||||||
public class SpringValueDefinitionProcessorTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void springValueDefinitionProcessorTest() {
|
|
||||||
ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("bean.xml");
|
|
||||||
Person person = context.getBean(Person.class);
|
|
||||||
|
|
||||||
SpringValueRegistry springValueRegistry = context.getBean(SpringValueRegistry.class);
|
|
||||||
|
|
||||||
BeanFactory beanFactory = person.getBeanFactory();
|
|
||||||
Collection<SpringValue> name = springValueRegistry.get(beanFactory, "name");
|
|
||||||
Assert.assertFalse(CollectionUtils.isEmpty(name));
|
|
||||||
Optional<SpringValue> nameSpringValueOptional = name.stream().findAny();
|
|
||||||
Assert.assertTrue(nameSpringValueOptional.isPresent());
|
|
||||||
|
|
||||||
SpringValue nameSpringValue = nameSpringValueOptional.get();
|
|
||||||
Method method = nameSpringValue.getMethodParameter().getMethod();
|
|
||||||
Assert.assertTrue(Objects.nonNull(method));
|
|
||||||
Assert.assertEquals("setName", method.getName());
|
|
||||||
Assert.assertEquals("${name:test}", nameSpringValue.getPlaceholder());
|
|
||||||
Assert.assertFalse(nameSpringValue.isField());
|
|
||||||
Assert.assertEquals(String.class, nameSpringValue.getTargetType());
|
|
||||||
|
|
||||||
|
|
||||||
Collection<SpringValue> age = springValueRegistry.get(beanFactory, "age");
|
|
||||||
Assert.assertFalse(CollectionUtils.isEmpty(age));
|
|
||||||
Optional<SpringValue> ageSpringValueOptional = age.stream().findAny();
|
|
||||||
Assert.assertTrue(ageSpringValueOptional.isPresent());
|
|
||||||
|
|
||||||
SpringValue ageSpringValue = ageSpringValueOptional.get();
|
|
||||||
Method method1 = ageSpringValue.getMethodParameter().getMethod();
|
|
||||||
Assert.assertTrue(Objects.nonNull(method1));
|
|
||||||
Assert.assertEquals("setAge", method1.getName());
|
|
||||||
Assert.assertEquals("${age:10}", ageSpringValue.getPlaceholder());
|
|
||||||
Assert.assertFalse(ageSpringValue.isField());
|
|
||||||
Assert.assertEquals(String.class, ageSpringValue.getTargetType());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in new issue