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 e95fec66478bee779705ed3c1e23a2b12bfd0f04 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed May 9 16:04:04 2018 +0200 CAMEL-12501 - Camel-Paho: add component verifier from Syndesis project --- .../apache/camel/component/paho/PahoComponent.java | 15 ++-- .../paho/PahoComponentVerifierExtension.java | 97 ++++++++++++++++++++++ .../paho/PahoComponentVerifierExtensionTest.java | 65 +++++++++++++++ 3 files changed, 172 insertions(+), 5 deletions(-) diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java index 47cb4fe..f61d00f 100644 --- a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java +++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponent.java @@ -18,15 +18,16 @@ package org.apache.camel.component.paho; import java.util.Map; +import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; -import org.apache.camel.impl.UriEndpointComponent; +import org.apache.camel.impl.DefaultComponent; import org.apache.camel.spi.Metadata; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; /** * Component to integrate with the Eclispe Paho MQTT library. */ -public class PahoComponent extends UriEndpointComponent { +public class PahoComponent extends DefaultComponent { private String brokerUrl; private String clientId; @@ -34,10 +35,14 @@ public class PahoComponent extends UriEndpointComponent { private MqttConnectOptions connectOptions; public PahoComponent() { - super(PahoEndpoint.class); + this(null); + } + + public PahoComponent(CamelContext context) { + super(context); + + registerExtension(new PahoComponentVerifierExtension()); } - - // Overridden @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { diff --git a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java new file mode 100644 index 0000000..c58ee9b --- /dev/null +++ b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoComponentVerifierExtension.java @@ -0,0 +1,97 @@ +/** + * 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.component.paho; + +import java.util.Map; + +import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension; +import org.apache.camel.component.extension.verifier.ResultBuilder; +import org.apache.camel.component.extension.verifier.ResultErrorBuilder; +import org.apache.camel.component.extension.verifier.ResultErrorHelper; +import org.apache.camel.util.ObjectHelper; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttConnectOptions; +import org.eclipse.paho.client.mqttv3.MqttException; + +public class PahoComponentVerifierExtension extends DefaultComponentVerifierExtension { + + public PahoComponentVerifierExtension() { + this("paho"); + } + + public PahoComponentVerifierExtension(String scheme) { + super(scheme); + } + + // ********************************* + // Parameters validation + // ********************************* + + @Override + protected Result verifyParameters(Map<String, Object> parameters) { + return ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS) + .error(ResultErrorHelper.requiresOption("brokerUrl", parameters)) + .build(); + } + + // ********************************* + // Connectivity validation + // ********************************* + + @Override + protected Result verifyConnectivity(Map<String, Object> parameters) { + return ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY) + .error(parameters, this::verifyCredentials) + .build(); + } + + private void verifyCredentials(ResultBuilder builder, Map<String, Object> parameters) { + String brokerUrl = (String) parameters.get("brokerUrl"); + String username = (String) parameters.get("userName"); + String password = (String) parameters.get("password"); + + if (ObjectHelper.isNotEmpty(brokerUrl)) { + try { + // Create MQTT client + if (ObjectHelper.isEmpty(username) && ObjectHelper.isEmpty(password)) { + MqttClient client = new MqttClient(brokerUrl, MqttClient.generateClientId()); + client.connect(); + client.disconnect(); + } else { + MqttClient client = new MqttClient(brokerUrl, MqttClient.generateClientId()); + MqttConnectOptions connOpts = new MqttConnectOptions(); + connOpts.setUserName(username); + connOpts.setPassword(password.toCharArray()); + client.connect(connOpts); + client.disconnect(); + } + } catch (MqttException e) { + builder.error( + ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER_VALUE, "Unable to connect to MQTT broker") + .parameterKey("brokerUrl") + .build() + ); + } + } else { + builder.error( + ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.ILLEGAL_PARAMETER_VALUE, "Invalid blank MQTT brokerUrl ") + .parameterKey("brokerUrl") + .build() + ); + } + } +} diff --git a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java new file mode 100644 index 0000000..a41b6b0 --- /dev/null +++ b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentVerifierExtensionTest.java @@ -0,0 +1,65 @@ +/** + * 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.component.paho; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.camel.Component; +import org.apache.camel.component.extension.ComponentVerifierExtension; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Assert; +import org.junit.Test; + +public class PahoComponentVerifierExtensionTest extends CamelTestSupport { + + // ************************************************* + // Tests (parameters) + // ************************************************* + @Override + public boolean isUseRouteBuilder() { + return false; + } + + @Test + public void testParameters() throws Exception { + Component component = context().getComponent("paho"); + + ComponentVerifierExtension verifier = component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new); + + Map<String, Object> parameters = new HashMap<>(); + parameters.put("brokerUrl", "l"); + + ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters); + + Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus()); + } + + @Test + public void testConnectivity() throws Exception { + Component component = context().getComponent("paho"); + ComponentVerifierExtension verifier = component.getExtension(ComponentVerifierExtension.class).orElseThrow(IllegalStateException::new); + + Map<String, Object> parameters = new HashMap<>(); + parameters.put("brokerUrl", "l"); + + ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters); + + Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus()); + } + +} -- To stop receiving notification emails like this one, please contact [email protected].
