[BAEL-3936] Formatted code

This commit is contained in:
kkaravitis
2020-04-05 01:11:49 +03:00
parent 5a56276893
commit 9acc69220b
3 changed files with 123 additions and 111 deletions
@@ -11,31 +11,34 @@ import java.util.Objects;
@Table(name = "cocktails")
public class Cocktail {
@Id
@Column(name="cocktail_name")
@Column(name = "cocktail_name")
private String name;
@Column
private double price;
@Column(name="category")
@Column(name = "category")
private String category;
@OneToOne
@NotFound(action = NotFoundAction.IGNORE)
@JoinColumn(name = "cocktail_name",
referencedColumnName = "cocktail",
insertable = false,
updatable = false,
foreignKey = @javax.persistence.ForeignKey(value= ConstraintMode.NO_CONSTRAINT))
@JoinColumn(name = "cocktail_name",
referencedColumnName = "cocktail",
insertable = false, updatable = false,
foreignKey = @javax.persistence
.ForeignKey(value = ConstraintMode.NO_CONSTRAINT)
)
private Recipe recipe;
@OneToMany
@NotFound(action=NotFoundAction.IGNORE)
@JoinColumn(name = "cocktail",
referencedColumnName = "cocktail_name",
insertable = false,
updatable = false,
foreignKey = @javax.persistence.ForeignKey(value= ConstraintMode.NO_CONSTRAINT))
@NotFound(action = NotFoundAction.IGNORE)
@JoinColumn(
name = "cocktail",
referencedColumnName = "cocktail_name",
insertable = false,
updatable = false,
foreignKey = @javax.persistence
.ForeignKey(value = ConstraintMode.NO_CONSTRAINT))
private List<MultipleRecipe> recipeList;
public Cocktail() {
@@ -69,12 +72,14 @@ public class Cocktail {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
Cocktail cocktail = (Cocktail) o;
return Double.compare(cocktail.price, price) == 0 &&
Objects.equals(name, cocktail.name) &&
Objects.equals(category, cocktail.category);
return Double.compare(cocktail.price, price) == 0 &&
Objects.equals(name, cocktail.name) &&
Objects.equals(category, cocktail.category);
}
@Override
@@ -7,28 +7,30 @@ import javax.persistence.Table;
import java.util.Objects;
@Entity
@Table(name="multiple_recipes")
@Table(name = "multiple_recipes")
public class MultipleRecipe {
@Id
@Column(name="id")
@Column(name = "id")
private Long id;
@Column(name="cocktail")
@Column(name = "cocktail")
private String cocktail;
@Column(name="instructions")
@Column(name = "instructions")
private String instructions;
@Column(name="base_ingredient")
@Column(name = "base_ingredient")
private String baseIngredient;
public MultipleRecipe() {}
public MultipleRecipe() {
}
public MultipleRecipe(Long id, String cocktail, String instructions, String baseIngredient) {
this.baseIngredient = baseIngredient;
this.cocktail = cocktail;
public MultipleRecipe(Long id, String cocktail,
String instructions, String baseIngredient) {
this.id = id;
this.cocktail = cocktail;
this.instructions = instructions;
this.baseIngredient = baseIngredient;
}
public Long getId() {
@@ -49,17 +51,20 @@ public class MultipleRecipe {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
MultipleRecipe that = (MultipleRecipe) o;
return Objects.equals(id, that.id) &&
Objects.equals(cocktail, that.cocktail) &&
Objects.equals(instructions, that.instructions) &&
Objects.equals(baseIngredient, that.baseIngredient);
return Objects.equals(id, that.id) &&
Objects.equals(cocktail, that.cocktail) &&
Objects.equals(instructions, that.instructions) &&
Objects.equals(baseIngredient, that.baseIngredient);
}
@Override
public int hashCode() {
return Objects.hash(id, cocktail, instructions, baseIngredient);
return Objects.hash(id, cocktail,
instructions, baseIngredient);
}
}