Updates for code review

Author: cppwfs

spring-integration-cassandra/src/main/java/org/springframework/integration/cassandra/config/xml/CassandraParserUtils.java

@@ -92,7 +92,7 @@ public static void processOutboundTypeAttributes(Element element, ParserContext
 
 	}
 
-	public static boolean areMutuallyExclusive(@Nullable String query, @Nullable BeanDefinition statementExpressionDef,
+	public static boolean areMutuallyExclusive(String query, @Nullable BeanDefinition statementExpressionDef,
 			String ingestQuery) {
 
 		return !StringUtils.hasText(query) && statementExpressionDef == null && !StringUtils.hasText(ingestQuery)

spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultInboundChannelAdapterParser.java

@@ -49,7 +49,7 @@
 public class DefaultInboundChannelAdapterParser extends AbstractPollingInboundChannelAdapterParser {
 
 	@Override
-	protected @Nullable BeanMetadataElement parseSource(Element element, ParserContext parserContext) {
+	protected BeanMetadataElement parseSource(Element element, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
 		BeanMetadataElement result = null;
 		BeanComponentDefinition innerBeanDef =
@@ -90,7 +90,6 @@ else if (hasScriptElement) {
 						"Neither 'ref' and 'method' nor 'expression' are permitted when an inner script element is "
 								+ "configured on element "
 								+ IntegrationNamespaceUtils.createElementDescription(element) + ".", source);
-				return null;
 			}
 			BeanDefinition scriptBeanDefinition = parserContext.getDelegate().parseCustomElement(Objects.requireNonNull(scriptElement));
 			BeanDefinitionBuilder sourceBuilder = BeanDefinitionBuilder.genericBeanDefinition(
@@ -104,12 +103,10 @@ else if (hasExpression || hasExpressionElement) {
 				parserContext.getReaderContext().error(
 						"The 'ref' and 'method' attributes can't be used with 'expression' attribute or inner "
 								+ "<expression>.", element);
-				return null;
 			}
 			if (hasExpression & hasExpressionElement) {
 				parserContext.getReaderContext().error(
 						"Exactly one of the 'expression' attribute or inner <expression> is required.", element);
-				return null;
 			}
 			result = parseExpression(expressionString, expressionElement, element, parserContext);
 		}
@@ -122,7 +119,7 @@ else if (hasRef) {
 				result = sourceValue;
 			}
 		}
-		return result;
+		return Objects.requireNonNull(result);
 	}
 
 	private BeanMetadataElement parseMethodInvokingSource(BeanMetadataElement targetObject, String methodName,

spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests-context.xml

@@ -9,33 +9,30 @@
 		http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
-	<context:property-placeholder properties-ref="props"/>
+	<context:property-placeholder properties-ref="props" />
 
 	<util:properties id="props">
 		<prop key="cluster.1">cluster</prop>
 		<prop key="cluster.2">cluster</prop>
 		<prop key="cluster.3">clusterX</prop>
 	</util:properties>
 
-	<int:inbound-channel-adapter id="in" channel="foo" expression="'foo'" role="cluster" auto-startup="false">
-		<int:poller fixed-delay="60000"/>
+	<int:inbound-channel-adapter id="in" channel="foo"  expression="'foo'" role="cluster" auto-startup="false">
+		<int:poller fixed-delay="60000" />
 	</int:inbound-channel-adapter>
 
-	<int:channel id="foo"/>
+	<int:channel id="foo" />
 
-	<int:outbound-channel-adapter id="out1" channel="foo" role="cluster" auto-startup="false" ref="sink" method="foo"/>
+	<int:outbound-channel-adapter id="out1" channel="foo" role="cluster" auto-startup="false" ref="sink" method="foo" />
 
-	<int:outbound-channel-adapter id="out2" channel="foo" role="${cluster.1}" auto-startup="false" ref="sink"
-								  method="foo"/>
+	<int:outbound-channel-adapter id="out2" channel="foo" role="${cluster.1}" auto-startup="false" ref="sink" method="foo" />
 
-	<int:outbound-channel-adapter id="out3" channel="foo" role="${cluster.2}" auto-startup="false" ref="sink"
-								  method="foo"/>
+	<int:outbound-channel-adapter id="out3" channel="foo" role="${cluster.2}" auto-startup="false" ref="sink" method="foo" />
 
-	<int:outbound-channel-adapter id="out4" channel="foo" role="${cluster.3}" auto-startup="false" ref="sink"
-								  method="foo"/>
+	<int:outbound-channel-adapter id="out4" channel="foo" role="${cluster.3}" auto-startup="false" ref="sink" method="foo" />
 
-	<bean id="sink" class="org.springframework.integration.config.xml.EndpointRoleParserTests$Sink"/>
+	<bean id="sink" class="org.springframework.integration.config.xml.EndpointRoleParserTests$Sink" />
 
-	<int:bridge id="bridge" input-channel="foo" output-channel="nullChannel" role="cluster" auto-startup="false"/>
+	<int:bridge id="bridge" input-channel="foo" output-channel="nullChannel" role="cluster" auto-startup="false" />
 
-</beans>
+</beans>