Skip to content
Snippets Groups Projects
Commit 5d13266b authored by Jueun Park's avatar Jueun Park
Browse files

wrote test

parent a6635c54
Branches
No related tags found
1 merge request!1Tests/openapi generator
Show whitespace changes
Inline Side-by-side
src/main/jastadd/ReverseParser.jrag
+ 64
− 63
View file @ 5d13266b
...@@ -5,7 +5,7 @@ aspect ReverseParser{ ...@@ -5,7 +5,7 @@ aspect ReverseParser{
public static OpenAPI OpenAPIObject.reverseOpenAPI(OpenAPIObject openapi){ public static OpenAPI OpenAPIObject.reverseOpenAPI(OpenAPIObject openapi){
OpenAPI api = new OpenAPI(); OpenAPI api = new OpenAPI();
if (openapi.getOpenAPI() != null) if (!openapi.getOpenAPI().isEmpty())
api.setOpenapi(openapi.getOpenAPI()); api.setOpenapi(openapi.getOpenAPI());
if (openapi.getI() != null) if (openapi.getI() != null)
api.setInfo(InfoObject.reverseInfo(openapi.getI())); api.setInfo(InfoObject.reverseInfo(openapi.getI()));
...@@ -56,13 +56,13 @@ aspect ReverseParser{ ...@@ -56,13 +56,13 @@ aspect ReverseParser{
public static io.swagger.v3.oas.models.info.Info InfoObject.reverseInfo(InfoObject infoObject){ public static io.swagger.v3.oas.models.info.Info InfoObject.reverseInfo(InfoObject infoObject){
io.swagger.v3.oas.models.info.Info info = new io.swagger.v3.oas.models.info.Info(); io.swagger.v3.oas.models.info.Info info = new io.swagger.v3.oas.models.info.Info();
if (infoObject.getTitle() != null) if (!infoObject.getTitle().isEmpty())
info.setTitle(infoObject.getTitle()); info.setTitle(infoObject.getTitle());
if (infoObject.getVersion() != null) if (!infoObject.getVersion().isEmpty())
info.setVersion(infoObject.getVersion()); info.setVersion(infoObject.getVersion());
if (infoObject.getDescription() != null) if (!infoObject.getDescription().isEmpty())
info.setDescription(infoObject.getDescription()); info.setDescription(infoObject.getDescription());
if (infoObject.getTermsOfService() != null) if (!infoObject.getTermsOfService().isEmpty())
info.setTermsOfService(infoObject.getTermsOfService()); info.setTermsOfService(infoObject.getTermsOfService());
if (infoObject.hasC()) if (infoObject.hasC())
info.setContact(ContactObject.reverseContact(infoObject.getC())); info.setContact(ContactObject.reverseContact(infoObject.getC()));
...@@ -81,11 +81,11 @@ aspect ReverseParser{ ...@@ -81,11 +81,11 @@ aspect ReverseParser{
public static io.swagger.v3.oas.models.info.Contact ContactObject.reverseContact(ContactObject contactObject){ public static io.swagger.v3.oas.models.info.Contact ContactObject.reverseContact(ContactObject contactObject){
io.swagger.v3.oas.models.info.Contact contact = new io.swagger.v3.oas.models.info.Contact(); io.swagger.v3.oas.models.info.Contact contact = new io.swagger.v3.oas.models.info.Contact();
if (contactObject.getName() != null) if (!contactObject.getName().isEmpty())
contact.setName(contactObject.getName()); contact.setName(contactObject.getName());
if (contactObject.getUrl() != null) if (!contactObject.getUrl().isEmpty())
contact.setUrl(contactObject.getUrl()); contact.setUrl(contactObject.getUrl());
if (contactObject.getEmail() != null) if (!contactObject.getEmail().isEmpty())
contact.setEmail(contactObject.getEmail()); contact.setEmail(contactObject.getEmail());
if (contactObject.getNumEx() != 0) { if (contactObject.getNumEx() != 0) {
Map<String, Object> extensions = new HashMap<>(); Map<String, Object> extensions = new HashMap<>();
...@@ -100,9 +100,9 @@ aspect ReverseParser{ ...@@ -100,9 +100,9 @@ aspect ReverseParser{
public static io.swagger.v3.oas.models.info.License LicenseObject.reverseLicense(LicenseObject licenseObject){ public static io.swagger.v3.oas.models.info.License LicenseObject.reverseLicense(LicenseObject licenseObject){
io.swagger.v3.oas.models.info.License license = new io.swagger.v3.oas.models.info.License(); io.swagger.v3.oas.models.info.License license = new io.swagger.v3.oas.models.info.License();
if (licenseObject.getName() != null) if (!licenseObject.getName().isEmpty())
license.setName(licenseObject.getName()); license.setName(licenseObject.getName());
if (licenseObject.getUrl() != null) if (!licenseObject.getUrl().isEmpty())
license.setUrl(licenseObject.getUrl()); license.setUrl(licenseObject.getUrl());
if (licenseObject.getNumEx() != 0) { if (licenseObject.getNumEx() != 0) {
Map<String, Object> extensions = new HashMap<>(); Map<String, Object> extensions = new HashMap<>();
...@@ -117,9 +117,9 @@ aspect ReverseParser{ ...@@ -117,9 +117,9 @@ aspect ReverseParser{
public static Server ServerObject.reverseServer(ServerObject serverObject){ public static Server ServerObject.reverseServer(ServerObject serverObject){
Server server = new Server(); Server server = new Server();
if (serverObject.getUrl() != null) if (!serverObject.getUrl().isEmpty())
server.setUrl(serverObject.getUrl()); server.setUrl(serverObject.getUrl());
if (serverObject.getDescription() != null) if (!serverObject.getDescription().isEmpty())
server.setDescription(serverObject.getDescription()); server.setDescription(serverObject.getDescription());
if (serverObject.getNumSt() != 0) { if (serverObject.getNumSt() != 0) {
ServerVariables serverVariables = new ServerVariables(); ServerVariables serverVariables = new ServerVariables();
...@@ -140,9 +140,9 @@ aspect ReverseParser{ ...@@ -140,9 +140,9 @@ aspect ReverseParser{
public static ServerVariable ServerVariableObject.reverseServerVariable(ServerVariableObject serverVariableObject){ public static ServerVariable ServerVariableObject.reverseServerVariable(ServerVariableObject serverVariableObject){
ServerVariable serverVariable = new ServerVariable(); ServerVariable serverVariable = new ServerVariable();
if (serverVariableObject.getDefault() != null) if (!serverVariableObject.getDefault().isEmpty())
serverVariable.setDefault(serverVariableObject.getDefault()); serverVariable.setDefault(serverVariableObject.getDefault());
if (serverVariableObject.getDescription() != null) if (!serverVariableObject.getDescription().isEmpty())
serverVariable.setDescription(serverVariableObject.getDescription()); serverVariable.setDescription(serverVariableObject.getDescription());
if (serverVariableObject.getNumE() != 0) { if (serverVariableObject.getNumE() != 0) {
List<String> enums = new ArrayList<>(); List<String> enums = new ArrayList<>();
...@@ -270,9 +270,9 @@ aspect ReverseParser{ ...@@ -270,9 +270,9 @@ aspect ReverseParser{
PathItem path = new PathItem(); PathItem path = new PathItem();
PathItemObject p = (PathItemObject) pathItemOb; PathItemObject p = (PathItemObject) pathItemOb;
if (p.getSummary() != null) if (!p.getSummary().isEmpty())
path.setSummary(p.getSummary()); path.setSummary(p.getSummary());
if (p.getDescription() != null) if (!p.getDescription().isEmpty())
path.setDescription(p.getDescription()); path.setDescription(p.getDescription());
if (p.hasG()) if (p.hasG())
path.setGet(OperationObject.reverseOperation(p.getG().getO())); path.setGet(OperationObject.reverseOperation(p.getG().getO()));
...@@ -313,13 +313,13 @@ aspect ReverseParser{ ...@@ -313,13 +313,13 @@ aspect ReverseParser{
for (de.tudresden.inf.st.openapi.ast.Tag t : operationObject.getTList()) for (de.tudresden.inf.st.openapi.ast.Tag t : operationObject.getTList())
operation.addTagsItem(t.getTag()); operation.addTagsItem(t.getTag());
} }
if (operationObject.getSummary() != null) if (!operationObject.getSummary().isEmpty())
operation.setSummary(operationObject.getSummary()); operation.setSummary(operationObject.getSummary());
if (operationObject.getDescription() != null) if (!operationObject.getDescription().isEmpty())
operation.setDescription(operationObject.getDescription()); operation.setDescription(operationObject.getDescription());
if (operationObject.hasEd()) if (operationObject.hasEd())
operation.setExternalDocs(ExternalDocObject.reverseExternalDocs(operationObject.getEd())); operation.setExternalDocs(ExternalDocObject.reverseExternalDocs(operationObject.getEd()));
if (operationObject.getOperationID() != null) if (!operationObject.getOperationID().isEmpty())
operation.setOperationId(operationObject.getOperationID()); operation.setOperationId(operationObject.getOperationID());
if (operationObject.getNumP() != 0) { if (operationObject.getNumP() != 0) {
for (ParameterOb p : operationObject.getPList()) for (ParameterOb p : operationObject.getPList())
...@@ -362,9 +362,9 @@ aspect ReverseParser{ ...@@ -362,9 +362,9 @@ aspect ReverseParser{
public static io.swagger.v3.oas.models.ExternalDocumentation ExternalDocObject.reverseExternalDocs(ExternalDocObject externalDocObject){ public static io.swagger.v3.oas.models.ExternalDocumentation ExternalDocObject.reverseExternalDocs(ExternalDocObject externalDocObject){
ExternalDocumentation externalDocs = new ExternalDocumentation(); ExternalDocumentation externalDocs = new ExternalDocumentation();
if (externalDocObject.getDescription() != null) if (!externalDocObject.getDescription().isEmpty())
externalDocs.setDescription(externalDocObject.getDescription()); externalDocs.setDescription(externalDocObject.getDescription());
if (externalDocObject.getUrl() != null) if (!externalDocObject.getUrl().isEmpty())
externalDocs.setUrl(externalDocObject.getUrl()); externalDocs.setUrl(externalDocObject.getUrl());
if (externalDocObject.getNumEx() != 0) { if (externalDocObject.getNumEx() != 0) {
Map<String, Object> extensionMap = new HashMap<>(); Map<String, Object> extensionMap = new HashMap<>();
...@@ -381,7 +381,7 @@ aspect ReverseParser{ ...@@ -381,7 +381,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.parameters.Parameter parameter = new io.swagger.v3.oas.models.parameters.Parameter(); io.swagger.v3.oas.models.parameters.Parameter parameter = new io.swagger.v3.oas.models.parameters.Parameter();
ParameterReference p = (ParameterReference) parameterOb; ParameterReference p = (ParameterReference) parameterOb;
if (p.getRef() != null) { if (!p.getRef().isEmpty()) {
parameter.set$ref(p.getRef()); parameter.set$ref(p.getRef());
} }
...@@ -391,13 +391,13 @@ aspect ReverseParser{ ...@@ -391,13 +391,13 @@ aspect ReverseParser{
io.swagger.v3.oas.models.parameters.Parameter parameter = new io.swagger.v3.oas.models.parameters.Parameter(); io.swagger.v3.oas.models.parameters.Parameter parameter = new io.swagger.v3.oas.models.parameters.Parameter();
ParameterObject p = (ParameterObject) parameterOb; ParameterObject p = (ParameterObject) parameterOb;
if (p.getName() != null) if (!p.getName().isEmpty())
parameter.setName(p.getName()); parameter.setName(p.getName());
if (p.getIn() != null) if (!p.getIn().isEmpty())
parameter.setIn(p.getIn()); parameter.setIn(p.getIn());
if (p.getRequired() != null) if (p.getRequired() != null)
parameter.setRequired(p.getRequired()); parameter.setRequired(p.getRequired());
if (p.getDescription() != null) if (!p.getDescription().isEmpty())
parameter.setDescription(p.getDescription()); parameter.setDescription(p.getDescription());
if (p.getDeprecatedBoolean() != null) if (p.getDeprecatedBoolean() != null)
parameter.setDeprecated(p.getDeprecatedBoolean()); parameter.setDeprecated(p.getDeprecatedBoolean());
...@@ -461,7 +461,7 @@ aspect ReverseParser{ ...@@ -461,7 +461,7 @@ aspect ReverseParser{
RequestBody requestBody = new RequestBody(); RequestBody requestBody = new RequestBody();
RequestBodyReference r = (RequestBodyReference) requestBodyOb; RequestBodyReference r = (RequestBodyReference) requestBodyOb;
if (r.getRef() != null) { if (!r.getRef().isEmpty()) {
requestBody.set$ref(r.getRef()); requestBody.set$ref(r.getRef());
} }
...@@ -477,7 +477,7 @@ aspect ReverseParser{ ...@@ -477,7 +477,7 @@ aspect ReverseParser{
contents.put(t.getKey(), MediaTypeObject.reverseMediaType(t.getM())); contents.put(t.getKey(), MediaTypeObject.reverseMediaType(t.getM()));
requestBody.setContent(contents); requestBody.setContent(contents);
} }
if (r.getDescription() != null) if (!r.getDescription().isEmpty())
requestBody.setDescription(r.getDescription()); requestBody.setDescription(r.getDescription());
if (r.getRequired() != null) if (r.getRequired() != null)
requestBody.setRequired(r.getRequired()); requestBody.setRequired(r.getRequired());
...@@ -515,7 +515,7 @@ aspect ReverseParser{ ...@@ -515,7 +515,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.media.Encoding encodingProperty = new io.swagger.v3.oas.models.media.Encoding(); io.swagger.v3.oas.models.media.Encoding encodingProperty = new io.swagger.v3.oas.models.media.Encoding();
HeaderOb h; HeaderOb h;
if (encodingObject.getContentType() != null) if (!encodingObject.getContentType().isEmpty())
encodingProperty.setContentType(encodingObject.getContentType()); encodingProperty.setContentType(encodingObject.getContentType());
if (encodingObject.getNumH() != 0) { if (encodingObject.getNumH() != 0) {
Map<String, Header> headers = new HashMap<>(); Map<String, Header> headers = new HashMap<>();
...@@ -544,7 +544,7 @@ aspect ReverseParser{ ...@@ -544,7 +544,7 @@ aspect ReverseParser{
ApiResponse response = new ApiResponse(); ApiResponse response = new ApiResponse();
ResponseReference r = (ResponseReference) responseOb; ResponseReference r = (ResponseReference) responseOb;
if (r.getRef() != null) { if (!r.getRef().isEmpty()) {
response.set$ref(r.getRef()); response.set$ref(r.getRef());
} }
...@@ -554,7 +554,7 @@ aspect ReverseParser{ ...@@ -554,7 +554,7 @@ aspect ReverseParser{
ApiResponse response = new ApiResponse(); ApiResponse response = new ApiResponse();
ResponseObject r = (ResponseObject) responseOb; ResponseObject r = (ResponseObject) responseOb;
if (r.getDescription() != null) if (!r.getDescription().isEmpty())
response.setDescription(r.getDescription()); response.setDescription(r.getDescription());
if (r.getNumH() != 0) { if (r.getNumH() != 0) {
Map<String, Header> headers = new HashMap<>(); Map<String, Header> headers = new HashMap<>();
...@@ -583,7 +583,7 @@ aspect ReverseParser{ ...@@ -583,7 +583,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.callbacks.Callback callback = new io.swagger.v3.oas.models.callbacks.Callback(); io.swagger.v3.oas.models.callbacks.Callback callback = new io.swagger.v3.oas.models.callbacks.Callback();
CallbackReference c = (CallbackReference) callbackOb; CallbackReference c = (CallbackReference) callbackOb;
if (c.getRef() != null) { if (!c.getRef().isEmpty()) {
callback.set$ref(c.getRef()); callback.set$ref(c.getRef());
} }
...@@ -606,13 +606,13 @@ aspect ReverseParser{ ...@@ -606,13 +606,13 @@ aspect ReverseParser{
public static Example ExampleObject.reverseExample(ExampleObject exampleObject){ public static Example ExampleObject.reverseExample(ExampleObject exampleObject){
Example example = new Example(); Example example = new Example();
if (exampleObject.getSummary() != null) if (!exampleObject.getSummary().isEmpty())
example.setSummary(exampleObject.getSummary()); example.setSummary(exampleObject.getSummary());
if (exampleObject.getDescription() != null) if (!exampleObject.getDescription().isEmpty())
example.setDescription(exampleObject.getDescription()); example.setDescription(exampleObject.getDescription());
if (exampleObject.getValue() != null) if (exampleObject.getValue() != null)
example.setValue(exampleObject.getValue()); example.setValue(exampleObject.getValue());
if (exampleObject.getExternalValue() != null) if (!exampleObject.getExternalValue().isEmpty())
example.setExternalValue(exampleObject.getExternalValue()); example.setExternalValue(exampleObject.getExternalValue());
if (exampleObject.getNumEx() != 0) { if (exampleObject.getNumEx() != 0) {
Map<String, Object> extension = new HashMap<>(); Map<String, Object> extension = new HashMap<>();
...@@ -629,7 +629,7 @@ aspect ReverseParser{ ...@@ -629,7 +629,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.links.Link link = new io.swagger.v3.oas.models.links.Link(); io.swagger.v3.oas.models.links.Link link = new io.swagger.v3.oas.models.links.Link();
LinkReference l = (LinkReference) linkOb; LinkReference l = (LinkReference) linkOb;
if (l.getRef() != null) if (!l.getRef().isEmpty())
link.set$ref(l.getRef()); link.set$ref(l.getRef());
return link; return link;
...@@ -638,9 +638,9 @@ aspect ReverseParser{ ...@@ -638,9 +638,9 @@ aspect ReverseParser{
io.swagger.v3.oas.models.links.Link link = new io.swagger.v3.oas.models.links.Link(); io.swagger.v3.oas.models.links.Link link = new io.swagger.v3.oas.models.links.Link();
LinkObject l = (LinkObject) linkOb; LinkObject l = (LinkObject) linkOb;
if (l.getOperationRef() != null) if (!l.getOperationRef().isEmpty())
link.setOperationRef(l.getOperationRef()); link.setOperationRef(l.getOperationRef());
if (l.getOperationID() != null) if (!l.getOperationID().isEmpty())
link.setOperationId(l.getOperationID()); link.setOperationId(l.getOperationID());
if (l.getNumL() != 0) { if (l.getNumL() != 0) {
Map<String, String> parameters = new HashMap<>(); Map<String, String> parameters = new HashMap<>();
...@@ -648,7 +648,7 @@ aspect ReverseParser{ ...@@ -648,7 +648,7 @@ aspect ReverseParser{
parameters.put(t.getKey(), t.getValue()); parameters.put(t.getKey(), t.getValue());
link.setParameters(parameters); link.setParameters(parameters);
} }
if (l.getDescription() != null) if (!l.getDescription().isEmpty())
link.setDescription(l.getDescription()); link.setDescription(l.getDescription());
if (l.hasS()) if (l.hasS())
link.setServer(ServerObject.reverseServer(l.getS())); link.setServer(ServerObject.reverseServer(l.getS()));
...@@ -665,7 +665,7 @@ aspect ReverseParser{ ...@@ -665,7 +665,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.headers.Header header = new io.swagger.v3.oas.models.headers.Header(); io.swagger.v3.oas.models.headers.Header header = new io.swagger.v3.oas.models.headers.Header();
HeaderReference h = (HeaderReference) headerOb; HeaderReference h = (HeaderReference) headerOb;
if (h.getRef() != null) { if (!h.getRef().isEmpty()) {
header.set$ref(h.getRef()); header.set$ref(h.getRef());
} }
...@@ -677,7 +677,7 @@ aspect ReverseParser{ ...@@ -677,7 +677,7 @@ aspect ReverseParser{
if (h.getRequired() != null) if (h.getRequired() != null)
header.setRequired(h.getRequired()); header.setRequired(h.getRequired());
if (h.getDescription() != null) if (!h.getDescription().isEmpty())
header.setDescription(h.getDescription()); header.setDescription(h.getDescription());
switch (h.getStyle()) { switch (h.getStyle()) {
case "simple": case "simple":
...@@ -696,7 +696,7 @@ aspect ReverseParser{ ...@@ -696,7 +696,7 @@ aspect ReverseParser{
examples.put(t.getKey(), ExampleObject.reverseExample(t.getO())); examples.put(t.getKey(), ExampleObject.reverseExample(t.getO()));
header.setExample(examples); header.setExample(examples);
} }
if (h.getNumChild() != 0) { if (h.getNumC() != 0) {
io.swagger.v3.oas.models.media.Content contents = new io.swagger.v3.oas.models.media.Content(); io.swagger.v3.oas.models.media.Content contents = new io.swagger.v3.oas.models.media.Content();
for (ContentTuple t : h.getCList()) for (ContentTuple t : h.getCList())
contents.put(t.getKey(), MediaTypeObject.reverseMediaType(t.getM())); contents.put(t.getKey(), MediaTypeObject.reverseMediaType(t.getM()));
...@@ -713,7 +713,7 @@ aspect ReverseParser{ ...@@ -713,7 +713,7 @@ aspect ReverseParser{
tag.setName(tagObject.getName()); tag.setName(tagObject.getName());
if (tagObject.getDescription() != null) if (!tagObject.getDescription().isEmpty())
tag.setDescription(tagObject.getDescription()); tag.setDescription(tagObject.getDescription());
if (tagObject.hasE()) if (tagObject.hasE())
tag.setExternalDocs(ExternalDocObject.reverseExternalDocs(tagObject.getE())); tag.setExternalDocs(ExternalDocObject.reverseExternalDocs(tagObject.getE()));
...@@ -733,7 +733,7 @@ aspect ReverseParser{ ...@@ -733,7 +733,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.media.Schema schema = new io.swagger.v3.oas.models.media.Schema(); io.swagger.v3.oas.models.media.Schema schema = new io.swagger.v3.oas.models.media.Schema();
SchemaReference s = (SchemaReference) schemaOb; SchemaReference s = (SchemaReference) schemaOb;
if (s.getRef() != null) { if (!s.getRef().isEmpty()) {
schema.set$ref(s.getRef()); schema.set$ref(s.getRef());
} }
...@@ -767,7 +767,7 @@ aspect ReverseParser{ ...@@ -767,7 +767,7 @@ aspect ReverseParser{
schema.setAdditionalProperties(s.getAdditionalProperties()); schema.setAdditionalProperties(s.getAdditionalProperties());
if (s.getDefaultValue() != null) if (s.getDefaultValue() != null)
schema.setDefault(s.getDefaultValue()); schema.setDefault(s.getDefaultValue());
if (s.getDescription() != null) if (!s.getDescription().isEmpty())
schema.setDescription(s.getDescription()); schema.setDescription(s.getDescription());
if (s.getDeprecatedBoolean() != null) if (s.getDeprecatedBoolean() != null)
schema.setDeprecated(s.getDeprecatedBoolean()); schema.setDeprecated(s.getDeprecatedBoolean());
...@@ -786,7 +786,7 @@ aspect ReverseParser{ ...@@ -786,7 +786,7 @@ aspect ReverseParser{
schema.setExclusiveMinimum(s.getExclusiveMinimum()); schema.setExclusiveMinimum(s.getExclusiveMinimum());
if (s.hasExt()) if (s.hasExt())
schema.setExternalDocs(ExternalDocObject.reverseExternalDocs(s.getExt())); schema.setExternalDocs(ExternalDocObject.reverseExternalDocs(s.getExt()));
if (s.getFormat() != null) if (!s.getFormat().isEmpty())
schema.setFormat(s.getFormat()); schema.setFormat(s.getFormat());
if (s.getMaximum() != null) if (s.getMaximum() != null)
schema.setMaximum(s.getMaximum()); schema.setMaximum(s.getMaximum());
...@@ -811,7 +811,7 @@ aspect ReverseParser{ ...@@ -811,7 +811,7 @@ aspect ReverseParser{
// Nullable will be excluded in version 3.1.0 // Nullable will be excluded in version 3.1.0
if (s.getNullable() != null) if (s.getNullable() != null)
schema.setNullable(s.getNullable()); schema.setNullable(s.getNullable());
if (s.getPattern() != null) if (!s.getPattern().isEmpty())
schema.setPattern(s.getPattern()); schema.setPattern(s.getPattern());
if (s.getNumP() != 0) { if (s.getNumP() != 0) {
Map<String, io.swagger.v3.oas.models.media.Schema> properties = new HashMap<>(); Map<String, io.swagger.v3.oas.models.media.Schema> properties = new HashMap<>();
...@@ -827,9 +827,9 @@ aspect ReverseParser{ ...@@ -827,9 +827,9 @@ aspect ReverseParser{
schema.setReadOnly(s.getReadOnly()); schema.setReadOnly(s.getReadOnly());
if (s.getWriteOnly() != null) if (s.getWriteOnly() != null)
schema.setWriteOnly(s.getWriteOnly()); schema.setWriteOnly(s.getWriteOnly());
if (s.getType() != null) if (!s.getType().isEmpty())
schema.setType(s.getType()); schema.setType(s.getType());
if (s.getTitle() != null) if (!s.getTitle().isEmpty())
schema.setTitle(s.getTitle()); schema.setTitle(s.getTitle());
if (s.getUniqueItems() != null) if (s.getUniqueItems() != null)
schema.setUniqueItems(s.getUniqueItems()); schema.setUniqueItems(s.getUniqueItems());
...@@ -848,7 +848,7 @@ aspect ReverseParser{ ...@@ -848,7 +848,7 @@ aspect ReverseParser{
public static io.swagger.v3.oas.models.media.Discriminator DiscriminatorObject.reverseDiscriminator(DiscriminatorObject discriminatorObject){ public static io.swagger.v3.oas.models.media.Discriminator DiscriminatorObject.reverseDiscriminator(DiscriminatorObject discriminatorObject){
io.swagger.v3.oas.models.media.Discriminator discriminator = new io.swagger.v3.oas.models.media.Discriminator(); io.swagger.v3.oas.models.media.Discriminator discriminator = new io.swagger.v3.oas.models.media.Discriminator();
if (discriminatorObject.getPropertyName() != null) if (!discriminatorObject.getPropertyName().isEmpty())
discriminator.setPropertyName(discriminatorObject.getPropertyName()); discriminator.setPropertyName(discriminatorObject.getPropertyName());
if (discriminatorObject.getNumM() != 0) { if (discriminatorObject.getNumM() != 0) {
Map<String, String> mapping = new HashMap<>(); Map<String, String> mapping = new HashMap<>();
...@@ -863,11 +863,11 @@ aspect ReverseParser{ ...@@ -863,11 +863,11 @@ aspect ReverseParser{
public static io.swagger.v3.oas.models.media.XML XmlObject.reverseXml(XmlObject xmlObject){ public static io.swagger.v3.oas.models.media.XML XmlObject.reverseXml(XmlObject xmlObject){
io.swagger.v3.oas.models.media.XML xml = new io.swagger.v3.oas.models.media.XML(); io.swagger.v3.oas.models.media.XML xml = new io.swagger.v3.oas.models.media.XML();
if (xmlObject.getName() != null) if (!xmlObject.getName().isEmpty())
xml.setName(xmlObject.getName()); xml.setName(xmlObject.getName());
if (xmlObject.getNamespace() != null) if (!xmlObject.getNamespace().isEmpty())
xml.setNamespace(xmlObject.getNamespace()); xml.setNamespace(xmlObject.getNamespace());
if (xmlObject.getPrefix() != null) if (!xmlObject.getPrefix().isEmpty())
xml.setPrefix(xmlObject.getPrefix()); xml.setPrefix(xmlObject.getPrefix());
if (xmlObject.getAttribute() != null) if (xmlObject.getAttribute() != null)
xml.setAttribute(xmlObject.getAttribute()); xml.setAttribute(xmlObject.getAttribute());
...@@ -882,7 +882,7 @@ aspect ReverseParser{ ...@@ -882,7 +882,7 @@ aspect ReverseParser{
io.swagger.v3.oas.models.security.SecurityScheme securityScheme = new io.swagger.v3.oas.models.security.SecurityScheme(); io.swagger.v3.oas.models.security.SecurityScheme securityScheme = new io.swagger.v3.oas.models.security.SecurityScheme();
SecuritySchemeReference s = (SecuritySchemeReference) securitySchemeOb; SecuritySchemeReference s = (SecuritySchemeReference) securitySchemeOb;
if (s.getRef() != null) { if (!s.getRef().isEmpty()) {
securityScheme.set$ref(s.getRef()); securityScheme.set$ref(s.getRef());
} }
...@@ -906,7 +906,7 @@ aspect ReverseParser{ ...@@ -906,7 +906,7 @@ aspect ReverseParser{
securityScheme.setType(SecurityScheme.Type.OPENIDCONNECT); securityScheme.setType(SecurityScheme.Type.OPENIDCONNECT);
break; break;
} }
if (s.getName() != null) if (!s.getName().isEmpty())
securityScheme.setName(s.getName()); securityScheme.setName(s.getName());
switch (s.getIn()) { switch (s.getIn()) {
case "cookie": case "cookie":
...@@ -919,16 +919,17 @@ aspect ReverseParser{ ...@@ -919,16 +919,17 @@ aspect ReverseParser{
securityScheme.setIn(SecurityScheme.In.QUERY); securityScheme.setIn(SecurityScheme.In.QUERY);
break; break;
} }
if (s.getScheme() != null) if (!s.getScheme().isEmpty())
securityScheme.setScheme(s.getScheme()); securityScheme.setScheme(s.getScheme());
if (s.getOpenIdConnectUrl() != null) if (!s.getOpenIdConnectUrl().isEmpty())
securityScheme.setOpenIdConnectUrl(s.getOpenIdConnectUrl()); securityScheme.setOpenIdConnectUrl(s.getOpenIdConnectUrl());
if (s.getO() != null) if (s.getO() != null)
securityScheme.setFlows(OAuthFlowsObject.reverseOAuthFlows(s.getO())); securityScheme.setFlows(OAuthFlowsObject.reverseOAuthFlows(s.getO()));
if (s.getDescription() != null) if (!s.getDescription().isEmpty())
securityScheme.setDescription(s.getDescription()); securityScheme.setDescription(s.getDescription());
if (s.getBearerFormat() != null) if (!s.getBearerFormat().isEmpty())
securityScheme.setBearerFormat(s.getBearerFormat()); securityScheme.setBearerFormat(s.getBearerFormat());
if (s.getNumEx() != 0) { if (s.getNumEx() != 0) {
Map<String, Object> extensionMap = new HashMap<>(); Map<String, Object> extensionMap = new HashMap<>();
for (Extension e : s.getExList()) for (Extension e : s.getExList())
...@@ -958,14 +959,14 @@ aspect ReverseParser{ ...@@ -958,14 +959,14 @@ aspect ReverseParser{
io.swagger.v3.oas.models.security.OAuthFlow oAuthFlow = new io.swagger.v3.oas.models.security.OAuthFlow(); io.swagger.v3.oas.models.security.OAuthFlow oAuthFlow = new io.swagger.v3.oas.models.security.OAuthFlow();
Scopes scopes = new Scopes(); Scopes scopes = new Scopes();
if (oAuthFlowObject.getAuthorizationUrl() != null) if (!oAuthFlowObject.getAuthorizationUrl().isEmpty())
oAuthFlow.setAuthorizationUrl(oAuthFlowObject.getAuthorizationUrl()); oAuthFlow.setAuthorizationUrl(oAuthFlowObject.getAuthorizationUrl());
if (oAuthFlowObject.getTokenUrl() != null) if (!oAuthFlowObject.getTokenUrl().isEmpty())
oAuthFlow.setTokenUrl(oAuthFlowObject.getTokenUrl()); oAuthFlow.setTokenUrl(oAuthFlowObject.getTokenUrl());
for (ScopesTuple t : oAuthFlowObject.getSList()) for (ScopesTuple t : oAuthFlowObject.getSList())
scopes.put(t.getScopesKey(), t.getScopesValue()); scopes.put(t.getScopesKey(), t.getScopesValue());
oAuthFlow.setScopes(scopes); oAuthFlow.setScopes(scopes);
if (oAuthFlowObject.getRefreshUrl() != null) if (!oAuthFlowObject.getRefreshUrl().isEmpty())
oAuthFlow.setRefreshUrl(oAuthFlowObject.getRefreshUrl()); oAuthFlow.setRefreshUrl(oAuthFlowObject.getRefreshUrl());
return oAuthFlow; return oAuthFlow;
......
src/test/java/openapi/OpenAPIMain_test.java
+ 4
− 2
View file @ 5d13266b
...@@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test; ...@@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -41,7 +42,6 @@ public class OpenAPIMain_test { ...@@ -41,7 +42,6 @@ public class OpenAPIMain_test {
for (File file : resource.listFiles()) for (File file : resource.listFiles())
filenames.add(file.getName()); filenames.add(file.getName());
System.out.println(filenames.size());
for (String file : filenames) { for (String file : filenames) {
String writerName = genDir + file; String writerName = genDir + file;
...@@ -130,7 +130,9 @@ public class OpenAPIMain_test { ...@@ -130,7 +130,9 @@ public class OpenAPIMain_test {
pathNode = result.substring(0, result.length()-1); pathNode = result.substring(0, result.length()-1);
// check, if this node exists or has an empty value. // check, if this node exists or has an empty value.
if (JsonPath.parse(actualNode.toString()).read(pathNode, String.class) == null || JsonPath.parse(actualNode.toString()).read(pathNode, String.class).isEmpty()) if (JsonPath.parse(expectedNode.toString()).read(pathNode, String.class).isEmpty())
((ArrayNode) diff).remove(i);
else if (JsonPath.parse(actualNode.toString()).read(pathNode, String.class) == null || JsonPath.parse(actualNode.toString()).read(pathNode, String.class).isEmpty())
((ArrayNode) diff).remove(i); ((ArrayNode) diff).remove(i);
else if (!JsonPath.parse(actualNode.toString()).read(pathNode.substring(0, pathNode.lastIndexOf(".")).concat(".$ref"), String.class).isEmpty()) else if (!JsonPath.parse(actualNode.toString()).read(pathNode.substring(0, pathNode.lastIndexOf(".")).concat(".$ref"), String.class).isEmpty())
((ArrayNode) diff).remove(i); ((ArrayNode) diff).remove(i);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment