Fix for DATAREST-69. Tweaked how RepositoryEntityLinks gets its default baseUri if none is set in the configuration.

This commit is contained in:
Jon Brisbin
2013-03-05 10:54:13 -06:00
parent 9e47346314
commit afbf92bdad
4 changed files with 198 additions and 181 deletions

View File

@@ -6,7 +6,9 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
@@ -23,84 +25,86 @@ import org.springframework.data.rest.repository.annotation.Description;
@Entity
public class Person {
private Long id;
@Description("A person's first name")
private String firstName;
@Description("A person's last name")
private String lastName;
@Description("A person's siblings")
private List<Person> siblings = Collections.emptyList();
private Person father;
@Description("Timestamp this person object was created")
private Date created;
private Long id;
@Description("A person's first name")
private String firstName;
@Description("A person's last name")
private String lastName;
@Description("A person's siblings")
private List<Person> siblings = Collections.emptyList();
private Person father;
@Description("Timestamp this person object was created")
private Date created;
public Person() {
}
public Person() {
}
public Person(String firstName, String lastName) {
this.firstName = firstName;
this.lastName = lastName;
}
public Person(String firstName, String lastName) {
this.firstName = firstName;
this.lastName = lastName;
}
@Id @GeneratedValue public Long getId() {
return id;
}
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public void setId(Long id) {
this.id = id;
}
public String getFirstName() {
return firstName;
}
public String getFirstName() {
return firstName;
}
public void setFirstName(String firstName) {
this.firstName = firstName;
}
public void setFirstName(String firstName) {
this.firstName = firstName;
}
public String getLastName() {
return lastName;
}
public String getLastName() {
return lastName;
}
@NotNull
public void setLastName(String lastName) {
this.lastName = lastName;
}
@NotNull
public void setLastName(String lastName) {
this.lastName = lastName;
}
public Person addSibling(Person p) {
if(siblings == Collections.EMPTY_LIST) {
siblings = new ArrayList<Person>();
}
siblings.add(p);
return this;
}
public Person addSibling(Person p) {
if(siblings == Collections.EMPTY_LIST) {
siblings = new ArrayList<Person>();
}
siblings.add(p);
return this;
}
@ManyToMany public List<Person> getSiblings() {
return siblings;
}
@ManyToMany(fetch = FetchType.LAZY)
public List<Person> getSiblings() {
return siblings;
}
public void setSiblings(List<Person> siblings) {
this.siblings = siblings;
}
public void setSiblings(List<Person> siblings) {
this.siblings = siblings;
}
@ManyToOne public Person getFather() {
return father;
}
@ManyToOne public Person getFather() {
return father;
}
public void setFather(Person father) {
this.father = father;
}
public void setFather(Person father) {
this.father = father;
}
public Date getCreated() {
return created;
}
public Date getCreated() {
return created;
}
public void setCreated(Date created) {
}
public void setCreated(Date created) {
}
@PrePersist
private void prePersist() {
this.created = Calendar.getInstance().getTime();
}
@PrePersist
private void prePersist() {
this.created = Calendar.getInstance().getTime();
}
}