You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/07/29 10:38:38 UTC
[camel] branch master updated (0060fdc -> 252d27e)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0060fdc Removed unused imports
new 8203719 Camel-Micrometer: Use BindToRegistry annotation wherever possible
new 00a4096 Camel-Micrometer: Fixed CS
new 252d27e Removed unused imports
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../AbstractMicrometerEventNotifierTest.java | 12 ++++-----
.../messagehistory/ManagedMessageHistoryTest.java | 31 ++++++++--------------
.../AbstractMicrometerRoutePolicyTest.java | 11 ++++----
3 files changed, 21 insertions(+), 33 deletions(-)
[camel] 02/03: Camel-Micrometer: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 00a40966b96c5a352fd0302a60f58e3519e1b612
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 29 12:37:38 2019 +0200
Camel-Micrometer: Fixed CS
---
.../AbstractMicrometerEventNotifierTest.java | 4 ++--
.../messagehistory/ManagedMessageHistoryTest.java | 20 +++++++-------------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
index ea20308..6aea10b 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
@@ -31,7 +31,7 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
-
+
@BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
protected CompositeMeterRegistry meterRegistry;
@@ -41,7 +41,7 @@ abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
}
public void addRegistry() throws Exception {
- meterRegistry = new CompositeMeterRegistry();
+ meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
}
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
index 80e67d5..5414309 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
@@ -35,7 +35,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class ManagedMessageHistoryTest extends CamelTestSupport {
-
+
@BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
private CompositeMeterRegistry meterRegistry;
@@ -47,7 +47,7 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
protected MBeanServer getMBeanServer() {
return context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
-
+
public void addRegistry() throws Exception {
meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
@@ -91,10 +91,7 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
Set<ObjectName> set = getMBeanServer().queryNames(new ObjectName("org.apache.camel.micrometer:name=CamelMessageHistory.*"), null);
assertEquals(3, set.size());
- ObjectName fooMBean = set.stream()
- .filter(on -> on.getCanonicalName().contains("foo"))
- .findFirst()
- .orElseThrow(() -> new AssertionError("Expected MBean with node Id foo"));
+ ObjectName fooMBean = set.stream().filter(on -> on.getCanonicalName().contains("foo")).findFirst().orElseThrow(() -> new AssertionError("Expected MBean with node Id foo"));
Long testCount = (Long)getMBeanServer().getAttribute(fooMBean, "Count");
assertEquals(count / 2, testCount.longValue());
@@ -102,10 +99,10 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
// get the message history service using JMX
String name = String.format("org.apache.camel:context=%s,type=services,name=MicrometerMessageHistoryService", context.getManagementName());
ObjectName on = ObjectName.getInstance(name);
- String json = (String) getMBeanServer().invoke(on, "dumpStatisticsAsJson", null, null);
+ String json = (String)getMBeanServer().invoke(on, "dumpStatisticsAsJson", null, null);
assertNotNull(json);
log.info(json);
-
+
assertTrue(json.contains("\"nodeId\" : \"foo\""));
assertTrue(json.contains("\"nodeId\" : \"bar\""));
assertTrue(json.contains("\"nodeId\" : \"baz\""));
@@ -117,12 +114,9 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() {
- from("seda:foo").routeId("route1")
- .to("mock:foo").id("foo");
+ from("seda:foo").routeId("route1").to("mock:foo").id("foo");
- from("seda:bar").routeId("route2")
- .to("mock:bar").id("bar")
- .to("mock:baz").id("baz");
+ from("seda:bar").routeId("route2").to("mock:bar").id("bar").to("mock:baz").id("baz");
}
};
}
[camel] 01/03: Camel-Micrometer: Use BindToRegistry annotation
wherever possible
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8203719d786f19abe92b4bfd6cec19f303e265dd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 29 12:31:51 2019 +0200
Camel-Micrometer: Use BindToRegistry annotation wherever possible
---
.../AbstractMicrometerEventNotifierTest.java | 15 +++++++--------
.../messagehistory/ManagedMessageHistoryTest.java | 14 ++++++--------
.../routepolicy/AbstractMicrometerRoutePolicyTest.java | 10 +++++-----
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
index a52b356..ea20308 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
@@ -21,6 +21,8 @@ import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.jmx.JmxMeterRegistry;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
@@ -29,7 +31,8 @@ import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
-
+
+ @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
protected CompositeMeterRegistry meterRegistry;
@Override
@@ -37,19 +40,16 @@ abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
return true;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- meterRegistry = new CompositeMeterRegistry();
+ public void addRegistry() throws Exception {
+ meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
- registry.bind(MicrometerConstants.METRICS_REGISTRY_NAME, meterRegistry);
- return registry;
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
+ addRegistry();
AbstractMicrometerEventNotifier<?> eventNotifier = getEventNotifier();
eventNotifier.setMeterRegistry(meterRegistry);
eventNotifier.setPrettyPrint(true);
@@ -58,5 +58,4 @@ abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
}
protected abstract AbstractMicrometerEventNotifier<?> getEventNotifier();
-
}
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
index 930833a..80e67d5 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
@@ -24,6 +24,8 @@ import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.jmx.JmxMeterRegistry;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.micrometer.CamelJmxConfig;
@@ -33,7 +35,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class ManagedMessageHistoryTest extends CamelTestSupport {
-
+
+ @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
private CompositeMeterRegistry meterRegistry;
@Override
@@ -45,21 +48,16 @@ public class ManagedMessageHistoryTest extends CamelTestSupport {
return context.getManagementStrategy().getManagementAgent().getMBeanServer();
}
- // Setup the common MetricsRegistry for MetricsComponent and MetricsMessageHistoryFactory to use
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
+ public void addRegistry() throws Exception {
meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
- registry.bind(MicrometerConstants.METRICS_REGISTRY_NAME, meterRegistry);
- return registry;
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
-
+ addRegistry();
MicrometerMessageHistoryFactory factory = new MicrometerMessageHistoryFactory();
factory.setPrettyPrint(true);
factory.setMeterRegistry(meterRegistry);
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
index b82c6e5..324339e 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
@@ -21,6 +21,8 @@ import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.core.instrument.util.HierarchicalNameMapper;
import io.micrometer.jmx.JmxMeterRegistry;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
@@ -36,14 +38,12 @@ public class AbstractMicrometerRoutePolicyTest extends CamelTestSupport {
return true;
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
+ @BindToRegistry(MicrometerConstants.METRICS_REGISTRY_NAME)
+ public CompositeMeterRegistry addRegistry() throws Exception {
meterRegistry = new CompositeMeterRegistry();
meterRegistry.add(new SimpleMeterRegistry());
meterRegistry.add(new JmxMeterRegistry(CamelJmxConfig.DEFAULT, Clock.SYSTEM, HierarchicalNameMapper.DEFAULT));
- registry.bind(MicrometerConstants.METRICS_REGISTRY_NAME, meterRegistry);
- return registry;
+ return meterRegistry;
}
@Override
[camel] 03/03: Removed unused imports
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 252d27e67b80e630e810686a414043e2b5cf2167
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jul 29 12:38:15 2019 +0200
Removed unused imports
---
.../micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java | 1 -
.../component/micrometer/messagehistory/ManagedMessageHistoryTest.java | 1 -
.../micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java | 1 -
3 files changed, 3 deletions(-)
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
index 6aea10b..fa4ba87 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/eventNotifier/AbstractMicrometerEventNotifierTest.java
@@ -27,7 +27,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
import org.apache.camel.component.micrometer.eventnotifier.AbstractMicrometerEventNotifier;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
abstract class AbstractMicrometerEventNotifierTest extends CamelTestSupport {
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
index 5414309..7d4695b 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/messagehistory/ManagedMessageHistoryTest.java
@@ -30,7 +30,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
index 324339e..a640483 100644
--- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
+++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/AbstractMicrometerRoutePolicyTest.java
@@ -26,7 +26,6 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.component.micrometer.CamelJmxConfig;
import org.apache.camel.component.micrometer.MicrometerConstants;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
public class AbstractMicrometerRoutePolicyTest extends CamelTestSupport {