Mentions légales du service

Skip to content
Snippets Groups Projects
Commit df90b284 authored by Renovate Tac's avatar Renovate Tac Committed by Jujube Orange
Browse files

build(deps): update dependency org.openapitools:openapi-generator-maven-plugin to v6

parent 4c34044e
No related branches found
No related tags found
1 merge request!66build(deps): update dependency org.openapitools:openapi-generator-maven-plugin to v6
Pipeline #609970 passed
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
<plugin> <plugin>
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId> <artifactId>openapi-generator-maven-plugin</artifactId>
<version>5.4.0</version> <version>6.0.0</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
...@@ -218,6 +218,7 @@ ...@@ -218,6 +218,7 @@
</modelPackage> </modelPackage>
<configOptions> <configOptions>
<sourceFolder>src/main/kotlin</sourceFolder> <sourceFolder>src/main/kotlin</sourceFolder>
<documentationProvider>none</documentationProvider>
<dateLibrary>java8</dateLibrary> <dateLibrary>java8</dateLibrary>
<interfaceOnly>true</interfaceOnly> <interfaceOnly>true</interfaceOnly>
<useTags>true</useTags> <useTags>true</useTags>
......
package fr.gouv.stopc.submissioncode.controller package fr.gouv.stopc.submissioncode.controller
import com.fasterxml.jackson.databind.exc.MismatchedInputException import com.fasterxml.jackson.databind.exc.MismatchedInputException
import fr.gouv.stopc.submissioncode.api.model.ErrorDetails
import fr.gouv.stopc.submissioncode.api.model.ErrorResponse import fr.gouv.stopc.submissioncode.api.model.ErrorResponse
import fr.gouv.stopc.submissioncode.api.model.ErrorResponseErrors
import org.slf4j.LoggerFactory.getLogger import org.slf4j.LoggerFactory.getLogger
import org.springframework.http.HttpHeaders import org.springframework.http.HttpHeaders
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
...@@ -38,9 +38,9 @@ class RestExceptionHandler(private val servletRequest: HttpServletRequest) : Res ...@@ -38,9 +38,9 @@ class RestExceptionHandler(private val servletRequest: HttpServletRequest) : Res
): ResponseEntity<Any> { ): ResponseEntity<Any> {
return badRequestAndLogErrors( return badRequestAndLogErrors(
ex.fieldErrors.map { ex.fieldErrors.map {
ErrorResponseErrors(it.field, it.code, it.defaultMessage) ErrorDetails(it.field, it.code ?: "", it.defaultMessage ?: "")
} + ex.globalErrors.map { } + ex.globalErrors.map {
ErrorResponseErrors("", it.code, it.defaultMessage) ErrorDetails("", it.code ?: "", it.defaultMessage ?: "")
} }
) )
} }
...@@ -48,9 +48,9 @@ class RestExceptionHandler(private val servletRequest: HttpServletRequest) : Res ...@@ -48,9 +48,9 @@ class RestExceptionHandler(private val servletRequest: HttpServletRequest) : Res
@ExceptionHandler @ExceptionHandler
fun handle(ex: ConstraintViolationException): ResponseEntity<Any> { fun handle(ex: ConstraintViolationException): ResponseEntity<Any> {
val errors = ex.constraintViolations.map { val errors = ex.constraintViolations.map {
ErrorResponseErrors( ErrorDetails(
field = it.propertyPath.toString(), field = it.propertyPath.toString(),
code = it.constraintDescriptor.annotation.annotationClass.simpleName, code = it.constraintDescriptor.annotation.annotationClass.java.simpleName,
message = it.message message = it.message
) )
} }
...@@ -65,25 +65,25 @@ class RestExceptionHandler(private val servletRequest: HttpServletRequest) : Res ...@@ -65,25 +65,25 @@ class RestExceptionHandler(private val servletRequest: HttpServletRequest) : Res
): ResponseEntity<Any> { ): ResponseEntity<Any> {
val cause = ex.cause val cause = ex.cause
val error = if (cause is MismatchedInputException) { val error = if (cause is MismatchedInputException) {
ErrorResponseErrors( ErrorDetails(
field = cause.path field = cause.path
.map { if (it.fieldName != null) ".${it.fieldName}" else "[${it.index}]" } .map { if (it.fieldName != null) ".${it.fieldName}" else "[${it.index}]" }
.joinToString("") .joinToString("")
.removePrefix("."), .removePrefix("."),
code = "HttpMessageNotReadable", code = "HttpMessageNotReadable",
message = ex.rootCause!!.message message = ex.rootCause?.message ?: ""
) )
} else { } else {
ErrorResponseErrors( ErrorDetails(
field = "", field = "",
code = ex::class.simpleName, code = ex::class.java.simpleName,
message = ex.message message = ex.message ?: ""
) )
} }
return badRequestAndLogErrors(listOf(error)) return badRequestAndLogErrors(listOf(error))
} }
private fun badRequestAndLogErrors(errors: List<ErrorResponseErrors>): ResponseEntity<Any> { private fun badRequestAndLogErrors(errors: List<ErrorDetails>): ResponseEntity<Any> {
val errorResponseBody = ErrorResponse( val errorResponseBody = ErrorResponse(
status = HttpStatus.BAD_REQUEST.value(), status = HttpStatus.BAD_REQUEST.value(),
error = HttpStatus.BAD_REQUEST.reasonPhrase, error = HttpStatus.BAD_REQUEST.reasonPhrase,
......
...@@ -42,6 +42,23 @@ components: ...@@ -42,6 +42,23 @@ components:
path: /api/v1/resource path: /api/v1/resource
timestamp: "2021-06-01T11:28:23.603Z" timestamp: "2021-06-01T11:28:23.603Z"
schemas: schemas:
ErrorDetails:
type: object
description: details about the error
properties:
field:
type: string
description: the field name having an error
code:
type: string
description: an error code
message:
type: string
description: an error message
required:
- field
- code
- message
ErrorResponse: ErrorResponse:
type: object type: object
properties: properties:
...@@ -64,18 +81,7 @@ components: ...@@ -64,18 +81,7 @@ components:
errors: errors:
type: array type: array
items: items:
type: object $ref: "#/components/schemas/ErrorDetails"
description: details about the error
properties:
field:
type: string
description: the field name having an error
code:
type: string
description: an error code
message:
type: string
description: an error message
minLength: 1 minLength: 1
required: required:
- status - status
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment