Add remaining deprecations for legacy metrics
- add a module to suppress legacy metrics from the Integration Graph - move graph tests package to match src/main Fix missed deprecation and checkstyle. More deprecations and remove GraphLegacyStatsNullModule. * Revert GRAPH_VERSION. * Fix JavaDocs warnings * Fix `MBeanExporterParserTests`
This commit is contained in:
committed by
Artem Bilan
parent
b06322787e
commit
c2babe4ba2
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2020 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -21,7 +21,6 @@ import java.util.Deque;
|
||||
import java.util.List;
|
||||
|
||||
import org.springframework.integration.channel.ExecutorChannelInterceptorAware;
|
||||
import org.springframework.integration.support.management.PollableChannelManagement;
|
||||
import org.springframework.integration.support.management.metrics.CounterFacade;
|
||||
import org.springframework.integration.support.management.metrics.MetricsCaptor;
|
||||
import org.springframework.jms.core.JmsTemplate;
|
||||
@@ -39,8 +38,10 @@ import org.springframework.messaging.support.ExecutorChannelInterceptor;
|
||||
*
|
||||
* @since 2.0
|
||||
*/
|
||||
@SuppressWarnings("deprecation")
|
||||
public class PollableJmsChannel extends AbstractJmsChannel
|
||||
implements PollableChannel, PollableChannelManagement, ExecutorChannelInterceptorAware {
|
||||
implements PollableChannel, org.springframework.integration.support.management.PollableChannelManagement,
|
||||
ExecutorChannelInterceptorAware {
|
||||
|
||||
private String messageSelector;
|
||||
|
||||
@@ -56,21 +57,45 @@ public class PollableJmsChannel extends AbstractJmsChannel
|
||||
this.messageSelector = messageSelector;
|
||||
}
|
||||
|
||||
/**
|
||||
* Deprecated.
|
||||
* @return receive count
|
||||
* @deprecated in favor of Micrometer metrics.
|
||||
*/
|
||||
@Deprecated
|
||||
@Override
|
||||
public int getReceiveCount() {
|
||||
return getMetrics().getReceiveCount();
|
||||
}
|
||||
|
||||
/**
|
||||
* Deprecated.
|
||||
* @return receive count
|
||||
* @deprecated in favor of Micrometer metrics.
|
||||
*/
|
||||
@Deprecated
|
||||
@Override
|
||||
public long getReceiveCountLong() {
|
||||
return getMetrics().getReceiveCountLong();
|
||||
}
|
||||
|
||||
/**
|
||||
* Deprecated.
|
||||
* @return receive error count
|
||||
* @deprecated in favor of Micrometer metrics.
|
||||
*/
|
||||
@Deprecated
|
||||
@Override
|
||||
public int getReceiveErrorCount() {
|
||||
return getMetrics().getReceiveErrorCount();
|
||||
}
|
||||
|
||||
/**
|
||||
* Deprecated.
|
||||
* @return receive error count
|
||||
* @deprecated in favor of Micrometer metrics.
|
||||
*/
|
||||
@Deprecated
|
||||
@Override
|
||||
public long getReceiveErrorCountLong() {
|
||||
return getMetrics().getReceiveErrorCountLong();
|
||||
|
||||
Reference in New Issue
Block a user