Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add OAS mapping for HTTP status code errors #1604

Merged
merged 13 commits into from
Feb 14, 2024
Merged

Add OAS mapping for HTTP status code errors #1604

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ba76600
Add support for status code error responses
TharmiganK Feb 1, 2024
0a040e2
Organize code base
TharmiganK Feb 2, 2024
86c7f52
Fix the status code inferring logic
TharmiganK Feb 2, 2024
7416943
Fix response overwrite due to data binding
TharmiganK Feb 2, 2024
d3f915a
Add test cases
TharmiganK Feb 2, 2024
43557d1
Update ballerina lang timestamped version
TharmiganK Feb 8, 2024
80043d5
Add additional test case
TharmiganK Feb 8, 2024
3f51c34
Fix assertion for no warnings
TharmiganK Feb 8, 2024
4ae8d86
Add suggestions from review
TharmiganK Feb 13, 2024
097d045
Fix test case
TharmiganK Feb 13, 2024
063c4d1
Fix adding default values for response headers
TharmiganK Feb 13, 2024
71eb56e
Fix test cases
TharmiganK Feb 13, 2024
5ec92e5
Merge branch 'master' into support-status-code-errors
TharmiganK Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions ballerina-to-openapi/src/main/java/io/ballerina/openapi/service/mapper/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,51 @@ public String toString() {
// TODO: remove this after fixing https://github.com/ballerina-platform/ballerina-standard-library/issues/4245
HTTP_CODES = Collections.unmodifiableMap(httpCodeMap);
}
public static final Map<String, String> HTTP_STATUS_CODE_ERRORS;
static {
Map<String, String> httpErrorCodeMap = new HashMap<>();
httpErrorCodeMap.put("DefaultStatusCodeError", "default");
httpErrorCodeMap.put("BadRequestError", "400");
httpErrorCodeMap.put("UnauthorizedError", "401");
httpErrorCodeMap.put("PaymentRequiredError", "402");
httpErrorCodeMap.put("ForbiddenError", "403");
httpErrorCodeMap.put("NotFoundError", "404");
httpErrorCodeMap.put("MethodNotAllowedError", "405");
httpErrorCodeMap.put("NotAcceptableError", "406");
httpErrorCodeMap.put("ProxyAuthenticationRequiredError", "407");
httpErrorCodeMap.put("RequestTimeOutError", "408");
httpErrorCodeMap.put("ConflictError", "409");
httpErrorCodeMap.put("GoneError", "410");
httpErrorCodeMap.put("LengthRequiredError", "411");
httpErrorCodeMap.put("PreconditionFailedError", "412");
httpErrorCodeMap.put("PayloadTooLargeError", "413");
httpErrorCodeMap.put("UriTooLongError", "414");
httpErrorCodeMap.put("UnsupportedMediaTypeError", "415");
httpErrorCodeMap.put("RangeNotSatisfiableError", "416");
httpErrorCodeMap.put("ExpectationFailedError", "417");
httpErrorCodeMap.put("MisdirectedRequestError", "421");
httpErrorCodeMap.put("UnprocessableEntityError", "422");
httpErrorCodeMap.put("LockedError", "423");
httpErrorCodeMap.put("FailedDependencyError", "424");
httpErrorCodeMap.put("TooEarlyError", "425");
httpErrorCodeMap.put("UpgradeRequiredError", "426");
httpErrorCodeMap.put("PreconditionRequiredError", "428");
httpErrorCodeMap.put("TooManyRequestsError", "429");
httpErrorCodeMap.put("RequestHeaderFieldsTooLargeError", "431");
httpErrorCodeMap.put("UnavailableDueToLegalReasonsError", "451");
httpErrorCodeMap.put("InternalServerErrorError", "500");
httpErrorCodeMap.put("NotImplementedError", "501");
httpErrorCodeMap.put("BadGatewayError", "502");
httpErrorCodeMap.put("ServiceUnavailableError", "503");
httpErrorCodeMap.put("GatewayTimeoutError", "504");
httpErrorCodeMap.put("HttpVersionNotSupportedError", "505");
httpErrorCodeMap.put("VariantAlsoNegotiatesError", "506");
httpErrorCodeMap.put("InsufficientStorageError", "507");
httpErrorCodeMap.put("LoopDetectedError", "508");
httpErrorCodeMap.put("NotExtendedError", "510");
httpErrorCodeMap.put("NetworkAuthenticationRequiredError", "511");
HTTP_STATUS_CODE_ERRORS = Collections.unmodifiableMap(httpErrorCodeMap);
}
public static final Map<String, String> HTTP_CODE_DESCRIPTIONS;
static {
Map<String, String> httpCodeDescriptionMap = new HashMap<>();
Expand Down
6 changes: 4 additions & 2 deletions ...pi/src/main/java/io/ballerina/openapi/service/mapper/constraint/ConstraintMapperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ public void setConstraints() {
}
Map<String, Schema> schemas = components.getSchemas();
for (Map.Entry<String, Schema> schemaEntry : schemas.entrySet()) {
TypeDefinitionNode typeDefinitionNode = moduleMemberVisitor.getTypeDefinitionNode(schemaEntry.getKey());
if (Objects.isNull(typeDefinitionNode)) {
Optional<TypeDefinitionNode> typeDefNodeOpt = moduleMemberVisitor.getTypeDefinitionNode(
schemaEntry.getKey());
if (typeDefNodeOpt.isEmpty()) {
continue;
}
TypeDefinitionNode typeDefinitionNode = typeDefNodeOpt.get();
if (typeDefinitionNode.metadata().isPresent()) {
ConstraintAnnotation.ConstraintAnnotationBuilder constraintBuilder =
new ConstraintAnnotation.ConstraintAnnotationBuilder();
Expand Down
7 changes: 4 additions & 3 deletions ...-openapi/src/main/java/io/ballerina/openapi/service/mapper/model/ModuleMemberVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import io.ballerina.openapi.service.mapper.utils.MapperCommonUtils;

import java.util.LinkedHashSet;
import java.util.Optional;
import java.util.Set;

/**
Expand All @@ -49,12 +50,12 @@ public Set<ListenerDeclarationNode> getListenerDeclarationNodes() {
return listenerDeclarationNodes;
}

public TypeDefinitionNode getTypeDefinitionNode(String typeName) {
public Optional<TypeDefinitionNode> getTypeDefinitionNode(String typeName) {
for (TypeDefinitionNode typeDefinitionNode : typeDefinitionNodes) {
if (MapperCommonUtils.unescapeIdentifier(typeDefinitionNode.typeName().text()).equals(typeName)) {
return typeDefinitionNode;
return Optional.of(typeDefinitionNode);
}
}
return null;
return Optional.empty();
}
}
Loading
Loading