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 "Updated test of info-types"
[nonrtric.git]
/
enrichment-coordinator-service
/
src
/
main
/
java
/
org
/
oransc
/
enrichment
/
controllers
/
ErrorResponse.java
diff --git
a/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java
b/enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java
index
28c40bf
..
d423e19
100644
(file)
--- a/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java
+++ b/
enrichment-coordinator-service/src/main/java/org/oransc/enrichment/controllers/ErrorResponse.java
@@
-24,8
+24,7
@@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.SerializedName;
import com.google.gson.GsonBuilder;
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.oransc.enrichment.exceptions.ServiceException;
import org.springframework.http.HttpHeaders;
import org.oransc.enrichment.exceptions.ServiceException;
import org.springframework.http.HttpHeaders;
@@
-35,11
+34,12
@@
import org.springframework.http.ResponseEntity;
import reactor.core.publisher.Mono;
public class ErrorResponse {
import reactor.core.publisher.Mono;
public class ErrorResponse {
- private static Gson gson = new GsonBuilder() //
- .create(); //
+ private static Gson gson = new GsonBuilder().create();
// Returned as body for all failed REST calls
// Returned as body for all failed REST calls
- @ApiModel(value = "error_information", description = "Problem as defined in https://tools.ietf.org/html/rfc7807")
+ @Schema(
+ name = "ProblemDetails",
+ description = "A problem detail to carry details in a HTTP response according to RFC 7807")
public static class ErrorInfo {
@SerializedName("type")
private String type = "about:blank";
public static class ErrorInfo {
@SerializedName("type")
private String type = "about:blank";
@@
-61,22
+61,22
@@
public class ErrorResponse {
this.status = status;
}
this.status = status;
}
- @
ApiModelProperty
(
+ @
Schema
(
example = "404",
example = "404",
-
value
= "The HTTP status code generated by the origin server for this occurrence of the problem.")
+
description
= "The HTTP status code generated by the origin server for this occurrence of the problem.")
public Integer getStatus() {
return status;
}
public Integer getStatus() {
return status;
}
- @
ApiModelProperty
(
+ @
Schema
(
example = "EI job type not found",
example = "EI job type not found",
-
value
= "A human-readable explanation specific to this occurrence of the problem.")
+
description
= "A human-readable explanation specific to this occurrence of the problem.")
public String getDetail() {
return this.detail;
}
}
public String getDetail() {
return this.detail;
}
}
- @
ApiModelProperty(valu
e = "message")
+ @
Schema(nam
e = "message")
public final String message;
ErrorResponse(String message) {
public final String message;
ErrorResponse(String message) {