Skip to content

Commit

Permalink
Merge 948929e into 99afee6
Browse files Browse the repository at this point in the history
  • Loading branch information
wwelling committed Aug 22, 2018
2 parents 99afee6 + 948929e commit d785fa0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/main/java/edu/tamu/app/model/FeatureProposal.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@

import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.JsonIdentityReference;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;

import edu.tamu.app.enums.FeatureProposalState;
import edu.tamu.app.model.validation.FeatureProposalValidator;

@Entity
@JsonIgnoreProperties(value = { "voters" }, allowGetters = true)
public class FeatureProposal extends AbstractIdea {

@OneToMany(fetch = EAGER, cascade = { CascadeType.REFRESH, CascadeType.DETACH, CascadeType.MERGE }, mappedBy = "featureProposal")
Expand All @@ -51,7 +49,6 @@ public class FeatureProposal extends AbstractIdea {

public FeatureProposal() {
super();
this.modelValidator = new FeatureProposalValidator();
setup();
}

Expand All @@ -77,6 +74,7 @@ public FeatureProposal(Idea idea) {
}

private void setup() {
this.modelValidator = new FeatureProposalValidator();
this.ideas = new ArrayList<Idea>();
this.voters = new ArrayList<User>();
this.state = FeatureProposalState.IN_PROGRESS;
Expand Down

0 comments on commit d785fa0

Please sign in to comment.