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 "First version of docker-compose for policy framework"
[nonrtric.git]
/
enrichment-coordinator-service
/
src
/
main
/
java
/
org
/
oransc
/
enrichment
/
controllers
/
StatusController.java
diff --git
a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java
b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java
index
e823a93
..
68b654e
100644
(file)
--- a/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java
+++ b/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/StatusController.java
@@
-31,9
+31,9
@@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.immutables.gson.Gson;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.immutables.gson.Gson;
-import org.oransc.enrichment.repository.
Ei
Jobs;
-import org.oransc.enrichment.repository.
Ei
Producers;
-import org.oransc.enrichment.repository.
Ei
Types;
+import org.oransc.enrichment.repository.
Info
Jobs;
+import org.oransc.enrichment.repository.
Info
Producers;
+import org.oransc.enrichment.repository.
Info
Types;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
@@
-46,17
+46,17
@@
import reactor.core.publisher.Mono;
@Tag(name = StatusController.API_NAME)
public class StatusController {
@Tag(name = StatusController.API_NAME)
public class StatusController {
- public static final String API_NAME = "
EI
Service status";
+ public static final String API_NAME = "Service status";
public static final String API_DESCRIPTION = "API for monitoring of the service";
@Autowired
public static final String API_DESCRIPTION = "API for monitoring of the service";
@Autowired
- private
EiJobs ei
Jobs;
+ private
InfoJobs info
Jobs;
@Autowired
@Autowired
- private
EiTypes ei
Types;
+ private
InfoTypes info
Types;
@Autowired
@Autowired
- private
EiProducers ei
Producers;
+ private
InfoProducers info
Producers;
@Gson.TypeAdapters
@Schema(name = "status_info")
@Gson.TypeAdapters
@Schema(name = "status_info")
@@
-66,22
+66,22
@@
public class StatusController {
@JsonProperty(value = "status", required = true)
public final String status;
@JsonProperty(value = "status", required = true)
public final String status;
- @Schema(name = "no_of_producers", description = "Number of
EI p
roducers")
+ @Schema(name = "no_of_producers", description = "Number of
Information P
roducers")
@SerializedName("no_of_producers")
@JsonProperty(value = "no_of_producers", required = true)
public final int noOfProducers;
@SerializedName("no_of_producers")
@JsonProperty(value = "no_of_producers", required = true)
public final int noOfProducers;
- @Schema(name = "no_of_types", description = "Number of
EI t
ypes")
+ @Schema(name = "no_of_types", description = "Number of
Information T
ypes")
@SerializedName("no_of_types")
@JsonProperty(value = "no_of_types", required = true)
public final int noOfTypes;
@SerializedName("no_of_types")
@JsonProperty(value = "no_of_types", required = true)
public final int noOfTypes;
- @Schema(name = "no_of_jobs", description = "Number of
EI j
obs")
+ @Schema(name = "no_of_jobs", description = "Number of
Information J
obs")
@SerializedName("no_of_jobs")
@JsonProperty(value = "no_of_jobs", required = true)
public final int noOfJobs;
@SerializedName("no_of_jobs")
@JsonProperty(value = "no_of_jobs", required = true)
public final int noOfJobs;
- public StatusInfo(String status,
EiProducers producers, EiTypes types, Ei
Jobs jobs) {
+ public StatusInfo(String status,
InfoProducers producers, InfoTypes types, Info
Jobs jobs) {
this.status = status;
this.noOfJobs = jobs.size();
this.noOfProducers = producers.size();
this.status = status;
this.noOfJobs = jobs.size();
this.noOfProducers = producers.size();
@@
-99,7
+99,7
@@
public class StatusController {
content = @Content(schema = @Schema(implementation = StatusInfo.class))) //
})
public Mono<ResponseEntity<Object>> getStatus() {
content = @Content(schema = @Schema(implementation = StatusInfo.class))) //
})
public Mono<ResponseEntity<Object>> getStatus() {
- StatusInfo info = new StatusInfo("hunky dory", this.
eiProducers, this.eiTypes, this.ei
Jobs);
+ StatusInfo info = new StatusInfo("hunky dory", this.
infoProducers, this.infoTypes, this.info
Jobs);
return Mono.just(new ResponseEntity<>(info, HttpStatus.OK));
}
return Mono.just(new ResponseEntity<>(info, HttpStatus.OK));
}