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 "New EI Consumer API, aligned to ORAN WG2"
[nonrtric.git]
/
enrichment-coordinator-service
/
src
/
main
/
java
/
org
/
oransc
/
enrichment
/
clients
/
ProducerJobInfo.java
diff --git
a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerJobInfo.java
b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerJobInfo.java
index
ff91221
..
ada16e2
100644
(file)
--- a/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerJobInfo.java
+++ b/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/clients/ProducerJobInfo.java
@@
-1,9
+1,9
@@
/*-
* ========================LICENSE_START=================================
/*-
* ========================LICENSE_START=================================
- * O
NAP : ccsdk oran
- *
======================================================================
- * Copyright (C) 2020 Nordix Foundation
. All rights reserved.
- *
======================================================================
+ * O
-RAN-SC
+ *
%%
+ * Copyright (C) 2020 Nordix Foundation
+ *
%%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@
-28,7
+28,6
@@
import io.swagger.annotations.ApiModelProperty;
import org.immutables.gson.Gson;
import org.oransc.enrichment.repository.EiJob;
import org.immutables.gson.Gson;
import org.oransc.enrichment.repository.EiJob;
-import org.oransc.enrichment.repository.EiType;
@Gson.TypeAdapters
@ApiModel(
@Gson.TypeAdapters
@ApiModel(
@@
-51,14
+50,20
@@
public class ProducerJobInfo {
@JsonProperty("ei_job_data")
public Object jobData;
@JsonProperty("ei_job_data")
public Object jobData;
- public ProducerJobInfo(Object jobData, String id, String typeId) {
+ @ApiModelProperty(value = "URI for the target of the EI")
+ @SerializedName("target_uri")
+ @JsonProperty("target_uri")
+ public String targetUri;
+
+ public ProducerJobInfo(Object jobData, String id, String typeId, String targetUri) {
this.id = id;
this.jobData = jobData;
this.typeId = typeId;
this.id = id;
this.jobData = jobData;
this.typeId = typeId;
+ this.targetUri = targetUri;
}
}
- public ProducerJobInfo(
Object jobData, EiJob job, EiType type
) {
- this(job
Data, job.id(), type.getId
());
+ public ProducerJobInfo(
EiJob job
) {
+ this(job
.jobData(), job.id(), job.type().getId(), job.targetUri
());
}
public ProducerJobInfo() {
}
public ProducerJobInfo() {