[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565393111



##
File path: 
components/camel-huaweicloud-smn/src/test/resources/testconfiguration.properties
##
@@ -0,0 +1,6 @@
+## Test configurations

Review comment:
   License header added





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565392653



##
File path: components/camel-huaweicloud-smn/src/test/resources/log4j2.properties
##
@@ -0,0 +1,7 @@
+

Review comment:
   Thanks for pointing. License headers added. 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565370884



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationUtils.java
##
@@ -0,0 +1,69 @@
+/*
+ * 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.huaweicloud.smn;
+
+import com.huaweicloud.sdk.core.region.Region;
+import com.huaweicloud.sdk.smn.v2.region.SmnRegion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * utility functions for the component
+ */
+public class SimpleNotificationUtils {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationUtils.class.getName());
+
+/**
+ * resolves endpoint url for the given region
+ * 
+ * @param  region
+ * @return
+ */
+public static String resolveSmnServiceEndpoint(String region) {
+if (region == null) {
+return null;
+}
+
+String result = null;
+
+try {
+String formattedEndpointKey = formatEndpointKey(region);

Review comment:
   @WillemJiang - I have removed reflections completely from component 
code. I see it used inside the unit test  for models. I guess will just remove 
the testing classes ClientConfigurations and ServiceKeys. It's an overkill I 
guess. Removing it and checking in the code. 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565370884



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationUtils.java
##
@@ -0,0 +1,69 @@
+/*
+ * 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.huaweicloud.smn;
+
+import com.huaweicloud.sdk.core.region.Region;
+import com.huaweicloud.sdk.smn.v2.region.SmnRegion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * utility functions for the component
+ */
+public class SimpleNotificationUtils {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationUtils.class.getName());
+
+/**
+ * resolves endpoint url for the given region
+ * 
+ * @param  region
+ * @return
+ */
+public static String resolveSmnServiceEndpoint(String region) {
+if (region == null) {
+return null;
+}
+
+String result = null;
+
+try {
+String formattedEndpointKey = formatEndpointKey(region);

Review comment:
   I have removed reflections completely from component code. I see it used 
inside the unit test  for models. I guess will just remove the testing classes 
ClientConfigurations and ServiceKeys. It's an overkill I guess. Removing it and 
checking in the code. 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565359436



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,363 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+validateAndInitializeSmnClient((SimpleNotificationEndpoint) 
super.getEndpoint());

Review comment:
   Looks like SmnClient class from SDK library doesn't have a close method. 
So skipping doStop adjustments. I will drop a recommendation to the sdk team to 
have this in future releases. 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565358080



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,363 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnProperties;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+validateAndInitializeSmnClient((SimpleNotificationEndpoint) 
super.getEndpoint());

Review comment:
   @omarsmak Thats a great way. I just overrid the doStart() method of 
parent DefaultProducer. Code checked in . thanks





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565356560



##
File path: components/camel-huaweicloud-smn/pom.xml
##
@@ -0,0 +1,121 @@
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>

Review comment:
   License header has been added and checked in now. 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-27 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565356201



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/constants/SmnProperties.java
##
@@ -0,0 +1,19 @@
+package org.apache.camel.component.huaweicloud.smn.constants;
+
+public class SmnProperties {
+
+public SmnProperties() {
+}
+
+// request properties
+public static String TEMPLATE_NAME = "CamelHwCloudSmnTemplateName";

Review comment:
   good catch :) just checked in the fix. thanks 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565029333



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;
+}
+
+public void process(Exchange exchange) throws Exception {
+
+/**
+ * the produce method is invoked when a message arrives at producer 
endpoint (lazy init of SmnClient on first
+ * message)
+ */
+if (this.smnClient == null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Initializing the SmnClient");
+}
+validateAndInitializeSmnClient(simpleNotificationEndpoint);
+}
+
+String service = simpleNotificationEndpoint.getSmnService();
+
+if (!ObjectHelper.isEmpty(service)) {
+switch (service) {
+case SmnServices.PUBLISH_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using message publishing service");
+}
+
performPublishMessageServiceOperations(simpleNotificationEndpoint, exchange);
+if (LOG.isDebugEnabled()) {
+LOG.debug("Completed publishing message");
+}
+break;
+default:
+if (LOG.isErrorEnabled()) {
+LOG.error("Unsupported service name {}", service);
+}
+throw new 
UnsupportedOperationException(String.format("service %s is not a supported 
service", service));
+}
+} else {
+if (LOG.isErrorEnabled()) {
+LOG.error("Service name is null/empty");
+}
+throw new IllegalStateException("service name cannot be 
null/empty");
+}
+}
+
+/**
+ * Publish message service operations
+ *
+ * @param endpoint
+ * @param exchange
+ */
+private void 
performPublishMessageServiceOperations(SimpleNotificationEndpoint endpoint, 
Exchange exchange) {
+PublishMessageResponse response;
+
+PublishMessageRequestBody apiBody;
+this.clientConfigurations = validateServiceConfigurations(endpoint, 
exchange);
+
+if (LOG.isDebugEnabled()) {
+LOG.debug("Checking operation name");
+}
+switch (clientConfigurations.getOperation()) {
+
+case SmnOperations.PUBLISH_AS_TEXT_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Publishing as text message");
+}
+apiBody = new PublishMessageRequestBody()
+

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565025883



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.huaweicloud.smn.models.ServiceKeys;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
+public class PublishTemplatedMessageTest extends CamelTestSupport {
+
+private static final Logger LOGGER = 
LoggerFactory.getLogger(PublishTemplatedMessageTest.class.getName());
+private static int wiremockServerPort = 8080;
+
+TestConfiguration testConfiguration = new TestConfiguration();
+
+WireMockServer wireMockServer;
+
+@BindToRegistry("serviceKeys")
+ServiceKeys serviceKeys
+= new ServiceKeys(testConfiguration.getProperty("authKey"), 
testConfiguration.getProperty("secretKey"));
+
+protected RouteBuilder createRouteBuilder() throws Exception {
+
+// populating tag values. user has to adjust the map entries according 
to the structure of their respective templates
+Map tags = new HashMap<>();
+tags.put("name", "reji");
+tags.put("phone", "1234567890");
+
+return new RouteBuilder() {
+public void configure() {
+from("direct:publish_templated_message")
+.setProperty("CamelHwCloudSmnSubject", constant("This 
is my subjectline"))
+.setProperty("CamelHwCloudSmnTopic", 
constant(testConfiguration.getProperty("topic")))
+.setProperty("CamelHwCloudSmnMessageTtl", constant(60))
+.setProperty("CamelHwCloudSmnTemplateTags", 
constant(tags))
+.setProperty("CamelHwCloudSmnTemplateName", 
constant("hello-template"))
+
//.to("hwcloud-smn:publishMessageService?serviceKeys=#serviceKeys=publishAsTemplatedMessage"+"="+testConfiguration.getProperty("projectId")+"="+testConfiguration.getProperty("region")+"=localhost=3128=true")
+
.to("hwcloud-smn:publishMessageService?serviceKeys=#serviceKeys=publishAsTemplatedMessage"
++ "=" + 
testConfiguration.getProperty("projectId") + "="
++ testConfiguration.getProperty("region") + 
"=true")
+.log("templated notification sent")
+.to("mock:publish_templated_message_result");
+}
+};
+}
+
+private void setupSimpleNotificationsUtilsMock() {
+try {
+Mockito.mockStatic(SimpleNotificationUtils.class);
+
Mockito.when(SimpleNotificationUtils.resolveSmnServiceEndpoint("unit-test"))
+.thenReturn("http://localhost:; + wiremockServerPort);
+} catch (MockitoException e) {
+LOGGER.info("Mock already registered. Using existing 
registration");
+}
+}
+
+@Test
+public void testTemplatedNotificationSend() throws Exception {
+boolean isMockedServerTest = 
testConfiguration.getProperty("region").equals("unit-test");
+if (isMockedServerTest) {
+LOGGER.info("region is unit-test. Starting up wiremock stubs");
+initWireMock();
+setupSimpleNotificationsUtilsMock();
+}
+
+MockEndpoint mock = 
getMockEndpoint("mock:publish_templated_message_result");
+mock.expectedMinimumMessageCount(1);
+template.sendBody("direct:publish_templated_message", null);
+Exchange responseExchange = mock.getExchanges().get(0);
+
+mock.assertIsSatisfied();
+
+
Assert.assertNotNull(responseExchange.getProperty("CamelSmnMesssageId"));
+
Assert.assertNotNull(responseExchange.getProperty("CamelSmnRequestId"));
+
Assert.assertTrue(responseExchange.getProperty("CamelSmnMesssageId").toString().length()
 > 0);
+
Assert.assertTrue(responseExchange.getProperty("CamelSmnRequestId").toString().length()
 > 0);
+
+if (isMockedServerTest) {
+Assert.assertEquals("bf94b63a5dfb475994d3ac34664e24f2", 
responseExchange.getProperty("CamelSmnMesssageId"));
+

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565025677



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationUtils.java
##
@@ -0,0 +1,69 @@
+/*
+ * 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.huaweicloud.smn;
+
+import com.huaweicloud.sdk.core.region.Region;
+import com.huaweicloud.sdk.smn.v2.region.SmnRegion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * utility functions for the component
+ */
+public class SimpleNotificationUtils {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationUtils.class.getName());
+
+/**
+ * resolves endpoint url for the given region
+ * 
+ * @param  region
+ * @return
+ */
+public static String resolveSmnServiceEndpoint(String region) {
+if (region == null) {
+return null;
+}
+
+String result = null;
+
+try {
+String formattedEndpointKey = formatEndpointKey(region);

Review comment:
   Usage of reflection has been removed completely





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565025533



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;
+}
+
+public void process(Exchange exchange) throws Exception {
+
+/**
+ * the produce method is invoked when a message arrives at producer 
endpoint (lazy init of SmnClient on first
+ * message)
+ */
+if (this.smnClient == null) {

Review comment:
   lazy initialization has been removed. instead moved the routine call 
inside constructor





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565025341



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;
+}
+
+public void process(Exchange exchange) throws Exception {
+
+/**
+ * the produce method is invoked when a message arrives at producer 
endpoint (lazy init of SmnClient on first
+ * message)
+ */
+if (this.smnClient == null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Initializing the SmnClient");
+}
+validateAndInitializeSmnClient(simpleNotificationEndpoint);
+}
+
+String service = simpleNotificationEndpoint.getSmnService();
+
+if (!ObjectHelper.isEmpty(service)) {
+switch (service) {
+case SmnServices.PUBLISH_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using message publishing service");
+}
+
performPublishMessageServiceOperations(simpleNotificationEndpoint, exchange);
+if (LOG.isDebugEnabled()) {
+LOG.debug("Completed publishing message");
+}
+break;
+default:
+if (LOG.isErrorEnabled()) {
+LOG.error("Unsupported service name {}", service);
+}
+throw new 
UnsupportedOperationException(String.format("service %s is not a supported 
service", service));
+}
+} else {
+if (LOG.isErrorEnabled()) {
+LOG.error("Service name is null/empty");
+}
+throw new IllegalStateException("service name cannot be 
null/empty");

Review comment:
   It was just a personal choice. I have removed the lazy initialization to 
class init time 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565025146



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.huaweicloud.smn.models.ServiceKeys;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;

Review comment:
   Suggestion has been incorporated into the code. Main codebase has been 
re-visited to  make it  more testable with above suggestion





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024902



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationUtils.java
##
@@ -0,0 +1,69 @@
+/*
+ * 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.huaweicloud.smn;
+
+import com.huaweicloud.sdk.core.region.Region;
+import com.huaweicloud.sdk.smn.v2.region.SmnRegion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * utility functions for the component
+ */
+public class SimpleNotificationUtils {

Review comment:
   Added private constructor





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024787



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/constants/SmnConstants.java
##
@@ -0,0 +1,22 @@
+/*
+ * 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.huaweicloud.smn.constants;
+
+public class SmnConstants {

Review comment:
   Added private constructor





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024654



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;
+}
+
+public void process(Exchange exchange) throws Exception {
+
+/**
+ * the produce method is invoked when a message arrives at producer 
endpoint (lazy init of SmnClient on first
+ * message)
+ */
+if (this.smnClient == null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Initializing the SmnClient");
+}
+validateAndInitializeSmnClient(simpleNotificationEndpoint);
+}
+
+String service = simpleNotificationEndpoint.getSmnService();
+
+if (!ObjectHelper.isEmpty(service)) {
+switch (service) {
+case SmnServices.PUBLISH_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using message publishing service");
+}
+
performPublishMessageServiceOperations(simpleNotificationEndpoint, exchange);
+if (LOG.isDebugEnabled()) {
+LOG.debug("Completed publishing message");
+}
+break;
+default:
+if (LOG.isErrorEnabled()) {
+LOG.error("Unsupported service name {}", service);
+}
+throw new 
UnsupportedOperationException(String.format("service %s is not a supported 
service", service));
+}
+} else {
+if (LOG.isErrorEnabled()) {
+LOG.error("Service name is null/empty");
+}
+throw new IllegalStateException("service name cannot be 
null/empty");
+}
+}
+
+/**
+ * Publish message service operations
+ *
+ * @param endpoint
+ * @param exchange
+ */
+private void 
performPublishMessageServiceOperations(SimpleNotificationEndpoint endpoint, 
Exchange exchange) {
+PublishMessageResponse response;
+
+PublishMessageRequestBody apiBody;
+this.clientConfigurations = validateServiceConfigurations(endpoint, 
exchange);
+
+if (LOG.isDebugEnabled()) {
+LOG.debug("Checking operation name");
+}
+switch (clientConfigurations.getOperation()) {
+
+case SmnOperations.PUBLISH_AS_TEXT_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Publishing as text message");
+}
+apiBody = new PublishMessageRequestBody()
+

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024581



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;
+}
+
+public void process(Exchange exchange) throws Exception {
+
+/**
+ * the produce method is invoked when a message arrives at producer 
endpoint (lazy init of SmnClient on first
+ * message)
+ */
+if (this.smnClient == null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Initializing the SmnClient");
+}
+validateAndInitializeSmnClient(simpleNotificationEndpoint);
+}
+
+String service = simpleNotificationEndpoint.getSmnService();
+
+if (!ObjectHelper.isEmpty(service)) {
+switch (service) {
+case SmnServices.PUBLISH_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using message publishing service");
+}
+
performPublishMessageServiceOperations(simpleNotificationEndpoint, exchange);
+if (LOG.isDebugEnabled()) {
+LOG.debug("Completed publishing message");
+}
+break;
+default:
+if (LOG.isErrorEnabled()) {
+LOG.error("Unsupported service name {}", service);
+}
+throw new 
UnsupportedOperationException(String.format("service %s is not a supported 
service", service));
+}
+} else {
+if (LOG.isErrorEnabled()) {
+LOG.error("Service name is null/empty");
+}
+throw new IllegalStateException("service name cannot be 
null/empty");
+}
+}
+
+/**
+ * Publish message service operations
+ *
+ * @param endpoint
+ * @param exchange
+ */
+private void 
performPublishMessageServiceOperations(SimpleNotificationEndpoint endpoint, 
Exchange exchange) {
+PublishMessageResponse response;
+
+PublishMessageRequestBody apiBody;
+this.clientConfigurations = validateServiceConfigurations(endpoint, 
exchange);
+
+if (LOG.isDebugEnabled()) {
+LOG.debug("Checking operation name");
+}
+switch (clientConfigurations.getOperation()) {
+
+case SmnOperations.PUBLISH_AS_TEXT_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Publishing as text message");
+}
+apiBody = new PublishMessageRequestBody()
+

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024384



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;

Review comment:
   Redundancy removed from the code





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024294



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.huaweicloud.smn.models.ServiceKeys;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
+public class PublishTemplatedMessageTest extends CamelTestSupport {

Review comment:
   Removed wiremocks (as it can potentially cause port conflicts in worst 
case). Referred testing strategy of aws-s3 camel component by mocking SmnClient 





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565024025



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.huaweicloud.smn.models.ServiceKeys;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
+public class PublishTemplatedMessageTest extends CamelTestSupport {
+
+private static final Logger LOGGER = 
LoggerFactory.getLogger(PublishTemplatedMessageTest.class.getName());
+private static int wiremockServerPort = 8080;
+
+TestConfiguration testConfiguration = new TestConfiguration();
+
+WireMockServer wireMockServer;
+
+@BindToRegistry("serviceKeys")
+ServiceKeys serviceKeys
+= new ServiceKeys(testConfiguration.getProperty("authKey"), 
testConfiguration.getProperty("secretKey"));
+
+protected RouteBuilder createRouteBuilder() throws Exception {
+
+// populating tag values. user has to adjust the map entries according 
to the structure of their respective templates
+Map tags = new HashMap<>();
+tags.put("name", "reji");
+tags.put("phone", "1234567890");
+
+return new RouteBuilder() {
+public void configure() {
+from("direct:publish_templated_message")
+.setProperty("CamelHwCloudSmnSubject", constant("This 
is my subjectline"))
+.setProperty("CamelHwCloudSmnTopic", 
constant(testConfiguration.getProperty("topic")))
+.setProperty("CamelHwCloudSmnMessageTtl", constant(60))
+.setProperty("CamelHwCloudSmnTemplateTags", 
constant(tags))
+.setProperty("CamelHwCloudSmnTemplateName", 
constant("hello-template"))
+
//.to("hwcloud-smn:publishMessageService?serviceKeys=#serviceKeys=publishAsTemplatedMessage"+"="+testConfiguration.getProperty("projectId")+"="+testConfiguration.getProperty("region")+"=localhost=3128=true")
+
.to("hwcloud-smn:publishMessageService?serviceKeys=#serviceKeys=publishAsTemplatedMessage"
++ "=" + 
testConfiguration.getProperty("projectId") + "="
++ testConfiguration.getProperty("region") + 
"=true")
+.log("templated notification sent")
+.to("mock:publish_templated_message_result");
+}
+};
+}
+
+private void setupSimpleNotificationsUtilsMock() {
+try {
+Mockito.mockStatic(SimpleNotificationUtils.class);

Review comment:
   This is completely 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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565023971



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.huaweicloud.smn.models.ServiceKeys;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+
+public class PublishTemplatedMessageTest extends CamelTestSupport {
+
+private static final Logger LOGGER = 
LoggerFactory.getLogger(PublishTemplatedMessageTest.class.getName());
+private static int wiremockServerPort = 8080;

Review comment:
   as suggested by @omarsmak , have removed external mocks and instead 
mocked the SmnClient class and stubbed the operation method





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r565023737



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;

Review comment:
   License header added on all test files





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-26 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r564774880



##
File path: 
components/camel-huaweicloud-smn/src/test/java/org/apache/camel/component/huaweicloud/smn/PublishTemplatedMessageTest.java
##
@@ -0,0 +1,129 @@
+package org.apache.camel.component.huaweicloud.smn;
+
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.verification.LoggedRequest;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.huaweicloud.smn.models.ServiceKeys;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.exceptions.base.MockitoException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;

Review comment:
   Sounds like a better idea. I will get the wiremock removed and instead 
have a mocked client. Thanks





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.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel] mathewsreji commented on a change in pull request #4900: [CAMEL-16001] Camel component for HuaweiCloud Simple Notification Services (SMN) se…

2021-01-19 Thread GitBox 


mathewsreji commented on a change in pull request #4900:
URL: https://github.com/apache/camel/pull/4900#discussion_r560303397



##
File path: 
components/camel-huaweicloud-smn/src/main/java/org/apache/camel/component/huaweicloud/smn/SimpleNotificationProducer.java
##
@@ -0,0 +1,366 @@
+/*
+ * 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.huaweicloud.smn;
+
+import java.util.HashMap;
+
+import com.huaweicloud.sdk.core.auth.BasicCredentials;
+import com.huaweicloud.sdk.core.http.HttpConfig;
+import com.huaweicloud.sdk.smn.v2.SmnClient;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequest;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageRequestBody;
+import com.huaweicloud.sdk.smn.v2.model.PublishMessageResponse;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnConstants;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnOperations;
+import org.apache.camel.component.huaweicloud.smn.constants.SmnServices;
+import org.apache.camel.component.huaweicloud.smn.models.ClientConfigurations;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SimpleNotificationProducer extends DefaultProducer {
+private static final Logger LOG = 
LoggerFactory.getLogger(SimpleNotificationProducer.class);
+private SimpleNotificationEndpoint simpleNotificationEndpoint;
+private SmnClient smnClient;
+private ClientConfigurations clientConfigurations;
+
+public SimpleNotificationProducer(SimpleNotificationEndpoint endpoint) {
+super(endpoint);
+this.simpleNotificationEndpoint = endpoint;
+}
+
+public void process(Exchange exchange) throws Exception {
+
+/**
+ * the produce method is invoked when a message arrives at producer 
endpoint (lazy init of SmnClient on first
+ * message)
+ */
+if (this.smnClient == null) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Initializing the SmnClient");
+}
+validateAndInitializeSmnClient(simpleNotificationEndpoint);
+}
+
+String service = simpleNotificationEndpoint.getSmnService();
+
+if (!ObjectHelper.isEmpty(service)) {
+switch (service) {
+case SmnServices.PUBLISH_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Using message publishing service");
+}
+
performPublishMessageServiceOperations(simpleNotificationEndpoint, exchange);
+if (LOG.isDebugEnabled()) {
+LOG.debug("Completed publishing message");
+}
+break;
+default:
+if (LOG.isErrorEnabled()) {
+LOG.error("Unsupported service name {}", service);
+}
+throw new 
UnsupportedOperationException(String.format("service %s is not a supported 
service", service));
+}
+} else {
+if (LOG.isErrorEnabled()) {
+LOG.error("Service name is null/empty");
+}
+throw new IllegalStateException("service name cannot be 
null/empty");
+}
+}
+
+/**
+ * Publish message service operations
+ *
+ * @param endpoint
+ * @param exchange
+ */
+private void 
performPublishMessageServiceOperations(SimpleNotificationEndpoint endpoint, 
Exchange exchange) {
+PublishMessageResponse response;
+
+PublishMessageRequestBody apiBody;
+this.clientConfigurations = validateServiceConfigurations(endpoint, 
exchange);
+
+if (LOG.isDebugEnabled()) {
+LOG.debug("Checking operation name");
+}
+switch (clientConfigurations.getOperation()) {
+
+case SmnOperations.PUBLISH_AS_TEXT_MESSAGE:
+if (LOG.isDebugEnabled()) {
+LOG.debug("Publishing as text message");
+}
+apiBody = new PublishMessageRequestBody()
+