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

Fix latest Sonar fixes

Browse Source 
* Some code style improvement for SMB classes
* Make an `SmbSessionTests` based on the `SmbTestSupport` for faster execution, but not blocking on fake URL connection attempt
* Remove `AbstractMqttMessageDrivenChannelAdapter.Topic` model in favor of `LinkedHashMap` handling
This commit is contained in:
Artem Bilan
2022-11-04 16:19:03 -04:00
parent d31f309752
commit 18fcd21137
14 changed files with 210 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
spring-integration-core/src/main/java/org/springframework/integration/config/RouterAnnotationPostProcessor.java
View File

@@ -49,9 +49,21 @@ import org.springframework.util.StringUtils;
*/
public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostProcessor<Router> {
private static final String APPLY_SEQUENCE_ATTR = "applySequence";
private static final String IGNORE_SEND_FAILURES_ATTR = "ignoreSendFailures";
private static final String CHANNEL_MAPPINGS_ATTR = "channelMappings";
private static final String RESOLUTION_REQUIRED_ATTR = "resolutionRequired";
private static final String PREFIX_ATTR = "prefix";
private static final String SUFFIX_ATTR = "suffix";
public RouterAnnotationPostProcessor() {
this.messageHandlerAttributes.addAll(Arrays.asList("defaultOutputChannel", "applySequence",
"ignoreSendFailures", "resolutionRequired", "channelMappings", "prefix", "suffix"));
this.messageHandlerAttributes.addAll(Arrays.asList("defaultOutputChannel", APPLY_SEQUENCE_ATTR,
IGNORE_SEND_FAILURES_ATTR, RESOLUTION_REQUIRED_ATTR, CHANNEL_MAPPINGS_ATTR, PREFIX_ATTR, SUFFIX_ATTR));
}
@Override
@@ -76,13 +88,13 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
.getBeanDefinition();
new BeanDefinitionPropertiesMapper(routerBeanDefinition, annotations)
.setPropertyValue("applySequence")
.setPropertyValue("ignoreSendFailures")
.setPropertyValue("resolutionRequired")
.setPropertyValue("prefix")
.setPropertyValue("suffix");
.setPropertyValue(APPLY_SEQUENCE_ATTR)
.setPropertyValue(IGNORE_SEND_FAILURES_ATTR)
.setPropertyValue(RESOLUTION_REQUIRED_ATTR)
.setPropertyValue(PREFIX_ATTR)
.setPropertyValue(SUFFIX_ATTR);
String[] channelMappings = MessagingAnnotationUtils.resolveAttribute(annotations, "channelMappings",
String[] channelMappings = MessagingAnnotationUtils.resolveAttribute(annotations, CHANNEL_MAPPINGS_ATTR,
String[].class);
if (!ObjectUtils.isEmpty(channelMappings)) {
Map<String, String> mappings =
@@ -94,7 +106,7 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
routerBeanDefinition.getPropertyValues()
.addPropertyValue("channelMappings", mappings);
.addPropertyValue(CHANNEL_MAPPINGS_ATTR, mappings);
}
return routerBeanDefinition;
@@ -109,12 +121,12 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
router.setDefaultOutputChannelName(defaultOutputChannelName);
}
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, "applySequence", String.class);
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, APPLY_SEQUENCE_ATTR, String.class);
if (StringUtils.hasText(applySequence)) {
router.setApplySequence(resolveAttributeToBoolean(applySequence));
}
String ignoreSendFailures = MessagingAnnotationUtils.resolveAttribute(annotations, "ignoreSendFailures",
String ignoreSendFailures = MessagingAnnotationUtils.resolveAttribute(annotations, IGNORE_SEND_FAILURES_ATTR,
String.class);
if (StringUtils.hasText(ignoreSendFailures)) {
router.setIgnoreSendFailures(resolveAttributeToBoolean(ignoreSendFailures));
@@ -130,7 +142,7 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
MethodInvokingRouter methodInvokingRouter = (MethodInvokingRouter) router;
String resolutionRequired = MessagingAnnotationUtils.resolveAttribute(annotations, "resolutionRequired",
String resolutionRequired = MessagingAnnotationUtils.resolveAttribute(annotations, RESOLUTION_REQUIRED_ATTR,
String.class);
if (StringUtils.hasText(resolutionRequired)) {
methodInvokingRouter.setResolutionRequired(resolveAttributeToBoolean(resolutionRequired));
@@ -138,17 +150,17 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
ConfigurableListableBeanFactory beanFactory = getBeanFactory();
String prefix = MessagingAnnotationUtils.resolveAttribute(annotations, "prefix", String.class);
String prefix = MessagingAnnotationUtils.resolveAttribute(annotations, PREFIX_ATTR, String.class);
if (StringUtils.hasText(prefix)) {
methodInvokingRouter.setPrefix(beanFactory.resolveEmbeddedValue(prefix));
}
String suffix = MessagingAnnotationUtils.resolveAttribute(annotations, "suffix", String.class);
String suffix = MessagingAnnotationUtils.resolveAttribute(annotations, SUFFIX_ATTR, String.class);
if (StringUtils.hasText(suffix)) {
methodInvokingRouter.setSuffix(beanFactory.resolveEmbeddedValue(suffix));
}
String[] channelMappings = MessagingAnnotationUtils.resolveAttribute(annotations, "channelMappings",
String[] channelMappings = MessagingAnnotationUtils.resolveAttribute(annotations, CHANNEL_MAPPINGS_ATTR,
String[].class);
if (!ObjectUtils.isEmpty(channelMappings)) {
StringBuilder mappings = new StringBuilder();
@@ -166,14 +178,14 @@ public class RouterAnnotationPostProcessor extends AbstractMethodAnnotationPostP
private boolean routerAttributesProvided(List<Annotation> annotations) {
String defaultOutputChannel = MessagingAnnotationUtils.resolveAttribute(annotations, "defaultOutputChannel",
String.class);
String[] channelMappings = MessagingAnnotationUtils.resolveAttribute(annotations, "channelMappings",
String[] channelMappings = MessagingAnnotationUtils.resolveAttribute(annotations, CHANNEL_MAPPINGS_ATTR,
String[].class);
String prefix = MessagingAnnotationUtils.resolveAttribute(annotations, "prefix", String.class);
String suffix = MessagingAnnotationUtils.resolveAttribute(annotations, "suffix", String.class);
String resolutionRequired = MessagingAnnotationUtils.resolveAttribute(annotations, "resolutionRequired",
String prefix = MessagingAnnotationUtils.resolveAttribute(annotations, PREFIX_ATTR, String.class);
String suffix = MessagingAnnotationUtils.resolveAttribute(annotations, SUFFIX_ATTR, String.class);
String resolutionRequired = MessagingAnnotationUtils.resolveAttribute(annotations, RESOLUTION_REQUIRED_ATTR,
String.class);
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, "applySequence", String.class);
String ignoreSendFailures = MessagingAnnotationUtils.resolveAttribute(annotations, "ignoreSendFailures",
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, APPLY_SEQUENCE_ATTR, String.class);
String ignoreSendFailures = MessagingAnnotationUtils.resolveAttribute(annotations, IGNORE_SEND_FAILURES_ATTR,
String.class);
return StringUtils.hasText(defaultOutputChannel) || !ObjectUtils.isEmpty(channelMappings) // NOSONAR complexity
|| StringUtils.hasText(prefix) || StringUtils.hasText(suffix) || StringUtils.hasText(resolutionRequired)

10
spring-integration-core/src/main/java/org/springframework/integration/config/SplitterAnnotationPostProcessor.java
View File

@@ -43,8 +43,10 @@ import org.springframework.util.StringUtils;
*/
public class SplitterAnnotationPostProcessor extends AbstractMethodAnnotationPostProcessor<Splitter> {
private static final String APPLY_SEQUENCE_ATTR = "applySequence";
public SplitterAnnotationPostProcessor() {
this.messageHandlerAttributes.addAll(Arrays.asList("outputChannel", "applySequence", "adviceChain"));
this.messageHandlerAttributes.addAll(Arrays.asList("outputChannel", APPLY_SEQUENCE_ATTR, "adviceChain"));
}
@Override
@@ -67,9 +69,9 @@ public class SplitterAnnotationPostProcessor extends AbstractMethodAnnotationPos
BeanDefinitionBuilder.genericBeanDefinition(SplitterFactoryBean.class)
.addPropertyValue("targetObject", targetObjectBeanDefinition);
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, "applySequence", String.class);
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, APPLY_SEQUENCE_ATTR, String.class);
if (StringUtils.hasText(applySequence)) {
splitterBeanDefinition.addPropertyValue("applySequence", applySequence);
splitterBeanDefinition.addPropertyValue(APPLY_SEQUENCE_ATTR, applySequence);
}
return splitterBeanDefinition.getBeanDefinition();
}
@@ -78,7 +80,7 @@ public class SplitterAnnotationPostProcessor extends AbstractMethodAnnotationPos
protected MessageHandler createHandler(Object bean, Method method, List<Annotation> annotations) {
AbstractMessageSplitter splitter = new MethodInvokingSplitter(bean, method);
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, "applySequence", String.class);
String applySequence = MessagingAnnotationUtils.resolveAttribute(annotations, APPLY_SEQUENCE_ATTR, String.class);
if (StringUtils.hasText(applySequence)) {
splitter.setApplySequence(resolveAttributeToBoolean(applySequence));
}

10
spring-integration-core/src/main/java/org/springframework/integration/handler/LambdaMessageProcessor.java
View File

@@ -126,9 +126,6 @@ public class LambdaMessageProcessor implements MessageProcessor<Object>, BeanFac
logClassCastException(ex);
throw ex;
}
catch (RuntimeException ex) {
throw ex;
}
catch (InvocationTargetException e) {
final Throwable cause = e.getCause();
if (e.getTargetException() instanceof ClassCastException classCastException) {
@@ -140,10 +137,13 @@ public class LambdaMessageProcessor implements MessageProcessor<Object>, BeanFac
throw new IllegalStateException(// NOSONAR lost stack trace
"Could not invoke the method '" + this.method + "'", cause);
}
catch (Exception e) {
catch (Exception ex) {
if (ex instanceof RuntimeException) { // NOSONAR
throw (RuntimeException) ex;
}
throw new IllegalStateException(
"error occurred during processing message in 'LambdaMessageProcessor' for method [" +
this.method + "]", e);
this.method + "]", ex);
}
}