INT-4392: Polishing

JIRA: https://jira.spring.io/browse/INT-4392

Avoid the need for reflection on the `MicrometerMetricsCaptor`.
 - move facade interfaces to a sub-package.
Remove deprecated `MicrometerMetricsFactory.

Author: garyrussell

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java

@@ -36,12 +36,12 @@
 import org.springframework.integration.support.management.DefaultMessageChannelMetrics;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.support.management.MessageChannelMetrics;
-import org.springframework.integration.support.management.MetricsCaptor;
 import org.springframework.integration.support.management.MetricsContext;
-import org.springframework.integration.support.management.SampleFacade;
 import org.springframework.integration.support.management.Statistics;
-import org.springframework.integration.support.management.TimerFacade;
 import org.springframework.integration.support.management.TrackableComponent;
+import org.springframework.integration.support.management.metrics.MetricsCaptor;
+import org.springframework.integration.support.management.metrics.SampleFacade;
+import org.springframework.integration.support.management.metrics.TimerFacade;
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java

@@ -20,8 +20,8 @@
 import java.util.Deque;
 import java.util.List;
 
-import org.springframework.integration.support.management.CounterFacade;
 import org.springframework.integration.support.management.PollableChannelManagement;
+import org.springframework.integration.support.management.metrics.CounterFacade;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.messaging.support.ChannelInterceptor;

spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java

@@ -28,9 +28,9 @@
 import org.springframework.integration.support.management.DefaultMessageChannelMetrics;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.support.management.MessageChannelMetrics;
-import org.springframework.integration.support.management.MetricsCaptor;
 import org.springframework.integration.support.management.Statistics;
-import org.springframework.integration.support.management.TimerFacade;
+import org.springframework.integration.support.management.metrics.MetricsCaptor;
+import org.springframework.integration.support.management.metrics.TimerFacade;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.PollableChannel;
 import org.springframework.util.Assert;

spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java

@@ -26,10 +26,10 @@
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.support.AbstractIntegrationMessageBuilder;
 import org.springframework.integration.support.context.NamedComponent;
-import org.springframework.integration.support.management.CounterFacade;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.support.management.MessageSourceMetrics;
-import org.springframework.integration.support.management.MetricsCaptor;
+import org.springframework.integration.support.management.metrics.CounterFacade;
+import org.springframework.integration.support.management.metrics.MetricsCaptor;
 import org.springframework.integration.util.AbstractExpressionEvaluator;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessagingException;

spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java

@@ -27,12 +27,12 @@
 import org.springframework.integration.support.management.DefaultMessageHandlerMetrics;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.support.management.MessageHandlerMetrics;
-import org.springframework.integration.support.management.MetricsCaptor;
 import org.springframework.integration.support.management.MetricsContext;
-import org.springframework.integration.support.management.SampleFacade;
 import org.springframework.integration.support.management.Statistics;
-import org.springframework.integration.support.management.TimerFacade;
 import org.springframework.integration.support.management.TrackableComponent;
+import org.springframework.integration.support.management.metrics.MetricsCaptor;
+import org.springframework.integration.support.management.metrics.SampleFacade;
+import org.springframework.integration.support.management.metrics.TimerFacade;
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;

spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagement.java

@@ -16,6 +16,7 @@
 
 package org.springframework.integration.support.management;
 
+import org.springframework.integration.support.management.metrics.MetricsCaptor;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedOperation;
 

spring-integration-core/src/main/java/org/springframework/integration/support/management/IntegrationManagementConfigurer.java

@@ -16,7 +16,6 @@
 
 package org.springframework.integration.support.management;
 
-import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -33,6 +32,8 @@
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.support.management.IntegrationManagement.ManagementOverrides;
+import org.springframework.integration.support.management.metrics.MetricsCaptor;
+import org.springframework.integration.support.management.micrometer.MicrometerMetricsCaptor;
 import org.springframework.integration.support.utils.PatternMatchUtils;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
@@ -215,17 +216,7 @@ public void afterSingletonsInstantiated() {
 		ClassLoader classLoader = IntegrationManagementConfigurer.class.getClassLoader();
 		if (ClassUtils.isPresent("io.micrometer.core.instrument.MeterRegistry",
 				classLoader)) {
-			try {
-				// Use reflection to avoid a package tangle with ...management.micrometer
-				Class<?> captor = ClassUtils.forName(
-						"org.springframework.integration.support.management.micrometer.MicrometerMetricsCaptor",
-						classLoader);
-				Method method = captor.getDeclaredMethod("loadCaptor", ApplicationContext.class);
-				this.metricsCaptor = (MetricsCaptor) method.invoke(null, this.applicationContext);
-			}
-			catch (Exception e) {
-				// no op
-			}
+			this.metricsCaptor = MicrometerMetricsCaptor.loadCaptor(this.applicationContext);
 		}
 		if (this.metricsCaptor != null) {
 			injectCaptor();

spring-integration-core/src/main/java/org/springframework/integration/support/management/MessageSourceMetrics.java

@@ -16,6 +16,7 @@
 
 package org.springframework.integration.support.management;
 
+import org.springframework.integration.support.management.metrics.CounterFacade;
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.support.MetricType;
 

spring-integration-core/src/main/java/org/springframework/integration/support/management/CounterFacade.java renamed to spring-integration-core/src/main/java/org/springframework/integration/support/management/metrics/CounterFacade.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.support.management;
+package org.springframework.integration.support.management.metrics;
 
 /**
  * @author Gary Russell

spring-integration-core/src/main/java/org/springframework/integration/support/management/GaugeFacade.java renamed to spring-integration-core/src/main/java/org/springframework/integration/support/management/metrics/GaugeFacade.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.support.management;
+package org.springframework.integration.support.management.metrics;
 
 /**
  * @author Gary Russell