Browse Source

Not sure what I did but ORM is working again :-S

21-email-to-args-for-osh-client
Jonathan Christison 3 years ago
parent
commit
0a7f11d6bf
  1. 2
      src/main/java/com/redhat/pctsec/model/Git.java
  2. 4
      src/main/java/com/redhat/pctsec/model/Scan.java
  3. 6
      src/main/java/com/redhat/pctsec/model/ScanRequest.java
  4. 22
      src/main/java/com/redhat/pctsec/model/ScanRequests.java

2
src/main/java/com/redhat/pctsec/model/Git.java

@ -12,7 +12,7 @@ import java.util.UUID;
@Entity
public class Git {
public Git() {
super();
}
@Id

4
src/main/java/com/redhat/pctsec/model/Scan.java

@ -58,9 +58,9 @@ public class Scan {
@Email
private String email;
@OneToOne(cascade = CascadeType.ALL, fetch=FetchType.LAZY)
@OneToOne(cascade = CascadeType.ALL, fetch=FetchType.EAGER)
@JoinColumn(name = "scan_requests_id", referencedColumnName = "id")
public ScanRequests scanRequests;
public ScanRequests scanRequests = new ScanRequests();
public Scan() {
this.scanRequests = new ScanRequests();

6
src/main/java/com/redhat/pctsec/model/ScanRequest.java

@ -43,17 +43,17 @@ public class ScanRequest {
private RequestType type;
@OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
@OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "brew_build_id", referencedColumnName = "id")
@JsonInclude(JsonInclude.Include.NON_NULL)
public BrewBuild brewBuild;
@OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
@OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "pnc_build_id", referencedColumnName = "id")
@JsonInclude(JsonInclude.Include.NON_NULL)
public PNCBuild pncBuild;
@OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
@OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "git_id", referencedColumnName = "id")
@JsonInclude(JsonInclude.Include.NON_NULL)
public Git git;

22
src/main/java/com/redhat/pctsec/model/ScanRequests.java

@ -11,6 +11,8 @@ import java.util.*;
import java.util.stream.Collectors;
import jakarta.persistence.*;
import jakarta.transaction.Transactional;
import org.jboss.logging.annotations.Property;
@ApplicationScoped
@Entity
@ -21,10 +23,11 @@ public class ScanRequests {
@GeneratedValue
protected UUID id;
@JsonIgnore
@OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
@OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "scan_request_id", referencedColumnName = "id")
private Set<ScanRequest> scanRequests;// = new HashSet<>();
public Set<ScanRequest> scanRequests = new HashSet<>();
@Column(name="scan_properties")
@ -93,16 +96,14 @@ public class ScanRequests {
*/
}
@JsonProperty("scanRequests")
public Set<ScanRequest> getScanRequests() {
return scanRequests;
}
public void setScanRequests(Set<ScanRequest> scanRequests) {
this.scanRequests = scanRequests;
}
@JsonProperty("globalScanProperties")
@Transient
public String getGlobalScanProperties() {
return globalScanProperties;
}
@ -113,6 +114,7 @@ public class ScanRequests {
@JsonProperty("scanMetadata")
@Transient
public String getScanMetadata() {
return scanMetadata;
}
@ -120,4 +122,10 @@ public class ScanRequests {
public void setScanMetadata(String scanMetadata) {
this.scanMetadata = scanMetadata;
}
@JsonProperty("scanRequests")
@Transient
public Set<ScanRequest> getScanRequests() {
return this.scanRequests;
}
}

Loading…
Cancel
Save