Sonar complexity issues

Author: garyrussell

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java

@@ -245,6 +245,16 @@ else if (allHeaders != null) {
 			.acceptIfNotNull(getHeaderIfAvailable(headers, AmqpHeaders.USER_ID, String.class),
 					amqpMessageProperties::setUserId);
 
+		mapJsonHeaders(headers, amqpMessageProperties);
+
+		JavaUtils.INSTANCE
+			.acceptIfHasText(getHeaderIfAvailable(headers, AmqpHeaders.SPRING_REPLY_CORRELATION, String.class),
+					replyCorrelation -> amqpMessageProperties.setHeader("spring_reply_correlation", replyCorrelation))
+			.acceptIfHasText(getHeaderIfAvailable(headers, AmqpHeaders.SPRING_REPLY_TO_STACK, String.class),
+					replyToStack -> amqpMessageProperties.setHeader("spring_reply_to", replyToStack));
+	}
+
+	private void mapJsonHeaders(Map<String, Object> headers, MessageProperties amqpMessageProperties) {
 		Map<String, String> jsonHeaders = new HashMap<String, String>();
 
 		for (String jsonHeader : JsonHeaders.HEADERS) {
@@ -265,12 +275,6 @@ else if (allHeaders != null) {
 		if (!amqpMessageProperties.getHeaders().containsKey(JsonHeaders.TYPE_ID.replaceFirst(JsonHeaders.PREFIX, ""))) {
 			amqpMessageProperties.getHeaders().putAll(jsonHeaders);
 		}
-
-		JavaUtils.INSTANCE
-			.acceptIfHasText(getHeaderIfAvailable(headers, AmqpHeaders.SPRING_REPLY_CORRELATION, String.class),
-					replyCorrelation -> amqpMessageProperties.setHeader("spring_reply_correlation", replyCorrelation))
-			.acceptIfHasText(getHeaderIfAvailable(headers, AmqpHeaders.SPRING_REPLY_TO_STACK, String.class),
-					replyToStack -> amqpMessageProperties.setHeader("spring_reply_to", replyToStack));
 	}
 
 	@Override

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

@@ -92,52 +92,65 @@ public Map<String, Method> getFunctions() {
 
 	protected void initialize(String beanName) {
 		if (this.applicationContext != null) {
-			ConversionService conversionService = IntegrationUtils.getConversionService(getApplicationContext());
-			if (conversionService != null) {
-				this.typeConverter = new StandardTypeConverter(conversionService);
-			}
+			conversionService();
+			functions();
+			propertyAccessors();
+			processParentIfPresent(beanName);
+		}
+		this.initialized = true;
+	}
 
-			Map<String, SpelFunctionFactoryBean> functionFactoryBeanMap = BeanFactoryUtils
-					.beansOfTypeIncludingAncestors(this.applicationContext, SpelFunctionFactoryBean.class);
-			for (SpelFunctionFactoryBean spelFunctionFactoryBean : functionFactoryBeanMap.values()) {
-				if (!getFunctions().containsKey(spelFunctionFactoryBean.getFunctionName())) {
-					getFunctions().put(spelFunctionFactoryBean.getFunctionName(), spelFunctionFactoryBean.getObject());
-				}
+	private void conversionService() {
+		ConversionService conversionService = IntegrationUtils.getConversionService(getApplicationContext());
+		if (conversionService != null) {
+			this.typeConverter = new StandardTypeConverter(conversionService);
+		}
+	}
+
+	private void functions() {
+		Map<String, SpelFunctionFactoryBean> functionFactoryBeanMap = BeanFactoryUtils
+				.beansOfTypeIncludingAncestors(this.applicationContext, SpelFunctionFactoryBean.class);
+		for (SpelFunctionFactoryBean spelFunctionFactoryBean : functionFactoryBeanMap.values()) {
+			if (!getFunctions().containsKey(spelFunctionFactoryBean.getFunctionName())) {
+				getFunctions().put(spelFunctionFactoryBean.getFunctionName(), spelFunctionFactoryBean.getObject());
 			}
+		}
+	}
 
-			try {
-				SpelPropertyAccessorRegistrar propertyAccessorRegistrar =
-						this.applicationContext.getBean(SpelPropertyAccessorRegistrar.class);
-				for (Entry<String, PropertyAccessor> entry : propertyAccessorRegistrar.getPropertyAccessors()
-						.entrySet()) {
-					if (!getPropertyAccessors().containsKey(entry.getKey())) {
-						getPropertyAccessors().put(entry.getKey(), entry.getValue());
-					}
+	private void propertyAccessors() {
+		try {
+			SpelPropertyAccessorRegistrar propertyAccessorRegistrar =
+					this.applicationContext.getBean(SpelPropertyAccessorRegistrar.class);
+			for (Entry<String, PropertyAccessor> entry : propertyAccessorRegistrar.getPropertyAccessors()
+					.entrySet()) {
+				if (!getPropertyAccessors().containsKey(entry.getKey())) {
+					getPropertyAccessors().put(entry.getKey(), entry.getValue());
 				}
 			}
-			catch (@SuppressWarnings("unused") NoSuchBeanDefinitionException e) {
-				// There is no 'SpelPropertyAccessorRegistrar' bean in the application context.
-			}
+		}
+		catch (@SuppressWarnings("unused") NoSuchBeanDefinitionException e) {
+			// There is no 'SpelPropertyAccessorRegistrar' bean in the application context.
+		}
+	}
 
-			ApplicationContext parent = this.applicationContext.getParent();
+	private void processParentIfPresent(String beanName) {
+		ApplicationContext parent = this.applicationContext.getParent();
 
-			if (parent != null && parent.containsBean(beanName)) {
-				AbstractEvaluationContextFactoryBean parentFactoryBean = parent.getBean("&" + beanName, getClass());
+		if (parent != null && parent.containsBean(beanName)) {
+			AbstractEvaluationContextFactoryBean parentFactoryBean = parent.getBean("&" + beanName, getClass());
 
-				for (Entry<String, PropertyAccessor> entry : parentFactoryBean.getPropertyAccessors().entrySet()) {
-					if (!getPropertyAccessors().containsKey(entry.getKey())) {
-						getPropertyAccessors().put(entry.getKey(), entry.getValue());
-					}
+			for (Entry<String, PropertyAccessor> entry : parentFactoryBean.getPropertyAccessors().entrySet()) {
+				if (!getPropertyAccessors().containsKey(entry.getKey())) {
+					getPropertyAccessors().put(entry.getKey(), entry.getValue());
 				}
+			}
 
-				for (Entry<String, Method> entry : parentFactoryBean.getFunctions().entrySet()) {
-					if (!getFunctions().containsKey(entry.getKey())) {
-						getFunctions().put(entry.getKey(), entry.getValue());
-					}
+			for (Entry<String, Method> entry : parentFactoryBean.getFunctions().entrySet()) {
+				if (!getFunctions().containsKey(entry.getKey())) {
+					getFunctions().put(entry.getKey(), entry.getValue());
 				}
 			}
 		}
-		this.initialized = true;
 	}
 
 }

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

@@ -215,27 +215,9 @@ protected final H createHandlerInternal() {
 			if (actualHandler == null) {
 				actualHandler = this.handler;
 			}
-			final Object handlerToConfigure = actualHandler; // must final for lambdas
-			if (actualHandler instanceof IntegrationObjectSupport) {
-				JavaUtils.INSTANCE
-					.acceptIfNotNull(this.componentName,
-							name -> ((IntegrationObjectSupport) handlerToConfigure).setComponentName(name))
-					.acceptIfNotNull(this.channelResolver,
-							resolver -> ((IntegrationObjectSupport) handlerToConfigure).setChannelResolver(resolver));
-			}
-			if (!CollectionUtils.isEmpty(this.adviceChain)) {
-				if (actualHandler instanceof AbstractReplyProducingMessageHandler) {
-					((AbstractReplyProducingMessageHandler) actualHandler).setAdviceChain(this.adviceChain);
-				}
-				else if (this.logger.isDebugEnabled()) {
-					String name = this.componentName;
-					if (name == null && actualHandler instanceof NamedComponent) {
-						name = ((NamedComponent) actualHandler).getBeanName();
-					}
-					this.logger.debug("adviceChain can only be set on an AbstractReplyProducingMessageHandler"
-							+ (name == null ? "" : (", " + name)) + ".");
-				}
-			}
+			final Object handlerToConfigure = actualHandler; // must be final for lambdas
+			integrationObjectSupport(actualHandler, handlerToConfigure);
+			adviceChain(actualHandler);
 			JavaUtils.INSTANCE
 				.acceptIfCondition(this.async != null && actualHandler instanceof AbstractMessageProducingHandler,
 					this.async,
@@ -244,6 +226,37 @@ else if (this.logger.isDebugEnabled()) {
 					this.order, theOrder -> ((Orderable) this.handler).setOrder(theOrder));
 			this.initialized = true;
 		}
+		initializingBean();
+		return this.handler;
+	}
+
+	private void integrationObjectSupport(Object actualHandler, final Object handlerToConfigure) {
+		if (actualHandler instanceof IntegrationObjectSupport) {
+			JavaUtils.INSTANCE
+				.acceptIfNotNull(this.componentName,
+						name -> ((IntegrationObjectSupport) handlerToConfigure).setComponentName(name))
+				.acceptIfNotNull(this.channelResolver,
+						resolver -> ((IntegrationObjectSupport) handlerToConfigure).setChannelResolver(resolver));
+		}
+	}
+
+	private void adviceChain(Object actualHandler) {
+		if (!CollectionUtils.isEmpty(this.adviceChain)) {
+			if (actualHandler instanceof AbstractReplyProducingMessageHandler) {
+				((AbstractReplyProducingMessageHandler) actualHandler).setAdviceChain(this.adviceChain);
+			}
+			else if (this.logger.isDebugEnabled()) {
+				String name = this.componentName;
+				if (name == null && actualHandler instanceof NamedComponent) {
+					name = ((NamedComponent) actualHandler).getBeanName();
+				}
+				this.logger.debug("adviceChain can only be set on an AbstractReplyProducingMessageHandler"
+						+ (name == null ? "" : (", " + name)) + ".");
+			}
+		}
+	}
+
+	private void initializingBean() {
 		if (this.handler instanceof InitializingBean) {
 			try {
 				((InitializingBean) this.handler).afterPropertiesSet();
@@ -252,7 +265,6 @@ else if (this.logger.isDebugEnabled()) {
 				throw new BeanInitializationException("failed to initialize MessageHandler", e);
 			}
 		}
-		return this.handler;
 	}
 
 	private void configureOutputChannelIfAny() {

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

@@ -210,6 +210,14 @@ public void afterPropertiesSet() {
 			}
 		}
 
+		adviceChain();
+		if (this.channelResolver == null) {
+			this.channelResolver = ChannelResolverUtils.getChannelResolver(this.beanFactory);
+		}
+		initializeEndpoint();
+	}
+
+	private void adviceChain() {
 		if (!CollectionUtils.isEmpty(this.adviceChain)) {
 			/*
 			 *  ARPMHs advise the handleRequestMessage method internally and already have the advice chain injected.
@@ -236,10 +244,6 @@ public void afterPropertiesSet() {
 				}
 			}
 		}
-		if (this.channelResolver == null) {
-			this.channelResolver = ChannelResolverUtils.getChannelResolver(this.beanFactory);
-		}
-		initializeEndpoint();
 	}
 
 	@Override
@@ -277,55 +281,17 @@ private void initializeEndpoint() {
 			}
 			Assert.state(channel != null, "one of inputChannelName or inputChannel is required");
 			if (channel instanceof SubscribableChannel) {
-				Assert.isNull(this.pollerMetadata, "A poller should not be specified for endpoint '" + this.beanName
-						+ "', since '" + channel + "' is a SubscribableChannel (not pollable).");
-				this.endpoint = new EventDrivenConsumer((SubscribableChannel) channel, this.handler);
-				if (logger.isWarnEnabled()
-						&& Boolean.FALSE.equals(this.autoStartup)
-						&& channel instanceof FixedSubscriberChannel) {
-					logger.warn("'autoStartup=\"false\"' has no effect when using a FixedSubscriberChannel");
-				}
+				eventDrivenConsumer(channel);
 			}
 			else if (channel instanceof PollableChannel) {
-				PollingConsumer pollingConsumer = new PollingConsumer((PollableChannel) channel, this.handler);
-				if (this.pollerMetadata == null) {
-					this.pollerMetadata = PollerMetadata.getDefaultPollerMetadata(this.beanFactory);
-					Assert.notNull(this.pollerMetadata, "No poller has been defined for endpoint '" + this.beanName
-							+ "', and no default poller is available within the context.");
-				}
-				pollingConsumer.setTaskExecutor(this.pollerMetadata.getTaskExecutor());
-				pollingConsumer.setTrigger(this.pollerMetadata.getTrigger());
-				pollingConsumer.setAdviceChain(this.pollerMetadata.getAdviceChain());
-				pollingConsumer.setMaxMessagesPerPoll(this.pollerMetadata.getMaxMessagesPerPoll());
-
-				pollingConsumer.setErrorHandler(this.pollerMetadata.getErrorHandler());
-
-				pollingConsumer.setReceiveTimeout(this.pollerMetadata.getReceiveTimeout());
-				pollingConsumer.setTransactionSynchronizationFactory(
-						this.pollerMetadata.getTransactionSynchronizationFactory());
-				pollingConsumer.setBeanClassLoader(this.beanClassLoader);
-				pollingConsumer.setBeanFactory(this.beanFactory);
-				this.endpoint = pollingConsumer;
+				pollingConsumer(channel);
 			}
 			else {
 				this.endpoint = new ReactiveStreamsConsumer(channel, this.handler);
 			}
 			this.endpoint.setBeanName(this.beanName);
 			this.endpoint.setBeanFactory(this.beanFactory);
-			if (this.autoStartup != null) {
-				this.endpoint.setAutoStartup(this.autoStartup);
-			}
-			int phaseToSet = this.phase;
-			if (!this.isPhaseSet) {
-				if (this.endpoint instanceof PollingConsumer) {
-					phaseToSet = Integer.MAX_VALUE / 2;
-				}
-				else {
-					phaseToSet = Integer.MIN_VALUE;
-				}
-			}
-
-			this.endpoint.setPhase(phaseToSet);
+			smartLifecycle();
 			this.endpoint.setRole(this.role);
 			if (this.taskScheduler != null) {
 				this.endpoint.setTaskScheduler(this.taskScheduler);
@@ -335,6 +301,56 @@ else if (channel instanceof PollableChannel) {
 		}
 	}
 
+	private void eventDrivenConsumer(MessageChannel channel) {
+		Assert.isNull(this.pollerMetadata, "A poller should not be specified for endpoint '" + this.beanName
+				+ "', since '" + channel + "' is a SubscribableChannel (not pollable).");
+		this.endpoint = new EventDrivenConsumer((SubscribableChannel) channel, this.handler);
+		if (logger.isWarnEnabled()
+				&& Boolean.FALSE.equals(this.autoStartup)
+				&& channel instanceof FixedSubscriberChannel) {
+			logger.warn("'autoStartup=\"false\"' has no effect when using a FixedSubscriberChannel");
+		}
+	}
+
+	private void pollingConsumer(MessageChannel channel) {
+		PollingConsumer pollingConsumer = new PollingConsumer((PollableChannel) channel, this.handler);
+		if (this.pollerMetadata == null) {
+			this.pollerMetadata = PollerMetadata.getDefaultPollerMetadata(this.beanFactory);
+			Assert.notNull(this.pollerMetadata, "No poller has been defined for endpoint '" + this.beanName
+					+ "', and no default poller is available within the context.");
+		}
+		pollingConsumer.setTaskExecutor(this.pollerMetadata.getTaskExecutor());
+		pollingConsumer.setTrigger(this.pollerMetadata.getTrigger());
+		pollingConsumer.setAdviceChain(this.pollerMetadata.getAdviceChain());
+		pollingConsumer.setMaxMessagesPerPoll(this.pollerMetadata.getMaxMessagesPerPoll());
+
+		pollingConsumer.setErrorHandler(this.pollerMetadata.getErrorHandler());
+
+		pollingConsumer.setReceiveTimeout(this.pollerMetadata.getReceiveTimeout());
+		pollingConsumer.setTransactionSynchronizationFactory(
+				this.pollerMetadata.getTransactionSynchronizationFactory());
+		pollingConsumer.setBeanClassLoader(this.beanClassLoader);
+		pollingConsumer.setBeanFactory(this.beanFactory);
+		this.endpoint = pollingConsumer;
+	}
+
+	private void smartLifecycle() {
+		if (this.autoStartup != null) {
+			this.endpoint.setAutoStartup(this.autoStartup);
+		}
+		int phaseToSet = this.phase;
+		if (!this.isPhaseSet) {
+			if (this.endpoint instanceof PollingConsumer) {
+				phaseToSet = Integer.MAX_VALUE / 2;
+			}
+			else {
+				phaseToSet = Integer.MIN_VALUE;
+			}
+		}
+
+		this.endpoint.setPhase(phaseToSet);
+	}
+
 
 	/*
 	 * SmartLifecycle implementation (delegates to the created endpoint)