Browse Source

Set some fields to be public for json return

refactor_future_hack
Jonathan Christison 3 years ago
parent
commit
be2f54c9c0
  1. 2
      src/main/java/com/redhat/pctsec/model/BuildType.java
  2. 4
      src/main/java/com/redhat/pctsec/model/Git.java
  3. 6
      src/main/java/com/redhat/pctsec/model/Scan.java
  4. 6
      src/main/java/com/redhat/pctsec/model/ScanRequest.java
  5. 4
      src/main/java/com/redhat/pctsec/model/jpa/ScanRepository.java
  6. 22
      src/main/java/com/redhat/pctsec/model/jpa/UriConverter.java
  7. 32
      src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

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

@ -16,7 +16,7 @@ abstract public class BuildType {
@JsonProperty()
@Column(name="buildref")
private String buildRef;
public String buildRef;
public BuildType(String buildRef)
{

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

@ -18,8 +18,8 @@ public class Git {
@GeneratedValue(strategy = GenerationType.AUTO)
private UUID id;
private URI repo;
private String ref;
public URI repo;
public String ref;
public Git(String repo, String ref) {
this.repo = URI.create(repo);

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

@ -69,7 +69,7 @@ public class Scan {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private UUID id;
public UUID id;
/*
@ -105,7 +105,7 @@ public class Scan {
@Email
private String email;
@OneToOne(cascade = CascadeType.ALL)
@OneToOne(cascade = CascadeType.ALL, fetch=FetchType.EAGER)
@JoinColumn(name = "scan_requests_id", referencedColumnName = "id")
private ScanRequests scanRequests;
public ScanRequests scanRequests;
}

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

@ -32,13 +32,13 @@ public class ScanRequest {
@OneToOne
@JoinColumn(name = "brew_build_id", referencedColumnName = "id")
BrewBuild brewBuild;
public BrewBuild brewBuild;
@OneToOne
@JoinColumn(name = "pnc_build_id", referencedColumnName = "id")
PNCBuild pncBuild;
public PNCBuild pncBuild;
@OneToOne(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "git_id", referencedColumnName = "id")
Git git;
public Git git;
public ScanRequest() {
}

4
src/main/java/com/redhat/pctsec/model/jpa/ScanRepository.java

@ -9,12 +9,8 @@ import java.util.UUID;
@ApplicationScoped
public class ScanRepository implements PanacheRepositoryBase<Scan, UUID> {
public Uni<Scan> findByProduct(String product)
{
return find("product", product).firstResult();
}
}

22
src/main/java/com/redhat/pctsec/model/jpa/UriConverter.java

@ -0,0 +1,22 @@
package com.redhat.pctsec.model.jpa;
import jakarta.persistence.AttributeConverter;
import jakarta.persistence.Converter;
import java.net.URI;
@Converter(autoApply = true)
public class UriConverter implements AttributeConverter<URI, String>
{
@Override
public String convertToDatabaseColumn(URI uri) {
return (uri == null) ? null : uri.toString();
}
@Override
public URI convertToEntityAttribute(String s) {
return ((s.length() > 0) ? URI.create(s.trim()) : null);
}
}

32
src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

@ -47,8 +47,10 @@ public class ScanResource {
@GET
@Path("{id}")
@Produces({"application/json"})
public Scan scanRequest(String id){
return sr.findById(UUID.fromString(id));
public Scan scanRequest(String id)
{
Scan s = sr.findById(UUID.fromString(id));
return s;
}
@GET
@ -57,23 +59,16 @@ public class ScanResource {
return "We'd normally have a json payload here, with pipeline UID";
}
@GET
@Path("single/git")
@Produces({"application/json"})
@Transactional
public Scan singleGit(@RestQuery String repo, @RestQuery String ref)
{
//ScanRequest scanRequest = new ScanRequest(new Git(repo, ref));
//sr.persist(scanRequests);
Scan s = new Scan();
//s.setScanRequests(new ScanRequests().setScanRequests((Set<ScanRequest>) new Git(repo, ref)));
//ScanRequests scanRequests = new ScanRequests();
//scanRequests.addGit(repo,ref);
s.setRequestor("jochrist");
s.getScanRequests().addGit(repo,ref);
//s.setScanRequests(
sr.persist(s);
return s;
}
@ -83,6 +78,21 @@ public class ScanResource {
@Produces({"application/json"})
public Scan singleGit(@RestQuery String brewId)
{
return null;
Scan s = new Scan();
s.setRequestor("jochrist");
s.getScanRequests().addBrewBuild(brewId);
sr.persist(s);
return s;
}
@GET
@Path("single/pnc")
@Produces({"application/json"})
public Scan singlePNC(@RestQuery String pncId)
{
Scan s = new Scan();
s.setRequestor("jochrist");
s.getScanRequests().addPNCBuild(pncId);
sr.persist(s);
return s;
}
}

Loading…
Cancel
Save