Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add docker-compose for nonrtric-gateway"
[nonrtric.git]
/
enrichment-coordinator-service
/
src
/
main
/
java
/
org
/
oransc
/
enrichment
/
controllers
/
consumer
/
ConsumerEiJobInfo.java
diff --git
a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerEiJobInfo.java
b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerEiJobInfo.java
index
d6996ce
..
0b750f5
100644
(file)
--- a/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerEiJobInfo.java
+++ b/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/consumer/ConsumerEiJobInfo.java
@@
-23,36
+23,35
@@
package org.oransc.enrichment.controllers.consumer;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import org.immutables.gson.Gson;
@Gson.TypeAdapters
import org.immutables.gson.Gson;
@Gson.TypeAdapters
-@
ApiModel(valu
e = "EiJobObject", description = "Information for an Enrichment Information Job")
+@
Schema(nam
e = "EiJobObject", description = "Information for an Enrichment Information Job")
public class ConsumerEiJobInfo {
public class ConsumerEiJobInfo {
- @
ApiModelProperty(value
= "EI type Idenitifier of the EI job", required = true)
+ @
Schema(name = "eiTypeId", description
= "EI type Idenitifier of the EI job", required = true)
@SerializedName("eiTypeId")
@JsonProperty(value = "eiTypeId", required = true)
public String eiTypeId;
@SerializedName("eiTypeId")
@JsonProperty(value = "eiTypeId", required = true)
public String eiTypeId;
- @
ApiModelProperty(value
= "Identity of the owner of the job", required = true)
+ @
Schema(name = "jobOwner", description
= "Identity of the owner of the job", required = true)
@SerializedName("jobOwner")
@JsonProperty(value = "jobOwner", required = true)
public String owner;
@SerializedName("jobOwner")
@JsonProperty(value = "jobOwner", required = true)
public String owner;
- @
ApiModelProperty(value
= "EI type specific job data", required = true)
+ @
Schema(name = "jobDefinition", description
= "EI type specific job data", required = true)
@SerializedName("jobDefinition")
@JsonProperty(value = "jobDefinition", required = true)
@SerializedName("jobDefinition")
@JsonProperty(value = "jobDefinition", required = true)
- public Object jobD
ata
;
+ public Object jobD
efinition
;
- @
ApiModelProperty(value
= "The target URI of the EI data", required = true)
+ @
Schema(name = "jobResultUri", description
= "The target URI of the EI data", required = true)
@SerializedName("jobResultUri")
@JsonProperty(value = "jobResultUri", required = true)
@SerializedName("jobResultUri")
@JsonProperty(value = "jobResultUri", required = true)
- public String
targe
tUri;
+ public String
jobResul
tUri;
- @
ApiModelProperty(value
= "The target of EI job status notifications", required = false)
+ @
Schema(name = "statusNotificationUri", description
= "The target of EI job status notifications", required = false)
@SerializedName("jobStatusNotificationUri")
@JsonProperty(value = "jobStatusNotificationUri", required = false)
public String statusNotificationUri;
@SerializedName("jobStatusNotificationUri")
@JsonProperty(value = "jobStatusNotificationUri", required = false)
public String statusNotificationUri;
@@
-60,10
+59,12
@@
public class ConsumerEiJobInfo {
public ConsumerEiJobInfo() {
}
public ConsumerEiJobInfo() {
}
- public ConsumerEiJobInfo(String eiTypeId, Object jobData, String owner, String targetUri) {
+ public ConsumerEiJobInfo(String eiTypeId, Object jobData, String owner, String targetUri,
+ String statusNotificationUri) {
this.eiTypeId = eiTypeId;
this.eiTypeId = eiTypeId;
- this.jobD
ata
= jobData;
+ this.jobD
efinition
= jobData;
this.owner = owner;
this.owner = owner;
- this.targetUri = targetUri;
+ this.jobResultUri = targetUri;
+ this.statusNotificationUri = statusNotificationUri;
}
}
}
}