dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed database issue mappings

Browse Source
This commit is contained in:
nbaars 2018-01-21 17:13:28 +01:00
parent 2cc6c232e2
commit ee11381a63
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webgoat-container/src/main/java/org/owasp/webgoat/users/LessonTracker.java
View File

@ -53,7 +53,7 @@ public class LessonTracker {
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private final Set<Assignment> solvedAssignments = Sets.newHashSet(); private final Set<Assignment> solvedAssignments = Sets.newHashSet();
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
private final List<Assignment> allAssignments = Lists.newArrayList(); private final Set<Assignment> allAssignments = Sets.newHashSet();
@Getter @Getter
private int numberOfAttempts = 0; private int numberOfAttempts = 0;

13
webwolf/src/main/java/org/owasp/webwolf/mailbox/Email.java
View File

@ -1,14 +1,9 @@
package org.owasp.webwolf.mailbox; package org.owasp.webwolf.mailbox;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.persistence.Entity; import javax.persistence.*;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -17,17 +12,16 @@ import java.time.format.DateTimeFormatter;
* @author nbaars * @author nbaars
* @since 8/20/17. * @since 8/20/17.
*/ */
@Builder
@Data @Data
@Entity @Entity
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor
public class Email implements Serializable { public class Email implements Serializable {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
private LocalDateTime time; private LocalDateTime time;
@Column(length = 1024)
private String contents; private String contents;
private String sender; private String sender;
private String title; private String title;
@ -48,4 +42,5 @@ public class Email implements Serializable {
public String getShortSender() { public String getShortSender() {
return sender.substring(0, sender.indexOf("@")); return sender.substring(0, sender.indexOf("@"));
} }
}
}