You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by GitBox <gi...@apache.org> on 2022/10/20 09:52:48 UTC
[GitHub] [camel-quarkus] djcoleman opened a new pull request, #4200: controlbus: Added action option tests (fixes #4009)
djcoleman opened a new pull request, #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200
Added the following action tests to the controlbus extension:
- suspend/resume
- fail
- restart
- stats (JVM-only as it relies on JMX, which is not currently supported in native mode)
- [x] An issue should be filed for the change unless this is a trivial change (fixing a typo or similar). One issue should ideally be fixed by not more than one commit and the other way round, each commit should fix just one issue, without pulling in other changes.
- [x] Each commit in the pull request should have a meaningful and properly spelled subject line and body. Copying the title of the associated issue is typically enough. Please include the issue number in the commit message prefixed by #.
- [x] The pull request description should explain what the pull request does, how, and why. If the info is available in the associated issue or some other external document, a link is enough.
- [x] Phrases like Fix #<issueNumber> or Fixes #<issueNumber> will auto-close the named issue upon merging the pull request. Using them is typically a good idea.
- [x] Please run mvn process-resources -Pformat (and amend the changes if necessary) before sending the pull request.
- [x] Contributor guide is your good friend: https://camel.apache.org/camel-quarkus/latest/contributor-guide.html
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] djcoleman commented on a diff in pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
djcoleman commented on code in PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200#discussion_r1001507832
##########
integration-tests-jvm/controlbus-statistics/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java:
##########
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.controlbus.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+public class ControlbusRoute extends RouteBuilder {
+
+ private static final Logger LOG = Logger.getLogger(ControlbusResource.class);
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:control")
+ .routeId("control")
+ .process(e -> LOG.info("control:" + e.getMessage().getBody(String.class)));
Review Comment:
That route was already in the test so I don't know why it was written that way, but I swapped it for the log() method.
https://github.com/apache/camel-quarkus/pull/4200/files#diff-eeeab2ce264c21e4c0f0b9328b72f5a4162ca53507adbd9c61518a5cd4001cb9R38
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] djcoleman commented on a diff in pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
djcoleman commented on code in PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200#discussion_r1001505657
##########
integration-test-groups/foundation/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusTest.java:
##########
@@ -19,13 +19,22 @@
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@QuarkusTest
class ControlbusTest {
+ @BeforeEach
+ public void startRoute() {
+ String status = RestAssured.get("/controlbus/status").asString();
+ if ("Stopped".equals(status)) {
+ RestAssured.get("/controlbus/start");
+ }
+ }
+
@Test
- public void test() {
+ public void testStopStart() {
RestAssured.given()
.contentType(ContentType.TEXT).get("/controlbus/status")
.then().body(org.hamcrest.CoreMatchers.equalTo("Started"));
Review Comment:
Good point. I refactored that test and the jvm test.
https://github.com/apache/camel-quarkus/pull/4200/files#diff-c93d82c8522c8189a7514a631276500d49ef7869fec288fbfb44ba92caf2231fR25
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a diff in pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
jamesnetherton commented on code in PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200#discussion_r1000614582
##########
integration-test-groups/foundation/controlbus/pom.xml:
##########
@@ -58,6 +62,20 @@
</dependencies>
<profiles>
+ <!--
+ <profile>
+ <id>jvm</id>
Review Comment:
Do we need this profile given the JVM specific tests we're moved elsewhere?
##########
integration-test-groups/foundation/controlbus/src/test/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusTest.java:
##########
@@ -19,13 +19,22 @@
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import io.restassured.http.ContentType;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@QuarkusTest
class ControlbusTest {
+ @BeforeEach
+ public void startRoute() {
+ String status = RestAssured.get("/controlbus/status").asString();
+ if ("Stopped".equals(status)) {
+ RestAssured.get("/controlbus/start");
+ }
+ }
+
@Test
- public void test() {
+ public void testStopStart() {
RestAssured.given()
.contentType(ContentType.TEXT).get("/controlbus/status")
.then().body(org.hamcrest.CoreMatchers.equalTo("Started"));
Review Comment:
Nitpick - You can add a static import for `equalTo`. Makes things a bit easier to read without the package prefix.
##########
integration-tests-jvm/controlbus-statistics/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java:
##########
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.controlbus.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+public class ControlbusRoute extends RouteBuilder {
+
+ private static final Logger LOG = Logger.getLogger(ControlbusResource.class);
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:control")
+ .routeId("control")
+ .process(e -> LOG.info("control:" + e.getMessage().getBody(String.class)));
+
+ from("direct:status")
+ .transform()
+ .exchange(e -> e.getContext().getRouteController().getRouteStatus("control").name());
Review Comment:
It's probably enough to do `.setBody().constant(getCamelContext().getRouteController().getRouteStatus("control"))`.
##########
integration-tests-jvm/controlbus-statistics/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java:
##########
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.controlbus.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+public class ControlbusRoute extends RouteBuilder {
+
+ private static final Logger LOG = Logger.getLogger(ControlbusResource.class);
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:control")
+ .routeId("control")
+ .process(e -> LOG.info("control:" + e.getMessage().getBody(String.class)));
Review Comment:
If you add `camel-quarkus-log` as a dependency, then you can use the `log` EIP instead of needing a custom `Logger` instance & processor. E.g:
```
.log("control: ${body}");
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] djcoleman commented on a diff in pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
djcoleman commented on code in PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200#discussion_r1000779003
##########
integration-tests-jvm/controlbus-statistics/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java:
##########
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.controlbus.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+public class ControlbusRoute extends RouteBuilder {
+
+ private static final Logger LOG = Logger.getLogger(ControlbusResource.class);
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:control")
+ .routeId("control")
+ .process(e -> LOG.info("control:" + e.getMessage().getBody(String.class)));
+
+ from("direct:status")
+ .transform()
+ .exchange(e -> e.getContext().getRouteController().getRouteStatus("control").name());
Review Comment:
I get a NullPointerException with the following change:
```
from("direct:status")
.setBody().constant(getCamelContext().getRouteController().getRouteStatus("control").name());
```
Is `setBidy()` changing the IN message whereas `transform` was changing the OUT body? I'm not really sure, but that route was already present in the test.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a diff in pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
jamesnetherton commented on code in PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200#discussion_r1001423416
##########
integration-tests-jvm/controlbus-statistics/src/main/java/org/apache/camel/quarkus/component/controlbus/it/ControlbusRoute.java:
##########
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.controlbus.it;
+
+import javax.enterprise.context.ApplicationScoped;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.jboss.logging.Logger;
+
+@ApplicationScoped
+public class ControlbusRoute extends RouteBuilder {
+
+ private static final Logger LOG = Logger.getLogger(ControlbusResource.class);
+
+ @Override
+ public void configure() throws Exception {
+ from("direct:control")
+ .routeId("control")
+ .process(e -> LOG.info("control:" + e.getMessage().getBody(String.class)));
+
+ from("direct:status")
+ .transform()
+ .exchange(e -> e.getContext().getRouteController().getRouteStatus("control").name());
Review Comment:
Ok - feel free to disregard my comment then and keep things as-is.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] djcoleman commented on a diff in pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
djcoleman commented on code in PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200#discussion_r1001504099
##########
integration-test-groups/foundation/controlbus/pom.xml:
##########
@@ -58,6 +62,20 @@
</dependencies>
<profiles>
+ <!--
+ <profile>
+ <id>jvm</id>
Review Comment:
Forgot I'd left that in - removed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #4200: controlbus: Added action option tests (fixes #4009)
Posted by GitBox <gi...@apache.org>.
jamesnetherton merged PR #4200:
URL: https://github.com/apache/camel-quarkus/pull/4200
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org