[SECIOTSRK-355] Refactoring publish and listeners (merged)

diff --git a/servers/dsm/src/main/java/com/samsung/dsm/model/mq/MQPolicy.java b/servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java
similarity index 98%
rename from servers/dsm/src/main/java/com/samsung/dsm/model/mq/MQPolicy.java
rename to servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java
index 742227d..1c1ea5f 100644 (file)
--- a/servers/dsm/src/main/java/com/samsung/dsm/model/mq/MQPolicy.java
+++ b/servers/commons/src/main/java/com/samsung/commons/model/MQPolicy.java
@@ -3,7 +3,7 @@
  * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
  * Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved.
  */
-package com.samsung.dsm.model.mq;
+package com.samsung.commons.model;
 
 import javax.validation.constraints.NotNull;
 

diff --git a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java
index 38f0af7..d80bb35 100644 (file)
--- a/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java
+++ b/servers/dsm/src/main/java/com/samsung/dsm/controller/DashboardDevicesController.java
@@ -13,6 +13,7 @@ import javax.validation.Valid;
 import com.samsung.commons.domain.Device;
 import com.samsung.commons.domain.IotCloudUser;
 import com.samsung.commons.domain.User;
+import com.samsung.commons.model.MQPolicy;
 import com.samsung.commons.service.*;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.google.gson.JsonSyntaxException;
-import com.samsung.dsm.model.mq.MQPolicy;
 import com.samsung.dsm.model.request.ApplyPolicy;
 import com.samsung.dsm.model.view.DeviceOverview;
 import com.samsung.dsm.model.view.ViewDevice;

diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSender.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSender.java
index ddfaf1c..ed2614b 100644 (file)
--- a/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSender.java
+++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSender.java
@@ -1,6 +1,6 @@
 package com.samsung.dsm.rest.mq;
 
-import com.samsung.dsm.model.mq.MQPolicy;
+import com.samsung.commons.model.MQPolicy;
 import com.samsung.dsm.model.mq.Notification;
 
 public interface MQSender {

diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSenderImpl.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSenderImpl.java
index 469c77f..9f8cb50 100644 (file)
--- a/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSenderImpl.java
+++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/mq/MQSenderImpl.java
@@ -4,6 +4,8 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.List;
+
+import com.samsung.commons.model.MQPolicy;
 import org.apache.log4j.Logger;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -12,7 +14,6 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
-import com.samsung.dsm.model.mq.MQPolicy;
 import com.samsung.dsm.model.mq.Notification;
 
 public class MQSenderImpl implements MQSender {

diff --git a/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java b/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java
index 97cab4a..84d6f90 100644 (file)
--- a/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java
+++ b/servers/dsm/src/main/java/com/samsung/dsm/rest/policy/PolicyApi.java
@@ -11,6 +11,7 @@ import static org.springframework.http.HttpStatus.OK;
 import com.samsung.commons.domain.Device;
 import com.samsung.commons.domain.IotCloudUser;
 import com.samsung.commons.domain.Policy;
+import com.samsung.commons.model.MQPolicy;
 import com.samsung.commons.service.DeviceService;
 import com.samsung.commons.service.IotCloudService;
 import com.samsung.commons.service.PolicyService;
@@ -21,7 +22,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.samsung.dsm.model.mq.MQPolicy;
 import com.samsung.dsm.model.restapi.RestPolicy;
 import com.samsung.dsm.model.restapi.converter.PolicyConverter;
 import com.samsung.dsm.rest.mq.MQSenderImpl;

diff --git a/servers/dsm/src/test/java/com/samsung/dsm/rest/mq/MQSenderImplMock.java b/servers/dsm/src/test/java/com/samsung/dsm/rest/mq/MQSenderImplMock.java
index b93a471..5ee030d 100644 (file)
--- a/servers/dsm/src/test/java/com/samsung/dsm/rest/mq/MQSenderImplMock.java
+++ b/servers/dsm/src/test/java/com/samsung/dsm/rest/mq/MQSenderImplMock.java
@@ -1,6 +1,6 @@
 package com.samsung.dsm.rest.mq;
 
-import com.samsung.dsm.model.mq.MQPolicy;
+import com.samsung.commons.model.MQPolicy;
 import com.samsung.dsm.model.mq.Notification;
 
 public class MQSenderImplMock extends MQSenderImpl {

diff --git a/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java b/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java
index ece6a81..b33c4f7 100644 (file)
--- a/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java
+++ b/servers/mq/src/main/java/com/samsung/servermq/rest/DSMRestController.java
@@ -8,6 +8,7 @@ import java.util.Map;
 
 import javax.validation.Valid;
 
+import com.samsung.commons.model.MQPolicy;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -19,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.samsung.servermq.ServerMQ;
 import com.samsung.servermq.iotivity.Publisher;
-import com.samsung.servermq.rest.model.MQPolicy;
 import com.samsung.servermq.rest.model.Notification;
 
 @RestController

diff --git a/servers/mq/src/main/java/com/samsung/servermq/rest/model/MQPolicy.java b/servers/mq/src/main/java/com/samsung/servermq/rest/model/MQPolicy.java
deleted file mode 100644 (file)
index 83b4218..0000000
--- a/servers/mq/src/main/java/com/samsung/servermq/rest/model/MQPolicy.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * In Samsung Ukraine R&D Center (SRK under a contract between)
- * LLC "Samsung Electronics Co", Ltd (Seoul, Republic of Korea)
- * Copyright: (c) Samsung Electronics Co, Ltd 2016. All rights reserved.
- */
-package com.samsung.servermq.rest.model;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 
- * Model for Message Queue.
- *
- * @author <A HREF="mailto:y.zozulia@samsung.com">Yevhen Zozulia</A>
- * @version 1.0
- * @since 2017-07-18
- */
-public class MQPolicy {
-
-    /**
-     * Cloud user id
-     */
-    @NotNull(message = "required field")
-    private String cloudUserId;
-
-    /**
-     * Device id
-     */
-    @NotNull(message = "required field")
-    private String deviceId;
-    
-    /**
-     * Policy for user
-     */
-    @NotNull(message = "required field")
-    private String policy;
-
-    /**
-     * Create policy model to send Message Queue
-     */
-    public MQPolicy(){}
-    
-    /**
-     * Create policy model to send Message Queue  with parameters:
-     * @param cloudUserId - Cloud user id
-     * @param deviceId - Device id
-     * @param policy - Policy for user
-     */
-    public MQPolicy(String cloudUserId, String deviceId, String policy) {
-        this.cloudUserId = cloudUserId;
-        this.deviceId = deviceId;
-        this.policy = policy;
-    }
-
-    /**
-     * Get cloud user id
-     * @return cloudUserId
-     */
-    public String getCloudUserId() {
-        return cloudUserId;
-    }
-
-    /**
-     * Set cloud user id
-     * @param cloudUserId - cloud user id
-     */
-    public void setCloudUserId(String cloudUserId) {
-        this.cloudUserId = cloudUserId;
-    }
-
-    /**
-     * Get device id
-     * @return deviceId
-     */
-    public String getDeviceId() {
-        return deviceId;
-    }
-
-    /**
-     * Set device id
-     * @param deviceId - device id
-     */
-    public void setDeviceId(String deviceId) {
-        this.deviceId = deviceId;
-    }
-
-    /**
-     * Get Policy for user
-     * @return policy
-     */
-    public String getPolicy() {
-        return policy;
-    }
-
-    /**
-     * Set policy
-     * @param policy - policy
-     */
-    public void setPolicy(String policy) {
-        this.policy = policy;
-    }
-
-    /**
-     * Method provides reflection to print names and values of all fields
-     * <em>declared in this class</em>. Note that superclass fields are left out
-     * of this implementation.
-     * 
-     * @return String with names and values of all fields declared in this
-     *         class.
-     */
-    @Override
-    public String toString() {
-        return "MQPolicy [cloudUserId=" + cloudUserId  + ", deviceId=" + deviceId + ", policy=" + policy + "]";
-    }
-
-}