This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/sandbox/camel-3.x by this push:
new cbbe92e Remove unused counter and fix unit test
cbbe92e is described below
commit cbbe92ee2f22175b1f9a4d8bdee3383c506e1379
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Oct 31 20:56:23 2018 +0100
Remove unused counter and fix unit test
---
.../main/java/org/apache/camel/spi/TypeConverterRegistry.java | 5 -----
.../apache/camel/impl/converter/BaseTypeConverterRegistry.java | 10 ++--------
.../management/mbean/ManagedTypeConverterRegistryMBean.java | 3 ---
.../camel/management/mbean/ManagedTypeConverterRegistry.java | 4 ----
.../camel/management/ManagedTypeConverterRegistryTest.java | 2 --
5 files changed, 2 insertions(+), 22 deletions(-)
diff --git
a/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
b/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
index 3764695..a2d7ba6 100644
--- a/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
+++ b/camel-api/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
@@ -53,11 +53,6 @@ public interface TypeConverterRegistry extends StaticService
{
long getHitCounter();
/**
- * Number of successful conversions by optimised core converters
- */
- long getBaseHitCounter();
-
- /**
* Number of attempts which cannot be converted as no suitable type
converter exists
*/
long getMissCounter();
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
index a728621..73f6acf 100644
---
a/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
+++
b/camel-core/src/main/java/org/apache/camel/impl/converter/BaseTypeConverterRegistry.java
@@ -646,11 +646,6 @@ public abstract class BaseTypeConverterRegistry extends
ServiceSupport implement
}
@Override
- public long getBaseHitCounter() {
- return baseHitCounter.longValue();
- }
-
- @Override
public long getMissCounter() {
return missCounter.longValue();
}
@@ -665,7 +660,6 @@ public abstract class BaseTypeConverterRegistry extends
ServiceSupport implement
noopCounter.reset();
attemptCounter.reset();
hitCounter.reset();
- baseHitCounter.reset();
missCounter.reset();
failedCounter.reset();
}
@@ -682,8 +676,8 @@ public abstract class BaseTypeConverterRegistry extends
ServiceSupport implement
@Override
public String toString() {
- return String.format("TypeConverterRegistry utilization[noop=%s,
attempts=%s, hits=%s, baseHits=%s, misses=%s, failures=%s]",
- getNoopCounter(), getAttemptCounter(), getHitCounter(),
getBaseHitCounter(), getMissCounter(), getFailedCounter());
+ return String.format("TypeConverterRegistry utilization[noop=%s,
attempts=%s, hits=%s, misses=%s, failures=%s]",
+ getNoopCounter(), getAttemptCounter(), getHitCounter(),
getMissCounter(), getFailedCounter());
}
}
diff --git
a/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTypeConverterRegistryMBean.java
b/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTypeConverterRegistryMBean.java
index 0f82a4d..7d38df3 100644
---
a/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTypeConverterRegistryMBean.java
+++
b/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedTypeConverterRegistryMBean.java
@@ -32,9 +32,6 @@ public interface ManagedTypeConverterRegistryMBean extends
ManagedServiceMBean {
@ManagedAttribute(description = "Number of type conversion hits
(successful conversions)")
long getHitCounter();
- @ManagedAttribute(description = "Number of type conversion hits by base
core converters (successful conversions)")
- long getBaseHitCounter();
-
@ManagedAttribute(description = "Number of type conversion misses (no
suitable type converter)")
long getMissCounter();
diff --git
a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
index f2bac5d..d11e71a 100644
---
a/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
+++
b/camel-management-impl/src/main/java/org/apache/camel/management/mbean/ManagedTypeConverterRegistry.java
@@ -60,10 +60,6 @@ public class ManagedTypeConverterRegistry extends
ManagedService implements Mana
return registry.getStatistics().getHitCounter();
}
- public long getBaseHitCounter() {
- return registry.getStatistics().getBaseHitCounter();
- }
-
public long getMissCounter() {
return registry.getStatistics().getMissCounter();
}
diff --git
a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
index de92d18..d1c1888 100644
---
a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
+++
b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedTypeConverterRegistryTest.java
@@ -77,8 +77,6 @@ public class ManagedTypeConverterRegistryTest extends
ManagementTestSupport {
// should hit
Long hit = (Long) mbeanServer.getAttribute(name, "HitCounter");
assertEquals(1, hit.intValue());
- Long coreHit = (Long) mbeanServer.getAttribute(name, "BaseHitCounter");
- assertEquals(1, coreHit.intValue());
failed = (Long) mbeanServer.getAttribute(name, "FailedCounter");
assertEquals(0, failed.intValue());
miss = (Long) mbeanServer.getAttribute(name, "MissCounter");
