Removed Timeout parameter from subscripion code since the parameter will not be used. (#20)

Author: tobiasake

src/main/java/com/ericsson/ei/controller/model/Subscription.java

@@ -23,8 +23,7 @@
     "notificationType",
     "repeat",
     "requirements",
-    "subscriptionName",
-    "timeout"
+    "subscriptionName"
 })
 public class Subscription {
 
@@ -42,8 +41,6 @@ public class Subscription {
     private List<Requirement> requirements = new ArrayList<Requirement>();
     @JsonProperty("subscriptionName")
     private String subscriptionName;
-    @JsonProperty("timeout")
-    private Integer timeout;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
@@ -187,26 +184,6 @@ public void setSubscriptionName(String subscriptionName) {
         this.subscriptionName = subscriptionName;
     }
 
-    /**
-     * 
-     * @return
-     *     The timeout
-     */
-    @JsonProperty("timeout")
-    public Integer getTimeout() {
-        return timeout;
-    }
-
-    /**
-     * 
-     * @param timeout
-     *     The timeout
-     */
-    @JsonProperty("timeout")
-    public void setTimeout(Integer timeout) {
-        this.timeout = timeout;
-    }
-
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
@@ -224,7 +201,7 @@ public void setAdditionalProperty(String name, Object value) {
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder().append(created).append(notificationMessage).append(notificationMeta).append(notificationType).append(repeat).append(requirements).append(subscriptionName).append(timeout).append(additionalProperties).toHashCode();
+        return new HashCodeBuilder().append(created).append(notificationMessage).append(notificationMeta).append(notificationType).append(repeat).append(requirements).append(subscriptionName).append(additionalProperties).toHashCode();
     }
 
     @Override
@@ -236,7 +213,7 @@ public boolean equals(Object other) {
             return false;
         }
         Subscription rhs = ((Subscription) other);
-        return new EqualsBuilder().append(created, rhs.created).append(notificationMessage, rhs.notificationMessage).append(notificationMeta, rhs.notificationMeta).append(notificationType, rhs.notificationType).append(repeat, rhs.repeat).append(requirements, rhs.requirements).append(subscriptionName, rhs.subscriptionName).append(timeout, rhs.timeout).append(additionalProperties, rhs.additionalProperties).isEquals();
+        return new EqualsBuilder().append(created, rhs.created).append(notificationMessage, rhs.notificationMessage).append(notificationMeta, rhs.notificationMeta).append(notificationType, rhs.notificationType).append(repeat, rhs.repeat).append(requirements, rhs.requirements).append(subscriptionName, rhs.subscriptionName).append(additionalProperties, rhs.additionalProperties).isEquals();
     }
 
 }

src/main/resources/public/raml/common-schema.raml

@@ -44,9 +44,6 @@ subscription: |
           },
           "subscriptionName":{
              "type":"string"
-          },
-          "timeout":{
-             "type":"integer"
           }
        },
        "type":"object"
@@ -99,9 +96,6 @@ subscriptionList: |
           },
           "subscriptionName":{
              "type":"string"
-          },
-          "timeout":{
-             "type":"integer"
           }
        },
        "type":"object"

src/test/resources/SubscriptionObject.json

@@ -2,7 +2,6 @@
         "subscriptionName": "Subscription_1",
         "repeat": false,
         "created": "data-time",
-        "timeout": 12354,
         "notificationType": "REST_POST",
         "notificationMeta": "http://127.0.0.1:3000/ei/test_subscription_rest",
         "notificationMessage": "@",

src/test/resources/subscription.json

@@ -28,8 +28,7 @@
             "type" : "ARTIFACT_1"
         }
     ],
-    "subscriptionName" : "Subscription_Test",
-    "timeout" : 12354
+    "subscriptionName" : "Subscription_Test"
 },
 {
     "created" : "2017-07-27",
@@ -61,6 +60,5 @@
             "type" : "ARTIFACT_1"
         }
     ],
-    "subscriptionName" : "Subscription_Test_Modify",
-    "timeout" : 12354
+    "subscriptionName" : "Subscription_Test_Modify"
 }]