Merge pull request #17 from bullhorn/feature/R2016.5

Feature/r2016.5
bullhorn · Apr 6, 2016 · abbcb75 · abbcb75
2 parents cd36558 + ba0060c
commit abbcb75
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/main/java/com/bullhornsdk/data/model/entity/core/standard/Appointment.java b/src/main/java/com/bullhornsdk/data/model/entity/core/standard/Appointment.java
@@ -1,14 +1,25 @@
 package com.bullhornsdk.data.model.entity.core.standard;
 
-import com.bullhornsdk.data.model.entity.core.type.*;
+import javax.validation.constraints.Size;
+
+import org.joda.time.DateTime;
+
+import com.bullhornsdk.data.model.entity.core.type.AbstractEntity;
+import com.bullhornsdk.data.model.entity.core.type.AssociationEntity;
+import com.bullhornsdk.data.model.entity.core.type.CreateEntity;
+import com.bullhornsdk.data.model.entity.core.type.DateLastModifiedEntity;
+import com.bullhornsdk.data.model.entity.core.type.QueryEntity;
+import com.bullhornsdk.data.model.entity.core.type.SoftDeleteEntity;
+import com.bullhornsdk.data.model.entity.core.type.UpdateEntity;
 import com.bullhornsdk.data.model.entity.embedded.LinkedId;
 import com.bullhornsdk.data.model.entity.embedded.LinkedPerson;
 import com.bullhornsdk.data.model.entity.embedded.OneToManyLinkedId;
 import com.bullhornsdk.data.validation.BullhornUUID;
-import com.fasterxml.jackson.annotation.*;
-import org.joda.time.DateTime;
-
-import javax.validation.constraints.Size;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonRootName;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonRootName(value = "data")

diff --git a/src/main/java/com/bullhornsdk/data/model/entity/core/standard/CandidateEducation.java b/src/main/java/com/bullhornsdk/data/model/entity/core/standard/CandidateEducation.java
@@ -1,6 +1,7 @@
 package com.bullhornsdk.data.model.entity.core.standard;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 import javax.validation.constraints.Size;
 
@@ -31,7 +32,7 @@ public class CandidateEducation extends AbstractEntity implements QueryEntity, U
 	private Candidate candidate;
 
 	@JsonIgnore
-	private String certification;
+	private List<String> certification;
 
 	@JsonIgnore
 	@Size(max = 40)
@@ -149,12 +150,12 @@ public void setCandidate(Candidate candidate) {
 	}
 
 	@JsonProperty("certification")
-	public String getCertification() {
+	public List<String> getCertification() {
 		return certification;
 	}
 
 	@JsonProperty("certification")
-	public void setCertification(String certification) {
+	public void setCertification(List<String> certification) {
 		this.certification = certification;
 	}