Jean-Francois Leveque

Nettoyage du vieil identifiant et suppression des données transférées dans le nouveau modèle.

...@@ -15,18 +15,12 @@ public class Publisher /* extends org.roliste.data.DbLinkableEntity */ { ...@@ -15,18 +15,12 @@ public class Publisher /* extends org.roliste.data.DbLinkableEntity */ {
15 // TODO L'éventuel usage de Linkable reste à confirmer https://tree.taiga.io/project/jr-utily-grog-v3/us/48 15 // TODO L'éventuel usage de Linkable reste à confirmer https://tree.taiga.io/project/jr-utily-grog-v3/us/48
16 // TODO Attention, en v2 Linkable implique Traceable (journalisable) qui devrait aussi être évalué 16 // TODO Attention, en v2 Linkable implique Traceable (journalisable) qui devrait aussi être évalué
17 @Id 17 @Id
18 - @Column(name = "PUBLISHER_ID") 18 + @GeneratedValue(strategy = GenerationType.AUTO)
19 - @GeneratedValue(strategy = GenerationType.IDENTITY)
20 private int publisherId; 19 private int publisherId;
21 20
22 @OneToOne 21 @OneToOne
23 private PublisherVersion validatedVersion; 22 private PublisherVersion validatedVersion;
24 23
25 - @OneToOne
26 - private User validator;
27 -
28 - private Timestamp validationDateTime;
29 -
30 @OneToMany(mappedBy = "publisher", fetch = FetchType.EAGER) 24 @OneToMany(mappedBy = "publisher", fetch = FetchType.EAGER)
31 private Set<PublisherVersion> versions; 25 private Set<PublisherVersion> versions;
32 26
...@@ -54,24 +48,8 @@ public class Publisher /* extends org.roliste.data.DbLinkableEntity */ { ...@@ -54,24 +48,8 @@ public class Publisher /* extends org.roliste.data.DbLinkableEntity */ {
54 this.versions = versions; 48 this.versions = versions;
55 } 49 }
56 50
57 - public User getValidator() {
58 - return validator;
59 - }
60 -
61 - public void setValidator(User activeValidator) {
62 - this.validator = activeValidator;
63 - }
64 -
65 - public Timestamp getValidationDateTime() {
66 - return validationDateTime;
67 - }
68 -
69 - public void setValidationDateTime(Timestamp validationDateTime) {
70 - this.validationDateTime = validationDateTime;
71 - }
72 -
73 @Override 51 @Override
74 public String toString() { 52 public String toString() {
75 - return "PUBLISHER_ID = " + publisherId + ", Validated Version = " + validatedVersion + ", Validator = " + validator + ", Validation DateTime = " + validationDateTime; 53 + return "PUBLISHER_ID = " + publisherId + ", Validated Version = " + validatedVersion;
76 } 54 }
77 } 55 }
......