From 464000b3acc64e678a57141c2eb806a5b3d2a01c Mon Sep 17 00:00:00 2001 From: Fibinger Ádám <adam.fibinger@wup.hu> Date: Sun, 03 Mar 2019 12:41:12 +0100 Subject: [PATCH] Basic refactor and decoupling REST Controller from JPA --- src/main/java/hu/unr/fiber/cardapi/entity/Card.java | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/main/java/hu/unr/fiber/cardapi/Card.java b/src/main/java/hu/unr/fiber/cardapi/entity/Card.java similarity index 64% rename from src/main/java/hu/unr/fiber/cardapi/Card.java rename to src/main/java/hu/unr/fiber/cardapi/entity/Card.java index b5959be..8a0707b 100644 --- a/src/main/java/hu/unr/fiber/cardapi/Card.java +++ b/src/main/java/hu/unr/fiber/cardapi/entity/Card.java @@ -1,14 +1,11 @@ -package hu.unr.fiber.cardapi; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +package hu.unr.fiber.cardapi.entity; import javax.persistence.*; import java.util.Objects; @Entity @Table(name = "Card") -@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"}) -public class Card { +public class Card implements CardEntityInterface { public static final long INVALID_ID = 0; @Id @@ -17,23 +14,29 @@ private long id = INVALID_ID; private String name; //FIXME: @Pattern([0-9]+) - @Column(unique=true) + @Column(unique = true) private String number; private String cardHolder; - public Card(){ + public Card() { super(); } public Card(long id) { - this.id = id; + this.setId(id); } - public Card(long id, String name, String number) - { - this.id = id; - this.name = name; - this.number = number; + public Card(long id, String name, String number) { + this.setId(id) + .setName(name) + .setNumber(number); + } + + public Card(long id, String name, String number, String cardHolder) { + this.setId(id) + .setName(name) + .setNumber(number) + .setCardHolder(cardHolder); } public long getId() { @@ -44,32 +47,36 @@ return (this.getId() != Card.INVALID_ID); } - public void setId(long id) { + public Card setId(long id) { this.id = id; + return this; } public String getName() { return name; } - public void setName(String name) { + public Card setName(String name) { this.name = name; + return this; } public String getNumber() { return number; } - public void setNumber(String number) { + public Card setNumber(String number) { this.number = number; + return this; } public String getCardHolder() { return cardHolder; } - public void setCardHolder(String cardHolder) { + public Card setCardHolder(String cardHolder) { this.cardHolder = cardHolder; + return this; } public boolean equals(Object o) { @@ -90,6 +97,6 @@ @Override public String toString() { - return "#" + this.number + " - " + this.name + " @ " + this.cardHolder; + return "#" + this.number + " - " + this.name + " @ " + this.cardHolder; } -} +} \ No newline at end of file -- Gitblit v1.8.0