Merge "New EI Consumer API, aligned to ORAN WG2"

[nonrtric.git] / enrichment-coordinator-service / src / main / java / org / oransc / enrichment / controllers / producer / ProducerRegistrationInfo.java

diff --git a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerRegistrationInfo.java b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerRegistrationInfo.java
index c48c716..859443d 100644 (file)
--- a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerRegistrationInfo.java
+++ b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/producer/ProducerRegistrationInfo.java
@@ -1,9 +1,9 @@
 /*-
  * ========================LICENSE_START=================================
- * ONAP : 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
@@ -31,7 +31,7 @@ import java.util.Collection;
 import org.immutables.gson.Gson;
 
 @Gson.TypeAdapters
-@ApiModel(value = "producer_registration_info", description = "Information for an EI Producer")
+@ApiModel(value = "producer_registration_info", description = "Information for an EI producer")
 public class ProducerRegistrationInfo {
 
     @Gson.TypeAdapters
@@ -44,8 +44,8 @@ public class ProducerRegistrationInfo {
         public String eiTypeId;
 
         @ApiModelProperty(value = "Json schema for the job data")
-        @SerializedName("job_data_schema")
-        @JsonProperty("job_data_schema")
+        @SerializedName("ei_job_data_schema")
+        @JsonProperty("ei_job_data_schema")
         public Object jobDataSchema;
 
         public ProducerEiTypeRegistrationInfo(Object jobDataSchema, String eiTypeId) {
@@ -63,20 +63,26 @@ public class ProducerRegistrationInfo {
     public Collection<ProducerEiTypeRegistrationInfo> types;
 
     @ApiModelProperty(value = "callback for job creation", required = true)
-    @SerializedName("job_creation_callback_url")
-    @JsonProperty(value = "job_creation_callback_url", required = true)
+    @SerializedName("ei_job_creation_callback_url")
+    @JsonProperty(value = "ei_job_creation_callback_url", required = true)
     public String jobCreationCallbackUrl;
 
     @ApiModelProperty(value = "callback for job deletion", required = true)
-    @SerializedName("job_deletion_callback_url")
-    @JsonProperty(value = "job_deletion_callback_url", required = true)
+    @SerializedName("ei_job_deletion_callback_url")
+    @JsonProperty(value = "ei_job_deletion_callback_url", required = true)
     public String jobDeletionCallbackUrl;
 
+    @ApiModelProperty(value = "callback for producer supervision", required = true)
+    @SerializedName("ei_producer_supervision_callback_url")
+    @JsonProperty(value = "ei_producer_supervision_callback_url", required = true)
+    public String producerSupervisionCallbackUrl;
+
     public ProducerRegistrationInfo(Collection<ProducerEiTypeRegistrationInfo> types, String jobCreationCallbackUrl,
-        String jobDeletionCallbackUrl) {
+        String jobDeletionCallbackUrl, String producerSupervisionCallbackUrl) {
         this.types = types;
         this.jobCreationCallbackUrl = jobCreationCallbackUrl;
         this.jobDeletionCallbackUrl = jobDeletionCallbackUrl;
+        this.producerSupervisionCallbackUrl = producerSupervisionCallbackUrl;
     }
 
     public ProducerRegistrationInfo() {