Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix new Sonar Smells

Browse Source 
* Fix synchronization smell in the `MessagePublishingInterceptor`
* Cache `Pointcut` in the `PublisherAnnotationAdvisor`;
fix `@SuppressWarnings` also
* Fix complexity in the `IntegrationMBeanExporter`
This commit is contained in:
Artem Bilan
2019-03-15 13:32:18 -04:00
committed by Gary Russell
parent 9cf52b7281
commit 921c797646
3 changed files with 62 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
View File

@@ -104,7 +104,7 @@ public class MessagePublishingInterceptor implements MethodInterceptor, BeanFact
this.beanFactory = beanFactory;
this.messagingTemplate.setBeanFactory(beanFactory);
if (this.channelResolver == null) {
this.channelResolver = IntegrationContextUtils.getChannelResolver(beanFactory);
this.channelResolver = IntegrationContextUtils.getChannelResolver(this.beanFactory);
}
}
@@ -123,7 +123,7 @@ public class MessagePublishingInterceptor implements MethodInterceptor, BeanFact
final StandardEvaluationContext context = ExpressionUtils.createStandardEvaluationContext(this.beanFactory);
Class<?> targetClass = AopUtils.getTargetClass(invocation.getThis());
final Method method = AopUtils.getMostSpecificMethod(invocation.getMethod(), targetClass);
String[] argumentNames = this.resolveArgumentNames(method);
String[] argumentNames = resolveArgumentNames(method);
context.setVariable(PublisherMetadataSource.METHOD_NAME_VARIABLE_NAME, method.getName());
if (invocation.getArguments().length > 0 && argumentNames != null) {
Map<Object, Object> argumentMap = new HashMap<>();
@@ -180,16 +180,12 @@ public class MessagePublishingInterceptor implements MethodInterceptor, BeanFact
this.messagingTemplate.send(channel, message);
}
else {
if (this.defaultChannelName != null) {
synchronized (this) {
if (this.defaultChannelName != null && this.messagingTemplate.getDefaultDestination() == null) {
Assert.state(this.channelResolver != null,
"ChannelResolver is required to resolve channel names.");
this.messagingTemplate.setDefaultChannel(
this.channelResolver.resolveDestination(this.defaultChannelName));
}
this.defaultChannelName = null;
}
String channelNameToUse = this.defaultChannelName;
if (channelNameToUse != null && this.messagingTemplate.getDefaultDestination() == null) {
Assert.state(this.channelResolver != null, "ChannelResolver is required to resolve channel names.");
this.messagingTemplate.setDefaultChannel(
this.channelResolver.resolveDestination(channelNameToUse));
this.defaultChannelName = null;
}
this.messagingTemplate.send(message);
}

33
spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
View File

@@ -19,8 +19,7 @@ package org.springframework.integration.aop;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Collectors;
import org.aopalliance.aop.Advice;
@@ -52,23 +51,24 @@ import org.springframework.util.Assert;
@SuppressWarnings("serial")
public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
private final Set<Class<? extends Annotation>> publisherAnnotationTypes;
private final MessagePublishingInterceptor interceptor;
@SuppressWarnings("unchecked")
public PublisherAnnotationAdvisor(Class<? extends Annotation>... publisherAnnotationTypes) {
this.publisherAnnotationTypes = new HashSet<>(Arrays.asList(publisherAnnotationTypes));
PublisherMetadataSource metadataSource =
new MethodAnnotationPublisherMetadataSource(this.publisherAnnotationTypes);
this.interceptor = new MessagePublishingInterceptor(metadataSource);
}
private final Pointcut pointcut;
@SuppressWarnings("unchecked")
public PublisherAnnotationAdvisor() {
this(Publisher.class);
}
@SuppressWarnings("varargs")
@SafeVarargs
public PublisherAnnotationAdvisor(Class<? extends Annotation>... publisherAnnotationTypes) {
PublisherMetadataSource metadataSource =
new MethodAnnotationPublisherMetadataSource(
Arrays.stream(publisherAnnotationTypes).collect(Collectors.toSet()));
this.interceptor = new MessagePublishingInterceptor(metadataSource);
this.pointcut = buildPointcut(publisherAnnotationTypes);
}
/**
* A channel bean name to be used as default for publishing.
@@ -91,12 +91,12 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
@Override
public Pointcut getPointcut() {
return this.buildPointcut();
return this.pointcut;
}
private Pointcut buildPointcut() {
private static Pointcut buildPointcut(Class<? extends Annotation>[] publisherAnnotationTypes) {
ComposablePointcut result = null;
for (Class<? extends Annotation> publisherAnnotationType : this.publisherAnnotationTypes) {
for (Class<? extends Annotation> publisherAnnotationType : publisherAnnotationTypes) {
Pointcut cpc = new MetaAnnotationMatchingPointcut(publisherAnnotationType, true);
Pointcut mpc = new MetaAnnotationMatchingPointcut(null, publisherAnnotationType);
if (result == null) {
@@ -187,8 +187,7 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
@Override
@SuppressWarnings("rawtypes")
public boolean matches(Method method, Class targetClass) {
public boolean matches(Method method, Class<?> targetClass) {
if (AnnotationUtils.getAnnotation(method, this.annotationType) != null) {
return true;
}

87
spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
View File

@@ -944,11 +944,16 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
endpoint = null;
}
}
return buildMessageHandlerMetrics(monitor, name, endpointName, source, endpoint);
MessageHandlerMetrics messageHandlerMetrics = buildMessageHandlerMetrics(monitor, name, source, endpoint);
if (endpointName != null) {
this.endpointsByMonitor.put(messageHandlerMetrics, endpointName);
}
return messageHandlerMetrics;
}
private MessageHandlerMetrics buildMessageHandlerMetrics(MessageHandlerMetrics monitor,
String name, String endpointName, String source, IntegrationConsumer endpoint) {
String name, String source, IntegrationConsumer endpoint) {
MessageHandlerMetrics result = monitor;
String managedType = source;
@@ -961,20 +966,7 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
if (managedName != null && name.startsWith(SI_PACKAGE)) {
MessageChannel inputChannel = endpoint.getInputChannel();
if (inputChannel != null) {
if (!this.anonymousHandlerCounters.containsKey(inputChannel)) {
this.anonymousHandlerCounters.put(inputChannel, new AtomicLong());
}
AtomicLong count = this.anonymousHandlerCounters.get(inputChannel);
long total = count.incrementAndGet();
String suffix = "";
/*
* Short hack to makes sure object names are unique if more than one endpoint has the same input
* channel
*/
if (total > 1) {
suffix = "#" + total;
}
managedName = inputChannel + suffix;
managedName = buildAnonymousManagedName(this.anonymousHandlerCounters, inputChannel);
managedType = "anonymous";
}
}
@@ -993,15 +985,21 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
managedType = "handler";
}
if (endpointName != null) {
this.endpointsByMonitor.put(monitor, endpointName);
}
result.setManagedType(managedType);
result.setManagedName(managedName);
return result;
}
private String buildAnonymousManagedName(Map<Object, AtomicLong> anonymousCache, MessageChannel messageChannel) {
AtomicLong count = anonymousCache.computeIfAbsent(messageChannel, (key) -> new AtomicLong());
long total = count.incrementAndGet();
/*
* Short hack to makes sure object names are unique if more than one endpoint has the same input
* channel
*/
return messageChannel + (total > 1 ? "#" + total : "");
}
/**
* Wrap the monitor in a lifecycle so it exposes the start/stop operations
*/
@@ -1076,14 +1074,22 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
name = getInternalComponentName(name);
source = "internal";
}
return buildMessageSourceMetricsIfAny(monitor, name, endpointName, source, endpoint);
MessageSourceMetrics messageSourceMetrics = buildMessageSourceMetricsIfAny(monitor, name, source, endpoint);
if (endpointName != null) {
this.endpointsByMonitor.put(messageSourceMetrics, endpointName);
}
return messageSourceMetrics;
}
private MessageSourceMetrics buildMessageSourceMetricsIfAny(MessageSourceMetrics monitor, String name,
String endpointName, String source, Object endpoint) {
String source, Object endpoint) {
MessageSourceMetrics result = monitor;
if (name != null && name.startsWith(SI_PACKAGE)) {
String managedType = source;
String managedName = name;
if (managedName != null && managedName.startsWith(SI_PACKAGE)) {
Object target = endpoint;
if (endpoint instanceof Advised) {
TargetSource targetSource = ((Advised) endpoint).getTargetSource();
@@ -1091,11 +1097,11 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
target = targetSource.getTarget();
}
catch (Exception e) {
logger.error("Could not get handler from bean = " + name);
logger.error("Could not get handler from bean = " + managedName);
}
}
Object outputChannel = null;
MessageChannel outputChannel = null;
if (target instanceof MessagingGatewaySupport) {
outputChannel = ((MessagingGatewaySupport) target).getRequestChannel();
}
@@ -1104,21 +1110,8 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
}
if (outputChannel != null) {
if (!this.anonymousSourceCounters.containsKey(outputChannel)) {
this.anonymousSourceCounters.put(outputChannel, new AtomicLong());
}
AtomicLong count = this.anonymousSourceCounters.get(outputChannel);
long total = count.incrementAndGet();
String suffix = "";
/*
* Short hack to makes sure object names are unique if more than one endpoint has the same input
* channel
*/
if (total > 1) {
suffix = "#" + total;
}
name = outputChannel + suffix;
source = "anonymous";
managedName = buildAnonymousManagedName(this.anonymousSourceCounters, outputChannel);
managedType = "anonymous";
}
}
@@ -1126,17 +1119,13 @@ public class IntegrationMBeanExporter extends MBeanExporter implements Applicati
result = wrapMessageSourceInLifecycleMetrics(result, endpoint);
}
if (name == null) {
name = result.toString();
source = "source";
if (managedName == null) {
managedName = result.toString();
managedType = "source";
}
if (endpointName != null) {
this.endpointsByMonitor.put(result, endpointName);
}
result.setManagedType(source);
result.setManagedName(name);
result.setManagedType(managedType);
result.setManagedName(managedName);
return result;
}