Browse Source

We dont need to return every field, especially private ones

refactor_future_hack
Jonathan Christison 3 years ago
parent
commit
c724442abb
  1. 6
      hack/sample-pssaas.json
  2. 3
      src/main/java/com/redhat/pctsec/model/Scan.java
  3. 4
      src/main/java/com/redhat/pctsec/model/ScanRequest.java
  4. 2
      src/main/java/com/redhat/pctsec/model/ScanRequests.java
  5. 3
      src/main/java/com/redhat/pctsec/model/ScanTask.java
  6. 4
      src/main/java/com/redhat/pctsec/model/jpa/ScanRequestsRepository.java
  7. 4
      src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanRequestsResource.java
  8. 3
      src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanResource.java

6
hack/sample-pssaas.json

@ -6,6 +6,10 @@
{"build-id":"ASLKGOMQVVAAA", {"build-id":"ASLKGOMQVVAAA",
"type":"pnc"}, "type":"pnc"},
{"build-id":"ASLMBTBCNVAAA", {"build-id":"ASLMBTBCNVAAA",
"type":"pnc"}] "type":"pnc"},
{"type":"git",
"repo":"https://code.engineering.redhat.com/gerrit/quarkusio/quarkus.git",
"ref":"2.13.8.Final-redhat-00001"}
]
} }

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

@ -1,5 +1,6 @@
package com.redhat.pctsec.model; package com.redhat.pctsec.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.transaction.Transactional; import jakarta.transaction.Transactional;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
@ -86,11 +87,13 @@ public class Scan {
//@Temporal(TemporalType.TIMESTAMP) //@Temporal(TemporalType.TIMESTAMP)
@CreationTimestamp @CreationTimestamp
@JsonIgnore
@Column(name="creation_timestamp") @Column(name="creation_timestamp")
//@NotNull //@NotNull
private Instant creationTimestamp; private Instant creationTimestamp;
@UpdateTimestamp @UpdateTimestamp
@JsonIgnore
@Column(name="update_timestamp") @Column(name="update_timestamp")
//@NotNull //@NotNull
private Instant updateTimestamp; private Instant updateTimestamp;

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

@ -1,5 +1,6 @@
package com.redhat.pctsec.model; package com.redhat.pctsec.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.redhat.pctsec.model.api.request.git; import com.redhat.pctsec.model.api.request.git;
import com.redhat.pctsec.tekton.brewTaskRun; import com.redhat.pctsec.tekton.brewTaskRun;
import com.redhat.pctsec.tekton.scmUrlPipelineRun; import com.redhat.pctsec.tekton.scmUrlPipelineRun;
@ -20,7 +21,7 @@ public class ScanRequest {
@Id @Id
@GeneratedValue @GeneratedValue
private UUID id; protected UUID id;
private String metadata; private String metadata;
private String oshScanOptions; private String oshScanOptions;
@ -33,6 +34,7 @@ public class ScanRequest {
} }
@Transient @Transient
@JsonIgnore
@Inject @Inject
EventBus bus; EventBus bus;

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

@ -18,7 +18,7 @@ public class ScanRequests {
@Id @Id
@GeneratedValue @GeneratedValue
private UUID id; protected UUID id;
@OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL) @OneToMany(fetch=FetchType.EAGER, cascade = CascadeType.ALL)
@JoinColumn(name = "scan_request_id", referencedColumnName = "id") @JoinColumn(name = "scan_request_id", referencedColumnName = "id")

3
src/main/java/com/redhat/pctsec/model/ScanTask.java

@ -1,6 +1,7 @@
package com.redhat.pctsec.model; package com.redhat.pctsec.model;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.vertx.core.eventbus.impl.EventBusImpl; import io.vertx.core.eventbus.impl.EventBusImpl;
import io.vertx.mutiny.core.eventbus.EventBus; import io.vertx.mutiny.core.eventbus.EventBus;
import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.Dependent;
@ -10,7 +11,7 @@ import jakarta.inject.Inject;
@Dependent @Dependent
public class ScanTask { public class ScanTask {
@JsonIgnore
@Inject @Inject
EventBus bus; EventBus bus;
public ScanTaskState state; public ScanTaskState state;

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

@ -0,0 +1,4 @@
package com.redhat.pctsec.model.jpa;
public class ScanRequestsRepository {
}

4
src/main/java/com/redhat/pctsec/rest/v1alpha1/ScanRequestsResource.java

@ -0,0 +1,4 @@
package com.redhat.pctsec.rest.v1alpha1;
public class ScanRequestsResource {
}

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

@ -58,6 +58,7 @@ public class ScanResource {
{ {
return sr.listAll(); return sr.listAll();
} }
@GET @GET
@Path("{id}") @Path("{id}")
@Produces({"application/json"}) @Produces({"application/json"})
@ -93,6 +94,7 @@ public class ScanResource {
@GET @GET
@Path("single/brew") @Path("single/brew")
@Produces({"application/json"}) @Produces({"application/json"})
@Transactional
public Scan singleGit(@RestQuery String brewId) public Scan singleGit(@RestQuery String brewId)
{ {
Scan s = new Scan(); Scan s = new Scan();
@ -104,6 +106,7 @@ public class ScanResource {
@GET @GET
@Path("single/pnc") @Path("single/pnc")
@Produces({"application/json"}) @Produces({"application/json"})
@Transactional
public Scan singlePNC(@RestQuery String pncId) public Scan singlePNC(@RestQuery String pncId)
{ {
Scan s = new Scan(); Scan s = new Scan();

Loading…
Cancel
Save