Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: SpringValueProcessor extract duplicate code #4137

Merged
merged 2 commits into from
Dec 9, 2021
Merged

refactor: SpringValueProcessor extract duplicate code #4137

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495842e
refactor: SpringValueProcessor extract duplicate code
mghio Dec 7, 2021
c6010bb
fix: typo & logging level
Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions ...ient/src/main/java/com/ctrip/framework/apollo/spring/annotation/SpringValueProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import com.google.common.collect.Multimap;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Set;
Expand All @@ -46,7 +47,7 @@
/**
* Spring value processor of field or method which has @Value and xml config placeholders.
*
* @author github.com/zhegexiaohuozi [email protected]
* @author github.com/zhegexiaohuozi [email protected] [email protected]
* @since 2017/12/20.
*/
public class SpringValueProcessor extends ApolloProcessor implements BeanFactoryPostProcessor, BeanFactoryAware {
Expand Down Expand Up @@ -94,17 +95,8 @@ protected void processField(Object bean, String beanName, Field field) {
if (value == null) {
return;
}
Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());

if (keys.isEmpty()) {
return;
}

for (String key : keys) {
SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, field, false);
springValueRegistry.register(beanFactory, key, springValue);
logger.debug("Monitoring {}", springValue);
}
doRegister(bean, beanName, field, value);
}

@Override
Expand All @@ -124,20 +116,33 @@ protected void processMethod(Object bean, String beanName, Method method) {
return;
}

Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
doRegister(bean, beanName, method, value);
}

private void doRegister(Object bean, String beanName, Member member, Value value) {
Set<String> keys = placeholderHelper.extractPlaceholderKeys(value.value());
if (keys.isEmpty()) {
return;
}

for (String key : keys) {
SpringValue springValue = new SpringValue(key, value.value(), bean, beanName, method, false);
SpringValue springValue;
if (member instanceof Field) {
Field field = (Field) member;
springValue = new SpringValue(key, value.value(), bean, beanName, field, false);
} else if (member instanceof Method) {
Method method = (Method) member;
springValue = new SpringValue(key, value.value(), bean, beanName, method, false);
} else {
logger.error("@Value annotation current is only support to be used on methods or property, "
+ "but used on {}", member.getClass());
mghio marked this conversation as resolved.
Show resolved Hide resolved
return;
}
springValueRegistry.register(beanFactory, key, springValue);
logger.info("Monitoring {}", springValue);
logger.debug("Monitoring {}", springValue);
mghio marked this conversation as resolved.
Show resolved Hide resolved
}
}


private void processBeanPropertyValues(Object bean, String beanName) {
Collection<SpringValueDefinition> propertySpringValues = beanName2SpringValueDefinitions
.get(beanName);
Expand Down