Merge pull request #8 from modzy/feat/adding_lombok

feat: adding lombok to simplify code

Author: raul-casallas

pom.xml

@@ -49,7 +49,13 @@
 			<version>4.13-beta-1</version>
 			<scope>test</scope>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
 	<build>		
 		<plugins>

src/main/java/com/modzy/sdk/JobClient.java

@@ -145,7 +145,7 @@ public Job submitJob(Model model, ModelVersion modelVersion, JobInput<?> jobInpu
 	 */
 	public Job submitJob(String modelId, String modelVersionId, JobInput<?> jobInput) throws ApiException{
 		Model model = new Model();
-		model.setModelId(modelId);
+		model.setIdentifier(modelId);
 		ModelVersion modelVersion = new ModelVersion();
 		modelVersion.setVersion(modelVersionId);
 		return this.submitJob( new Job(model, modelVersion, jobInput) );

src/main/java/com/modzy/sdk/ModelClient.java

@@ -149,7 +149,7 @@ public Model getModelByName(String modelName) throws ApiException{
 		searchParams.setName(modelName);
 		List<Model> models = this.getModels(searchParams);
 		if( models != null && !models.isEmpty() ){
-			return this.getModel(models.get(0).getModelId());
+			return this.getModel(models.get(0).getIdentifier());
 		}
 		throw new ApiException("Model "+modelName+" not found");
 	}
@@ -192,7 +192,7 @@ public List<Model> getRelatedModels(String modelId) throws ApiException{
 	 * @throws ApiException if there is something wrong with the service or the call
 	 */
 	public List<Model> getRelatedModels(Model model) throws ApiException{
-		return this.getRelatedModels(model.getModelId());
+		return this.getRelatedModels(model.getIdentifier());
 	}		
 
 	/**
@@ -229,7 +229,7 @@ public List<ModelVersion> getModelVersions(String modelId) throws ApiException{
 	 * @throws ApiException if there is something wrong with the service or the call
 	 */
 	public List<ModelVersion> getModelVersions(Model model) throws ApiException{
-		return this.getModelVersions(model.getModelId());
+		return this.getModelVersions(model.getIdentifier());
 	}
 
 	/**

src/main/java/com/modzy/sdk/dto/EmbeddedData.java

@@ -2,7 +2,9 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.modzy.sdk.util.EmbeddedSerializer;
+import lombok.Data;
 
+@Data
 @JsonSerialize(using = EmbeddedSerializer.class)
 public class EmbeddedData {
 
@@ -32,29 +34,5 @@ public EmbeddedData(String mediaType, byte[] data) {
 		this.encoding  = "base64";
 		this.data = data;
 	}
-
-	public String getMediaType() {
-		return mediaType;
-	}
-
-	public void setMediaType(String mediaType) {
-		this.mediaType = mediaType;
-	}
-
-	public String getEncoding() {
-		return encoding;
-	}
-
-	public void setEncoding(String encoding) {
-		this.encoding = encoding;
-	}
-
-	public byte[] getData() {
-		return data;
-	}
-
-	public void setData(byte[] data) {
-		this.data = data;
-	}	
 
 }

src/main/java/com/modzy/sdk/dto/JobHistoryResponseWrapper.java

@@ -4,18 +4,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.modzy.sdk.model.Job;
+import lombok.Data;
 
+@Data
 @JsonIgnoreProperties(ignoreUnknown=true)
 public class JobHistoryResponseWrapper {
 
 	private List<Job> data;
 
-	public List<Job> getData() {
-		return data;
-	}
-
-	public void setData(List<Job> data) {
-		this.data = data;
-	}
-
 }

src/main/java/com/modzy/sdk/dto/JobHistorySearchParams.java

@@ -7,7 +7,13 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.modzy.sdk.model.JobStatus;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 @JsonInclude(Include.NON_EMPTY)
 public class JobHistorySearchParams extends Pagination{
 
@@ -23,71 +29,6 @@ public class JobHistorySearchParams extends Pagination{
 
 	private String model;
 
-	private JobHistorySearchStatus status;
+	private JobHistorySearchStatus status = JobHistorySearchStatus.ALL;
 
-	public JobHistorySearchParams() {
-		super();
-		this.status=JobHistorySearchStatus.ALL;
-	}
-	
-	public JobHistorySearchParams(
-			String user, String accessKey, Date startDate, Date endDate, String model, JobHistorySearchStatus status,
-			Integer page, Integer perPage, String sortBy, String direction) {
-		this();
-		this.user = user;
-		this.accessKey = accessKey;
-		this.startDate = startDate;
-		this.endDate = endDate;
-		this.model = model;
-		this.status = status;
-		this.page = page;
-		this.perPage = perPage;
-		this.sortBy = sortBy;
-		this.direction = direction;
-	}
-
-	public String getUser() {
-		return user;
-	}
-
-	public void setUser(String user) {
-		this.user = user;
-	}
-
-	public String getAccessKey() {
-		return accessKey;
-	}
-
-	public void setAccessKey(String accessKey) {
-		this.accessKey = accessKey;
-	}
-
-	public Date getStartDate() {
-		return startDate;
-	}
-
-	public void setStartDate(Date startDate) {
-		this.startDate = startDate;
-	}
-
-	public Date getEndDate() {
-		return endDate;
-	}
-
-	public void setEndDate(Date endDate) {
-		this.endDate = endDate;
-	}
-
-	public String getModel(){return this.model;}
-
-	public void setModel(String model){ this.model = model;}
-
-	public JobHistorySearchStatus getStatus() {
-		return status;
-	}
-
-	public void setStatus(JobHistorySearchStatus status) {
-		this.status = status;
-	}
-	
 }

src/main/java/com/modzy/sdk/dto/ModelSearchParams.java

@@ -2,9 +2,16 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class ModelSearchParams extends Pagination{
 
@@ -18,123 +25,19 @@ public class ModelSearchParams extends Pagination{
 
     protected String description;
 
-    protected Boolean isActive;
+    @JsonProperty("isActive")
+    protected Boolean active;
 
-    protected Boolean isExpired;
+    @JsonProperty("isExpired")
+    protected Boolean expired;
 
-    protected Boolean isRecommended;
+    @JsonProperty("isRecommended")
+    protected Boolean recommended;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS")
     protected Date lastActiveDateTime;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS")
     protected Date expirationDateTime;
 
-    public ModelSearchParams(){
-        super();
-        this.perPage = 1000;
-    }
-
-    public ModelSearchParams(
-            String modelId, String author, String createdByEmail, String name,
-            String description, Boolean isActive, Boolean isExpired, Boolean isRecommended,
-            Date lastActiveDateTime, Date expirationDateTime,
-            Integer page, Integer perPage, String sortBy, String direction
-        ) {
-        this();
-        this.modelId = modelId;
-        this.author = author;
-        this.createdByEmail = createdByEmail;
-        this.name = name;
-        this.description = description;
-        this.isActive = isActive;
-        this.isExpired = isExpired;
-        this.isRecommended = isRecommended;
-        this.lastActiveDateTime = lastActiveDateTime;
-        this.expirationDateTime = expirationDateTime;
-        this.page = page;
-        this.perPage = perPage;
-        this.sortBy = sortBy;
-        this.direction = direction;
-    }
-
-    public String getModelId() {
-        return modelId;
-    }
-
-    public void setModelId(String modelId) {
-        this.modelId = modelId;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public void setAuthor(String author) {
-        this.author = author;
-    }
-
-    public String getCreatedByEmail() {
-        return createdByEmail;
-    }
-
-    public void setCreatedByEmail(String createdByEmail) {
-        this.createdByEmail = createdByEmail;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Boolean getActive() {
-        return isActive;
-    }
-
-    public void setActive(Boolean active) {
-        isActive = active;
-    }
-
-    public Boolean getExpired() {
-        return isExpired;
-    }
-
-    public void setExpired(Boolean expired) {
-        isExpired = expired;
-    }
-
-    public Boolean getRecommended() {
-        return isRecommended;
-    }
-
-    public void setRecommended(Boolean recommended) {
-        isRecommended = recommended;
-    }
-
-    public Date getLastActiveDateTime() {
-        return lastActiveDateTime;
-    }
-
-    public void setLastActiveDateTime(Date lastActiveDateTime) {
-        this.lastActiveDateTime = lastActiveDateTime;
-    }
-
-    public Date getExpirationDateTime() {
-        return expirationDateTime;
-    }
-
-    public void setExpirationDateTime(Date expirationDateTime) {
-        this.expirationDateTime = expirationDateTime;
-    }
 }