Refactor code in a reusable way and change response messages

Removed repeated classes and implemented code to already existing classes and divided code into sub methods to limit repetitive code and increase readability. And the response messages were change in order to give users a better understating of the responses they get when calling the api endpoints.

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/Adapter.java

@@ -29,10 +29,13 @@ public class Adapter {
     @ApiModelProperty(value = "Attached stream name:version")
     private String eventStreamWithVersion;
     @ApiModelProperty(value = "Adapter type")
-    private AdapterType adapterType;
+    private TransportType adapterType;
     @ApiModelProperty(value = "Adapter main configurations")
     private AdapterConfiguration adapterConfiguration;
 
+    @ApiModelProperty(value = "Adapter definition", notes = "use only when creating adapter as a String")
+    private String definition;
+
     public String getAdapterName() {
         return adapterName;
     }
@@ -49,11 +52,11 @@ public class Adapter {
         this.eventStreamWithVersion = eventStreamWithVersion;
     }
 
-    public AdapterType getAdapterType() {
+    public TransportType getAdapterType() {
         return adapterType;
     }
 
-    public void setAdapterType(AdapterType adapterType) {
+    public void setAdapterType(TransportType adapterType) {
         this.adapterType = adapterType;
     }
 
@@ -65,4 +68,12 @@ public class Adapter {
             AdapterConfiguration adapterConfiguration) {
         this.adapterConfiguration = adapterConfiguration;
     }
+
+    public String getDefinition() {
+        return definition;
+    }
+
+    public void setDefinition(String definition) {
+        this.definition = definition;
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AdapterMappingConfiguration.java

@@ -18,6 +18,8 @@
 package org.wso2.carbon.device.mgt.jaxrs.beans.analytics;
 
 import io.swagger.annotations.ApiModelProperty;
+
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,15 +32,15 @@ public class AdapterMappingConfiguration {
     @ApiModelProperty(value = "Input mapping for json,text and xml mappings")
     private String inputMappingString;
     @ApiModelProperty(value = "Input mapping for json,map and xml mappings")
-    private List<MappingProperty> inputMappingProperties;
+    private List<MappingProperty> inputMappingProperties = new ArrayList<>();
     @ApiModelProperty(value = "Name-scape mapping for xml mapping")
-    private List<MappingProperty> namespaceMappingProperties;
+    private List<MappingProperty> namespaceMappingProperties = new ArrayList<>();
     @ApiModelProperty(value = "Correlation mapping for wso2 mapping")
-    private List<MappingProperty> correlationMappingProperties;
+    private List<MappingProperty> correlationMappingProperties = new ArrayList<>();
     @ApiModelProperty(value = "Payload mapping for wso2 mapping")
-    private List<MappingProperty> payloadMappingProperties;
+    private List<MappingProperty> payloadMappingProperties = new ArrayList<>();
     @ApiModelProperty(value = "Meta mapping for wso2 mapping")
-    private List<MappingProperty> metaMappingProperties;
+    private List<MappingProperty> metaMappingProperties = new ArrayList<>();
 
     public MessageFormat getMessageFormat() {
         return messageFormat;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/AdapterType.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
- *
- * Entgra (pvt) Ltd. 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.wso2.carbon.device.mgt.jaxrs.beans.analytics;
-
-/**
- * Available adapter types
- */
-public enum AdapterType {
-    EMAIL, FILE_TAIL, HTTP, IOT_EVENT, JMS, KAFKA, MQTT, OAUTH_MQTT, SOAP, WEBSOCKET, WEBSOCKET_LOCAL,
-    WSO2_EVENT, XMPP, UI, RDBMS, SECURED_WEBSOCKET, CASSANDRA, LOGGER;
-
-    public String toStringFormatted() {
-        return super.toString().toLowerCase().replace("_", "-");
-    }
-}

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventPublisher.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
- *
- * Entgra (pvt) Ltd. 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.wso2.carbon.device.mgt.jaxrs.beans.analytics;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class EventPublisher {
-    @ApiModelProperty(value = "Publisher definition")
-    private String definition;
-
-    public String getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(String definition) {
-        this.definition = definition;
-    }
-}

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventReceiver.java

@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
- *
- * Entgra (pvt) Ltd. 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.wso2.carbon.device.mgt.jaxrs.beans.analytics;
-
-import io.swagger.annotations.ApiModelProperty;
-
-public class EventReceiver {
-    @ApiModelProperty(value = "Stream definition")
-    private String definition;
-
-    public String getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(String definition) {
-        this.definition = definition;
-    }
-}

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/EventStream.java

@@ -42,7 +42,7 @@ public class EventStream {
     @ApiModelProperty(value = "Payload attribute list")
     private List<Attribute> payloadData = new ArrayList<>();
 
-    @ApiModelProperty(value = "Stream definition")
+    @ApiModelProperty(value = "Stream definition" , notes = "use only when creating stream as a String")
     private String definition;
 
     public String getName() {

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/analytics/TransportType.java

@@ -21,6 +21,11 @@ package org.wso2.carbon.device.mgt.jaxrs.beans.analytics;
  * This hold the default transport types support by the server.
  */
 public enum TransportType {
-    HTTP, MQTT;
+    EMAIL, FILE_TAIL, HTTP, IOT_EVENT, JMS, KAFKA, MQTT, OAUTH_MQTT, SOAP, WEBSOCKET, WEBSOCKET_LOCAL,
+    WSO2_EVENT, XMPP, UI, RDBMS, SECURED_WEBSOCKET, CASSANDRA, LOGGER;
+
+    public String toStringFormatted() {
+        return super.toString().toLowerCase().replace("_", "-");
+    }
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/exception/InvalidExecutionPlanException.java

@@ -28,11 +28,11 @@ public class InvalidExecutionPlanException extends WebApplicationException {
     private static final long serialVersionUID = 7583096344745990515L;
 
     public InvalidExecutionPlanException(ErrorResponse error) {
-        super(Response.status(Response.Status.NOT_FOUND).entity(error).build());
+        super(Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(error).build());
     }
 
     public InvalidExecutionPlanException(ErrorDTO errorDTO) {
-        super(Response.status(Response.Status.NOT_FOUND)
+        super(Response.status(Response.Status.INTERNAL_SERVER_ERROR)
                       .entity(errorDTO)
                       .header(Constants.DeviceConstants.HEADER_CONTENT_TYPE, Constants.DeviceConstants.APPLICATION_JSON)
                       .build());

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/AnalyticsArtifactsManagementService.java

@@ -24,8 +24,6 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.Adapter;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.EventStream;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.SiddhiExecutionPlan;
-import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.EventPublisher;
-import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.EventReceiver;
 import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import io.swagger.annotations.Api;
@@ -258,7 +256,7 @@ public interface AnalyticsArtifactsManagementService {
             @QueryParam("isEdited") boolean isEdited,
             @ApiParam(name = "receiver", value = "Add the data to complete the EventReceiver object.",
                     required = true)
-            @Valid EventReceiver receiver);
+            @Valid Adapter receiver);
 
     @POST
     @Path("/receiver")
@@ -366,7 +364,7 @@ public interface AnalyticsArtifactsManagementService {
             @QueryParam("isEdited") boolean isEdited,
             @ApiParam(name = "publisher", value = "Add the data to complete the EventPublisher object.",
                     required = true)
-            @Valid EventPublisher publisher);
+            @Valid Adapter publisher);
 
     @POST
     @Path("/publisher")

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/AnalyticsArtifactsManagementServiceImpl.java

@@ -26,8 +26,6 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.AdapterConfiguration;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.AdapterProperty;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.MessageFormat;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.SiddhiExecutionPlan;
-import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.EventPublisher;
-import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.EventReceiver;
 import org.wso2.carbon.device.mgt.jaxrs.exception.BadRequestException;
 import org.wso2.carbon.device.mgt.jaxrs.exception.ErrorDTO;
 import org.wso2.carbon.device.mgt.jaxrs.exception.InvalidExecutionPlanException;
@@ -118,22 +116,22 @@ public class AnalyticsArtifactsManagementServiceImpl
     public Response deployEventDefinitionAsDto(@Valid EventStream stream) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         try {
-            publishStream(stream);
+            deployStream(stream);
             return Response.ok().build();
         } catch (AxisFault e) {
-            String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
+            String errMsg = "Failed to create event definitions for tenant " + tenantDomain;
             log.error(errMsg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (RemoteException e) {
-            String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
+            String errMsg = "Failed to connect with the remote services for tenant " + tenantDomain;
             log.error(errMsg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (JWTClientException e) {
-            String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
+            String errMsg = "Failed to generate jwt token for tenant " + tenantDomain;
             log.error(errMsg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (UserStoreException e) {
-            String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
+            String errMsg = "Failed to connect with the user store for tenant " + tenantDomain;
             log.error(errMsg, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         }
@@ -144,7 +142,7 @@ public class AnalyticsArtifactsManagementServiceImpl
     @Path("/receiver/{name}")
     public Response deployEventReceiverAsString(@PathParam("name") String name,
                                                 @QueryParam("isEdited") boolean isEdited,
-                                                @Valid EventReceiver receiver) {
+                                                @Valid Adapter receiver) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         EventReceiverAdminServiceStub eventReceiverAdminServiceStub;
         try {
@@ -155,20 +153,24 @@ public class AnalyticsArtifactsManagementServiceImpl
             } else {
                 eventReceiverAdminServiceStub.editActiveEventReceiverConfiguration(receiverDefinition, name);
             }
+            return Response.ok().build();
         } catch (AxisFault e) {
-            log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (RemoteException e) {
-            log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (JWTClientException e) {
-            log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (UserStoreException e) {
-            log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         }
-        return Response.ok().entity(name).build();
     }
 
     @Override
@@ -176,59 +178,31 @@ public class AnalyticsArtifactsManagementServiceImpl
     @Path("/receiver")
     public Response deployEventReceiverAsDto(@Valid Adapter receiver) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
-        String receiverName = receiver.getAdapterName();
-        String adapterType = receiver.getAdapterType().toStringFormatted();
-        AdapterConfiguration adapterConfiguration = receiver.getAdapterConfiguration();
-        AdapterMappingConfiguration adapterMappingConfiguration = adapterConfiguration.getAdapterMappingConfiguration();
-
         try {
-            List<AdapterProperty> adapterProperties = adapterConfiguration.getAdapterProperties();
+            AdapterConfiguration adapterConfiguration = receiver.getAdapterConfiguration();
-            if (adapterProperties == null) {
-                log.error("Invalid attribute payload");
-                return Response.status(Response.Status.BAD_REQUEST).build();
-            }
-
             boolean customMapping = adapterConfiguration.isCustomMappingEnabled();
-            List<MappingProperty> inputMappingProperties = adapterMappingConfiguration.getInputMappingProperties();
+            validateAdapterProperties(adapterConfiguration.getAdapterProperties());
-            List<MappingProperty> namespaceMappingProperties = adapterMappingConfiguration.getNamespaceMappingProperties();
+            if (customMapping) {
-            List<MappingProperty> correlationMappingProperties = adapterMappingConfiguration.getCorrelationMappingProperties();
+                validateAdapterMapping(adapterConfiguration.getAdapterMappingConfiguration());
-            List<MappingProperty> payloadMappingProperties = adapterMappingConfiguration.getPayloadMappingProperties();
-            List<MappingProperty> metaMappingProperties = adapterMappingConfiguration.getMetaMappingProperties();
-            MessageFormat messageFormat = adapterMappingConfiguration.getMessageFormat();
-            /*
-             * Conditions
-             * - if CustomMappingEnabled check validity of property lists
-             * - if both inputMappingProperties and namespaceMappingProperties null check remaining property lists
-             * - if all correlationMappingProperties, payloadMappingProperties, metaMappingProperties null log error
-             * - if message format is null change the final result to TRUE
-             * - else continue
-             * */
-            if ((customMapping &&
-                 (inputMappingProperties == null && namespaceMappingProperties == null) &&
-                 (correlationMappingProperties == null && payloadMappingProperties == null &&
-                  metaMappingProperties == null)) || messageFormat == null) {
-                String errMsg = "Invalid mapping payload";
-                log.error(errMsg);
-                return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
             }
-            String eventStreamWithVersion = receiver.getEventStreamWithVersion();
+            deployReceiver(receiver, customMapping, adapterConfiguration);
-
-            publishReceiver(receiverName, adapterType, adapterProperties, customMapping, inputMappingProperties,
-                            namespaceMappingProperties, correlationMappingProperties, payloadMappingProperties,
-                            metaMappingProperties, messageFormat, eventStreamWithVersion);
             return Response.ok().build();
         } catch (AxisFault e) {
-            log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (RemoteException e) {
-            log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (JWTClientException e) {
-            log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (UserStoreException e) {
-            log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         }
     }
 
@@ -237,33 +211,35 @@ public class AnalyticsArtifactsManagementServiceImpl
     @Path("/publisher/{name}")
     public Response deployEventPublisherAsString(@PathParam("name") String name,
                                                  @QueryParam("isEdited") boolean isEdited,
-                                                 @Valid EventPublisher publisher) {
+                                                 @Valid Adapter publisher) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         EventPublisherAdminServiceStub eventPublisherAdminServiceStub;
-
         try {
             String publisherDefinition = publisher.getDefinition();
-
             eventPublisherAdminServiceStub = DeviceMgtAPIUtils.getEventPublisherAdminServiceStub();
             if (!isEdited) {
                 eventPublisherAdminServiceStub.deployEventPublisherConfiguration(publisherDefinition);
             } else {
                 eventPublisherAdminServiceStub.editActiveEventPublisherConfiguration(publisherDefinition, name);
             }
+            return Response.ok().build();
         } catch (AxisFault e) {
-            log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (RemoteException e) {
-            log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (JWTClientException e) {
-            log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (UserStoreException e) {
-            log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         }
-        return Response.ok().entity(publisher).build();
     }
 
     @Override
@@ -271,59 +247,31 @@ public class AnalyticsArtifactsManagementServiceImpl
     @Path("/publisher")
     public Response deployEventPublisherAsDto(@Valid Adapter publisher) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
-        String publisherName = publisher.getAdapterName();
-        String adapterType = publisher.getAdapterType().toStringFormatted();
         AdapterConfiguration adapterConfiguration = publisher.getAdapterConfiguration();
-        AdapterMappingConfiguration adapterMappingConfiguration = adapterConfiguration.getAdapterMappingConfiguration();
-
         try {
-            List<AdapterProperty> adapterProperties = adapterConfiguration.getAdapterProperties();
+            validateAdapterProperties(adapterConfiguration.getAdapterProperties());
-            if (adapterProperties == null) {
-                log.error("Invalid attribute payload");
-                return Response.status(Response.Status.BAD_REQUEST).build();
-            }
-
             boolean customMapping = adapterConfiguration.isCustomMappingEnabled();
-            String inputMappingString = adapterMappingConfiguration.getInputMappingString();
+            if (customMapping) {
-            List<MappingProperty> inputMappingProperties = adapterMappingConfiguration.getInputMappingProperties();
+                validateAdapterMapping(adapterConfiguration.getAdapterMappingConfiguration());
-            List<MappingProperty> correlationMappingProperties = adapterMappingConfiguration.getCorrelationMappingProperties();
-            List<MappingProperty> payloadMappingProperties = adapterMappingConfiguration.getPayloadMappingProperties();
-            List<MappingProperty> metaMappingProperties = adapterMappingConfiguration.getMetaMappingProperties();
-            MessageFormat messageFormat = adapterMappingConfiguration.getMessageFormat();
-            /*
-             * Conditions
-             * - if CustomMappingEnabled check validity of property lists
-             * - if all correlationMappingProperties, payloadMappingProperties, metaMappingProperties null log error
-             * - if message format is null change the final result to TRUE
-             * - else continue
-             */
-            if ((customMapping &&
-                 (inputMappingProperties == null && inputMappingString == null) &&
-                 (correlationMappingProperties == null && payloadMappingProperties == null &&
-                  metaMappingProperties == null)) || messageFormat == null) {
-                String errMsg = "Invalid mapping payload";
-                log.error(errMsg);
-                return Response.status(Response.Status.BAD_REQUEST).entity(errMsg).build();
             }
-            String eventStreamWithVersion = publisher.getEventStreamWithVersion();
+            deployPublisher(publisher, customMapping, adapterConfiguration);
-
-            publishPublisher(publisherName, adapterType, adapterProperties, customMapping
-                    , inputMappingString, inputMappingProperties, correlationMappingProperties
-                    , payloadMappingProperties, metaMappingProperties, messageFormat
-                    , eventStreamWithVersion);
             return Response.ok().build();
         } catch (AxisFault e) {
-            log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (RemoteException e) {
-            log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (JWTClientException e) {
-            log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (UserStoreException e) {
-            log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         }
     }
 
@@ -338,46 +286,46 @@ public class AnalyticsArtifactsManagementServiceImpl
             publishSiddhiExecutionPlan(name, isEdited, plan.getDefinition());
             return Response.ok().build();
         } catch (AxisFault e) {
-            log.error("Failed to create event definitions for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to create event definitions for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (RemoteException e) {
-            log.error("Failed to connect with the remote services for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the remote services for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
-        } catch (InvalidExecutionPlanException e) {
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
-            log.error("Invalid Execution plan: " + tenantDomain, e);
-            return e.getResponse();
         } catch (JWTClientException e) {
-            log.error("Failed to generate jwt token for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to generate jwt token for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         } catch (UserStoreException e) {
-            log.error("Failed to connect with the user store for tenantDomain: " + tenantDomain, e);
+            String errMsg = "Failed to connect with the user store for tenantDomain: " + tenantDomain;
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+            log.error(errMsg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(errMsg).build();
         }
     }
 
     /**
-     * Set data to a stream dto and publish dto using a stub
+     * Set data to a Stream dto and deploy dto through a stub
      *
      * @param stream Stream definition
-     * @throws RemoteException    Exception that may occur during a remote method call
-     * @throws UserStoreException Exception that may occur during JWT token generation
-     * @throws JWTClientException Exception that may occur during connecting to client store
      */
-    private void publishStream(EventStream stream)
+    private void deployStream(EventStream stream)
             throws RemoteException, UserStoreException, JWTClientException {
+        EventStreamAdminServiceStub eventStreamAdminServiceStub = null;
         List<Attribute> metaData = stream.getMetaData();
         List<Attribute> payloadData = stream.getPayloadData();
         List<Attribute> correlationData = stream.getCorrelationData();
         if (metaData.isEmpty() && correlationData.isEmpty() && payloadData.isEmpty()) {
-            String errMsg = "Invalid payload: event mapping attributes invalid!!!";
+            String errMsg = String.format("Failed to validate Stream property attributes of %s:%s",
+                                          stream.getName(), stream.getVersion());
             ErrorResponse errorResponse = new ErrorResponse();
             errorResponse.setMessage(errMsg);
             log.error(errMsg);
             throw new BadRequestException(errorResponse);
         }
-        EventStreamAdminServiceStub eventStreamAdminServiceStub =
-                DeviceMgtAPIUtils.getEventStreamAdminServiceStub();
         try {
+            eventStreamAdminServiceStub = DeviceMgtAPIUtils.getEventStreamAdminServiceStub();
+
             EventStreamDefinitionDto eventStreamDefinitionDto = new EventStreamDefinitionDto();
             eventStreamDefinitionDto.setName(stream.getName());
             eventStreamDefinitionDto.setVersion(stream.getVersion());
@@ -386,6 +334,7 @@ public class AnalyticsArtifactsManagementServiceImpl
             eventStreamDefinitionDto.setMetaData(addEventAttributesToDto(metaData));
             eventStreamDefinitionDto.setPayloadData(addEventAttributesToDto(payloadData));
             eventStreamDefinitionDto.setCorrelationData(addEventAttributesToDto(correlationData));
+
             String streamId = stream.getName() + ":" + stream.getVersion();
             if (eventStreamAdminServiceStub.getStreamDefinitionDto(streamId) != null) {
                 eventStreamAdminServiceStub.editEventStreamDefinitionAsDto(eventStreamDefinitionDto, streamId);
@@ -399,88 +348,75 @@ public class AnalyticsArtifactsManagementServiceImpl
     }
 
     /**
-     * Set data to a receiver dto and publish dto using a stub
+     * Set data to a receiver dto and deploy dto through a stub
      *
-     * @param receiverName                 Receiver name
+     * @param receiver             Event Receiver adapter
-     * @param adapterType                  Receiver type
+     * @param customMapping        Is Receiver mapped
-     * @param adapterProperties            Receiver properties
+     * @param adapterConfiguration Adapter property and mapping configuration
-     * @param customMapping                Is receiver mapped
-     * @param inputMappingProperties       Receiver input attribute mapping
-     * @param namespaceMappingProperties   Receiver name-scape attribute mapping
-     * @param correlationMappingProperties Receiver correlation attribute mapping
-     * @param payloadMappingProperties     Receiver payload attribute mapping
-     * @param metaMappingProperties        Receiver meta attribute mapping
-     * @param messageFormat                Receiver mapping format
-     * @param eventStreamWithVersion       Attached stream
      * @throws RemoteException    Exception that may occur during a remote method call
      * @throws UserStoreException Exception that may occur during JWT token generation
      * @throws JWTClientException Exception that may occur during connecting to client store
      */
-    private void publishReceiver(String receiverName, String adapterType,
+    private void deployReceiver(Adapter receiver, boolean customMapping,
-                                 List<AdapterProperty> adapterProperties, boolean customMapping,
+                                AdapterConfiguration adapterConfiguration)
-                                 List<MappingProperty> inputMappingProperties,
-                                 List<MappingProperty> namespaceMappingProperties,
-                                 List<MappingProperty> correlationMappingProperties,
-                                 List<MappingProperty> payloadMappingProperties,
-                                 List<MappingProperty> metaMappingProperties,
-                                 MessageFormat messageFormat,
-                                 String eventStreamWithVersion)
             throws RemoteException, UserStoreException, JWTClientException {
         EventReceiverAdminServiceStub eventReceiverAdminServiceStub = DeviceMgtAPIUtils.getEventReceiverAdminServiceStub();
 
         try {
+            String receiverName = receiver.getAdapterName();
+            String adapterType = receiver.getAdapterType().toStringFormatted();
+            String eventStreamWithVersion = receiver.getEventStreamWithVersion();
+            List<AdapterProperty> adapterProperties = adapterConfiguration.getAdapterProperties();
             EventReceiverConfigurationDto eventReceiverConfigurationDto = eventReceiverAdminServiceStub
                     .getActiveEventReceiverConfiguration(receiverName);
-
-            // Check if adapter already exists, if so un-deploy it
             if (eventReceiverConfigurationDto != null) {
                 eventReceiverAdminServiceStub.undeployActiveEventReceiverConfiguration(receiverName);
             }
+            BasicInputAdapterPropertyDto[] basicInputAdapterPropertyDtos = addReceiverConfigToDto(adapterProperties);
 
-            // Adding attribute properties to DTOs
+            AdapterMappingConfiguration adapterMappingConfiguration = adapterConfiguration.getAdapterMappingConfiguration();
-            BasicInputAdapterPropertyDto[] basicInputAdapterPropertyDtos =
+            MessageFormat messageFormat = adapterMappingConfiguration.getMessageFormat();
-                    addReceiverConfigToDto(adapterProperties);
+            if (!messageFormat.toString().equals("wso2event")) {
-
+                EventMappingPropertyDto[] inputMappingPropertyDtos =
-            if (eventReceiverAdminServiceStub.getActiveEventReceiverConfiguration(receiverName) == null) {
+                        addReceiverMappingToDto(adapterMappingConfiguration.getInputMappingProperties());
-                // Call stub deploy methods according to the message format
+                if (messageFormat.toString().equals("xml")) {
-                if (!messageFormat.toString().equals("wso2event")) {
+                    EventMappingPropertyDto[] namespaceMappingPropertyDtos =
-                    EventMappingPropertyDto[] inputMappingPropertyDtos =
+                            addReceiverMappingToDto(adapterMappingConfiguration.getNamespaceMappingProperties());
-                            addReceiverMappingToDto(inputMappingProperties);
+                    eventReceiverAdminServiceStub.deployXmlEventReceiverConfiguration(receiverName
-                    if (messageFormat.toString().equals("xml")) {
+                            , eventStreamWithVersion, adapterType, null
-                        EventMappingPropertyDto[] namespaceMappingPropertyDtos =
+                            , namespaceMappingPropertyDtos, inputMappingPropertyDtos
-                                addReceiverMappingToDto(namespaceMappingProperties);
+                            , basicInputAdapterPropertyDtos, customMapping);
-
+                } else {
-                        eventReceiverAdminServiceStub.deployXmlEventReceiverConfiguration(receiverName
+                    if (messageFormat.toString().equals("map")) {
-                                , eventStreamWithVersion, adapterType, null
+                        eventReceiverAdminServiceStub.deployMapEventReceiverConfiguration(receiverName
-                                , namespaceMappingPropertyDtos, inputMappingPropertyDtos
+                                , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
+                                , basicInputAdapterPropertyDtos, customMapping);
+                    } else if (messageFormat.toString().equals("text")) {
+                        eventReceiverAdminServiceStub.deployTextEventReceiverConfiguration(receiverName
+                                , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
                                 , basicInputAdapterPropertyDtos, customMapping);
                     } else {
-                        if (messageFormat.toString().equals("map")) {
+                        eventReceiverAdminServiceStub.deployJsonEventReceiverConfiguration(receiverName
-                            eventReceiverAdminServiceStub.deployMapEventReceiverConfiguration(receiverName
+                                , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
-                                    , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
+                                , basicInputAdapterPropertyDtos, customMapping);
-                                    , basicInputAdapterPropertyDtos, customMapping);
-                        } else if (messageFormat.toString().equals("text")) {
-                            eventReceiverAdminServiceStub.deployTextEventReceiverConfiguration(receiverName
-                                    , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
-                                    , basicInputAdapterPropertyDtos, customMapping);
-                        } else {
-                            eventReceiverAdminServiceStub.deployJsonEventReceiverConfiguration(receiverName
-                                    , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
-                                    , basicInputAdapterPropertyDtos, customMapping);
-                        }
                     }
-                } else {
-                    EventMappingPropertyDto[] correlationMappingPropertyDtos = addReceiverMappingToDto(correlationMappingProperties);
-                    EventMappingPropertyDto[] metaMappingPropertyDtos = addReceiverMappingToDto(metaMappingProperties);
-                    EventMappingPropertyDto[] payloadMappingPropertyDtos = addReceiverMappingToDto(payloadMappingProperties);
-
-                    eventReceiverAdminServiceStub.deployWso2EventReceiverConfiguration(receiverName
-                            , eventStreamWithVersion, adapterType, metaMappingPropertyDtos
-                            , correlationMappingPropertyDtos, payloadMappingPropertyDtos
-                            , basicInputAdapterPropertyDtos, customMapping
-                            , eventStreamWithVersion);
                 }
-
+            } else {
+                EventMappingPropertyDto[] correlationMappingPropertyDtos = addReceiverMappingToDto(
+                        adapterMappingConfiguration.getCorrelationMappingProperties()
+                );
+                EventMappingPropertyDto[] metaMappingPropertyDtos = addReceiverMappingToDto(
+                        adapterMappingConfiguration.getInputMappingProperties()
+                );
+                EventMappingPropertyDto[] payloadMappingPropertyDtos = addReceiverMappingToDto(
+                        adapterMappingConfiguration.getPayloadMappingProperties()
+                );
+
+                eventReceiverAdminServiceStub.deployWso2EventReceiverConfiguration(receiverName
+                        , eventStreamWithVersion, adapterType, metaMappingPropertyDtos
+                        , correlationMappingPropertyDtos, payloadMappingPropertyDtos
+                        , basicInputAdapterPropertyDtos, customMapping
+                        , eventStreamWithVersion);
             }
         } finally {
             cleanup(eventReceiverAdminServiceStub);
@@ -488,88 +424,82 @@ public class AnalyticsArtifactsManagementServiceImpl
     }
 
     /**
-     * Set data to a publisher dto and publish dto using a stub
+     * Set data to a publisher dto and deploy dto through a stub
      *
-     * @param publisherName                Publisher name
+     * @param publisher            Event Publisher adapter
-     * @param adapterType                  Publisher type
+     * @param customMapping        Is Publisher mapped
-     * @param adapterProperties            Publisher properties
+     * @param adapterConfiguration Publisher property and mapping configuration
-     * @param customMapping                Is publisher mapped
-     * @param correlationMappingProperties Publisher correlation attribute mapping
-     * @param payloadMappingProperties     Publisher payload attribute mapping
-     * @param metaMappingProperties        Publisher meta attribute mapping
-     * @param messageFormat                Publisher mapping format
-     * @param eventStreamWithVersion       Attached stream
      * @throws RemoteException    Exception that may occur during a remote method call
      * @throws UserStoreException Exception that may occur during JWT token generation
      * @throws JWTClientException Exception that may occur during connecting to client store
      */
-    private void publishPublisher(String publisherName, String adapterType,
+    private void deployPublisher(Adapter publisher, boolean customMapping,
-                                  List<AdapterProperty> adapterProperties,
+                                 AdapterConfiguration adapterConfiguration)
-                                  boolean customMapping,
-                                  String inputMappingString,
-                                  List<MappingProperty> inputMappingProperties,
-                                  List<MappingProperty> correlationMappingProperties,
-                                  List<MappingProperty> payloadMappingProperties,
-                                  List<MappingProperty> metaMappingProperties,
-                                  MessageFormat messageFormat,
-                                  String eventStreamWithVersion)
             throws RemoteException, UserStoreException, JWTClientException {
         EventPublisherAdminServiceStub eventPublisherAdminServiceStub = DeviceMgtAPIUtils.getEventPublisherAdminServiceStub();
-        // Check if adapter already exists, if so un-deploy it
         try {
+            String publisherName = publisher.getAdapterName();
+            String adapterType = publisher.getAdapterType().toStringFormatted();
+            String eventStreamWithVersion = publisher.getEventStreamWithVersion();
+            List<AdapterProperty> adapterProperties = adapterConfiguration.getAdapterProperties();
             EventPublisherConfigurationDto eventPublisherConfigurationDto = eventPublisherAdminServiceStub
                     .getActiveEventPublisherConfiguration(publisherName);
             if (eventPublisherConfigurationDto != null) {
                 eventPublisherAdminServiceStub.undeployActiveEventPublisherConfiguration(publisherName);
             }
 
-            // Adding attribute properties to DTOs
             BasicOutputAdapterPropertyDto[] basicOutputAdapterPropertyDtos =
                     addPublisherConfigToDto(adapterProperties);
 
-            if (eventPublisherAdminServiceStub.getActiveEventPublisherConfiguration(publisherName) == null) {
+            AdapterMappingConfiguration adapterMappingConfiguration = adapterConfiguration.getAdapterMappingConfiguration();
-                // Call stub deploy methods according to the message format
+            MessageFormat messageFormat = adapterMappingConfiguration.getMessageFormat();
-                if (!messageFormat.toString().equals("wso2event")) {
+            if (!messageFormat.toString().equals("wso2event")) {
-                    if (!messageFormat.toString().equals("map")) {
+                if (!messageFormat.toString().equals("map")) {
-                        if (messageFormat.toString().equals("xml")) {
+                    if (messageFormat.toString().equals("xml")) {
-                            eventPublisherAdminServiceStub.deployXmlEventPublisherConfiguration(publisherName
+                        eventPublisherAdminServiceStub.deployXmlEventPublisherConfiguration(publisherName
-                                    , eventStreamWithVersion, adapterType, inputMappingString
+                                , eventStreamWithVersion, adapterType, adapterMappingConfiguration.getInputMappingString()
-                                    , basicOutputAdapterPropertyDtos, eventStreamWithVersion
+                                , basicOutputAdapterPropertyDtos, eventStreamWithVersion
-                                    , customMapping);
+                                , customMapping);
-                        } else if (messageFormat.toString().equals("text")) {
+                    } else if (messageFormat.toString().equals("text")) {
-                            eventPublisherAdminServiceStub.deployTextEventPublisherConfiguration(publisherName
+                        eventPublisherAdminServiceStub.deployTextEventPublisherConfiguration(publisherName
-                                    , eventStreamWithVersion, adapterType, inputMappingString
+                                , eventStreamWithVersion, adapterType, adapterMappingConfiguration.getInputMappingString()
-                                    , basicOutputAdapterPropertyDtos, eventStreamWithVersion
+                                , basicOutputAdapterPropertyDtos, eventStreamWithVersion
-                                    , customMapping);
+                                , customMapping);
-                        } else {
-                            eventPublisherAdminServiceStub.deployJsonEventPublisherConfiguration(publisherName
-                                    , eventStreamWithVersion, adapterType, inputMappingString
-                                    , basicOutputAdapterPropertyDtos, eventStreamWithVersion
-                                    , customMapping);
-                        }
                     } else {
-                        org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] inputMappingPropertyDtos =
+                        eventPublisherAdminServiceStub.deployJsonEventPublisherConfiguration(publisherName
-                                addPublisherMappingToDto(inputMappingProperties);
+                                , eventStreamWithVersion, adapterType, adapterMappingConfiguration.getInputMappingString()
-                        eventPublisherAdminServiceStub.deployMapEventPublisherConfiguration(publisherName
+                                , basicOutputAdapterPropertyDtos, eventStreamWithVersion
-                                , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
+                                , customMapping);
-                                , basicOutputAdapterPropertyDtos, customMapping);
                     }
                 } else {
-                    org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] correlationMappingPropertyDtos =
+                    org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] inputMappingPropertyDtos =
-                            addPublisherMappingToDto(correlationMappingProperties);
+                            addPublisherMappingToDto(
-                    org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] metaMappingPropertyDtos =
+                                    adapterMappingConfiguration.getInputMappingProperties()
-                            addPublisherMappingToDto(metaMappingProperties);
+                            );
-                    org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] payloadMappingPropertyDtos =
+                    eventPublisherAdminServiceStub.deployMapEventPublisherConfiguration(publisherName
-                            addPublisherMappingToDto(payloadMappingProperties);
+                            , eventStreamWithVersion, adapterType, inputMappingPropertyDtos
-
+                            , basicOutputAdapterPropertyDtos, customMapping);
-                    eventPublisherAdminServiceStub.deployWSO2EventPublisherConfiguration(publisherName
-                            , eventStreamWithVersion, adapterType, metaMappingPropertyDtos
-                            , correlationMappingPropertyDtos, payloadMappingPropertyDtos
-                            , basicOutputAdapterPropertyDtos, customMapping
-                            , eventStreamWithVersion);
                 }
-
+            } else {
+                org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] correlationMappingPropertyDtos =
+                        addPublisherMappingToDto(
+                                adapterMappingConfiguration.getCorrelationMappingProperties()
+                        );
+                org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] metaMappingPropertyDtos =
+                        addPublisherMappingToDto(
+                                adapterMappingConfiguration.getMetaMappingProperties()
+                        );
+                org.wso2.carbon.event.publisher.stub.types.EventMappingPropertyDto[] payloadMappingPropertyDtos =
+                        addPublisherMappingToDto(
+                                adapterMappingConfiguration.getPayloadMappingProperties()
+                        );
+                eventPublisherAdminServiceStub.deployWSO2EventPublisherConfiguration(publisherName
+                        , eventStreamWithVersion, adapterType, metaMappingPropertyDtos
+                        , correlationMappingPropertyDtos, payloadMappingPropertyDtos
+                        , basicOutputAdapterPropertyDtos, customMapping
+                        , eventStreamWithVersion);
             }
+
         } finally {
             cleanup(eventPublisherAdminServiceStub);
         }
@@ -588,24 +518,21 @@ public class AnalyticsArtifactsManagementServiceImpl
      */
     private void publishSiddhiExecutionPlan(String name, boolean isEdited,
                                             String plan)
-            throws RemoteException, UserStoreException, JWTClientException,
+            throws RemoteException, UserStoreException, JWTClientException {
-                   InvalidExecutionPlanException {
         EventProcessorAdminServiceStub eventProcessorAdminServiceStub = null;
         try {
             eventProcessorAdminServiceStub = DeviceMgtAPIUtils.getEventProcessorAdminServiceStub();
-            // Validate the plan code
             String validationResponse = eventProcessorAdminServiceStub.validateExecutionPlan(plan);
             if (validationResponse.equals("success")) {
                 if (!isEdited) {
-                    // Create a new plan
                     eventProcessorAdminServiceStub.deployExecutionPlan(plan);
                 } else {
-                    // Edit plan
                     eventProcessorAdminServiceStub.editActiveExecutionPlan(plan, name);
                 }
             } else {
                 ErrorDTO errorDTO = new ErrorDTO();
                 errorDTO.setMessage(validationResponse);
+                log.error(validationResponse);
                 throw new InvalidExecutionPlanException(errorDTO);
             }
         } finally {
@@ -630,6 +557,51 @@ public class AnalyticsArtifactsManagementServiceImpl
         return eventStreamAttributeDtos;
     }
 
+    /**
+     * Validate adapter payload attributes
+     *
+     * @param adapterProperties Adapter payload attributes
+     */
+    private void validateAdapterProperties(List<AdapterProperty> adapterProperties) {
+        if (adapterProperties.isEmpty()) {
+            String errMsg = "Invalid payload: event property attributes invalid!!!";
+            ErrorResponse errorResponse = new ErrorResponse();
+            errorResponse.setMessage(errMsg);
+            log.error(errMsg);
+            throw new BadRequestException(errorResponse);
+        }
+    }
+
+    /**
+     * Validate adapter mapping attributes
+     * <p>
+     * Conditions
+     * - if both inputMappingProperties and namespaceMappingProperties null check remaining property lists
+     * - if all correlationMappingProperties, payloadMappingProperties, metaMappingProperties null log error
+     * - if message format is null change the final result to TRUE
+     * - else continue
+     *
+     * @param adapterMappingConfiguration Adapter mapping attributes
+     */
+    private void validateAdapterMapping(AdapterMappingConfiguration adapterMappingConfiguration) {
+
+        if (adapterMappingConfiguration.getInputMappingString() == null &&
+            (adapterMappingConfiguration.getInputMappingProperties().isEmpty() &&
+             adapterMappingConfiguration.getNamespaceMappingProperties().isEmpty()) &&
+            (
+                    adapterMappingConfiguration.getCorrelationMappingProperties().isEmpty() &&
+                    adapterMappingConfiguration.getPayloadMappingProperties().isEmpty() &&
+                    adapterMappingConfiguration.getMetaMappingProperties().isEmpty()
+            )
+            || adapterMappingConfiguration.getMessageFormat() == null) {
+            String errMsg = "Invalid payload: event mapping attributes invalid!!!";
+            ErrorResponse errorResponse = new ErrorResponse();
+            errorResponse.setMessage(errMsg);
+            log.error(errMsg);
+            throw new BadRequestException(errorResponse);
+        }
+    }
+
     /**
      * This will set payload of receiver attributes to the DTO
      *
@@ -655,7 +627,8 @@ public class AnalyticsArtifactsManagementServiceImpl
      * @param mapProperties List of receiver mapping attributes
      * @return DTO with all the receiver mapping attributes
      */
-    private EventMappingPropertyDto[] addReceiverMappingToDto(List<MappingProperty> mapProperties) {
+    private EventMappingPropertyDto[] addReceiverMappingToDto
+    (List<MappingProperty> mapProperties) {
         EventMappingPropertyDto[] eventMappingPropertyDtos = new EventMappingPropertyDto[mapProperties.size()];
         for (int i = 0; i < mapProperties.size(); i++) {
             EventMappingPropertyDto eventMappingPropertyDto = new EventMappingPropertyDto();