added NON_NULL

drip-commons/src/main/java/nl/uva/sne/drip/model/Credentials.java

 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,7 @@ import org.springframework.data.annotation.Id;
  */
 @Validated
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Credentials {
 
     /**

drip-commons/src/main/java/nl/uva/sne/drip/model/Message.java

@@ -15,6 +15,7 @@
  */
 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
 import java.util.List;
 
@@ -24,6 +25,7 @@ import java.util.List;
  *
  * @author S. Koulouzis.
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Message implements Serializable {
 
     private String owner;

drip-commons/src/main/java/nl/uva/sne/drip/model/MessageParameter.java

@@ -15,6 +15,7 @@
  */
 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
 import java.util.Map;
 
@@ -22,6 +23,7 @@ import java.util.Map;
  *
  * @author S. Koulouzis.
  */
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class MessageParameter implements Serializable {
 
     private String url;

drip-commons/src/main/java/nl/uva/sne/drip/model/NodeTemplate.java

 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +16,7 @@ import javax.validation.Valid;
  */
 @Validated
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class NodeTemplate   {
   @JsonProperty("derived_from")
   private String derivedFrom = null;

drip-commons/src/main/java/nl/uva/sne/drip/model/TopologyTemplate.java

 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +16,7 @@ import javax.validation.Valid;
  */
 @Validated
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class TopologyTemplate   {
   @JsonProperty("description")
   private String description = null;

drip-commons/src/main/java/nl/uva/sne/drip/model/ToscaTemplate.java

 package nl.uva.sne.drip.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +18,7 @@ import org.springframework.data.annotation.Id;
  */
 @Validated
 @javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class ToscaTemplate {
 
     /**

drip-commons/src/main/java/nl/uva/sne/drip/model/User.java

 package nl.uva.sne.drip.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.validation.annotation.Validated;
-import javax.validation.Valid;
-import javax.validation.constraints.*;
 
 /**
  * User
  */
 @Validated
-@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-12-06T13:31:49.386Z")
-
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2019-10-25T14:09:25.182Z")
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class User {
 
+    @JsonProperty("id")
+    private Long id = null;
+
+    @JsonProperty("username")
+    private String username = null;
+
+    @JsonProperty("firstName")
+    private String firstName = null;
+
+    @JsonProperty("lastName")
+    private String lastName = null;
+
+    @JsonProperty("email")
+    private String email = null;
+
+    @JsonProperty(value = "password", access = Access.WRITE_ONLY)
+    private String password = null;
+
+    @JsonProperty("userStatus")
+    private Integer userStatus = null;
+
+    public User id(Long id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get id
+     *
+     * @return id
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public User username(String username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Get username
+     *
+     * @return username
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public User firstName(String firstName) {
+        this.firstName = firstName;
+        return this;
+    }
+
+    /**
+     * Get firstName
+     *
+     * @return firstName
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public User lastName(String lastName) {
+        this.lastName = lastName;
+        return this;
+    }
+
+    /**
+     * Get lastName
+     *
+     * @return lastName
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public User email(String email) {
+        this.email = email;
+        return this;
+    }
+
+    /**
+     * Get email
+     *
+     * @return email
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public User password(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Get password
+     *
+     * @return password
+  *
+     */
+    @ApiModelProperty(value = "")
+
+    @JsonIgnore
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public User userStatus(Integer userStatus) {
+        this.userStatus = userStatus;
+        return this;
+    }
+
+    /**
+     * User Status
+     *
+     * @return userStatus
+  *
+     */
+    @ApiModelProperty(value = "User Status")
+
+    public Integer getUserStatus() {
+        return userStatus;
+    }
+
+    public void setUserStatus(Integer userStatus) {
+        this.userStatus = userStatus;
+    }
+
     @Override
     public boolean equals(java.lang.Object o) {
         if (this == o) {
@@ -21,12 +193,19 @@ public class User   {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-    return true;
+        User user = (User) o;
+        return Objects.equals(this.id, user.id)
+                && Objects.equals(this.username, user.username)
+                && Objects.equals(this.firstName, user.firstName)
+                && Objects.equals(this.lastName, user.lastName)
+                && Objects.equals(this.email, user.email)
+                && Objects.equals(this.password, user.password)
+                && Objects.equals(this.userStatus, user.userStatus);
     }
 
     @Override
     public int hashCode() {
-    return Objects.hash();
+        return Objects.hash(id, username, firstName, lastName, email, password, userStatus);
     }
 
     @Override
@@ -34,6 +213,13 @@ public class User   {
         StringBuilder sb = new StringBuilder();
         sb.append("class User {\n");
 
+        sb.append("    id: ").append(toIndentedString(id)).append("\n");
+        sb.append("    username: ").append(toIndentedString(username)).append("\n");
+        sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+        sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+        sb.append("    email: ").append(toIndentedString(email)).append("\n");
+        sb.append("    password: ").append(toIndentedString(password)).append("\n");
+        sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
         sb.append("}");
         return sb.toString();
     }
@@ -49,4 +235,3 @@ public class User   {
         return o.toString().replace("\n", "\n    ");
     }
 }
-