loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix #17258 - use model class only if it is generated (#17490)

Browse Source 
* fix  #16797 and #15796 spring child constructor missing parent params

* root cause and update the DefaultCodegen.java to add missing property when with multi inheritance

* rollback SpringCodegen.java

* update samples

* rollback with master cause #16992 fixed this issue too

* still using orignal design

* catchup master

* catchup master

* catchup master

* fix

* add tests

---------

Co-authored-by: dabdirb <dabdirb@gmail.com>
This commit is contained in:
martin-mfg
2024-01-05 03:30:28 +01:00
committed by GitHub
parent 6317796cba
commit 64f2cad9e8
228 changed files with 10788 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.cpp
View File

@@ -1042,6 +1042,121 @@ std::string FakePropertyEnum_intResource::extractFormParamsFromBody(const std::s
}
return "";
}
FakeAdditionalProperties_referenceResource::FakeAdditionalProperties_referenceResource(const std::string& context /* = "/v2" */)
{
this->set_path(context + "/fake/additionalProperties-reference");
this->set_method_handler("POST",
std::bind(&FakeAdditionalProperties_referenceResource::handler_POST_internal, this,
std::placeholders::_1));
}
std::pair<int, std::string> FakeAdditionalProperties_referenceResource::handleFakeApiException(const FakeApiException& e)
{
return std::make_pair<int, std::string>(e.getStatus(), e.what());
}
std::pair<int, std::string> FakeAdditionalProperties_referenceResource::handleStdException(const std::exception& e)
{
return std::make_pair<int, std::string>(500, e.what());
}
std::pair<int, std::string> FakeAdditionalProperties_referenceResource::handleUnspecifiedException()
{
return std::make_pair<int, std::string>(500, "Unknown exception occurred");
}
void FakeAdditionalProperties_referenceResource::setResponseHeader(const std::shared_ptr<restbed::Session>& session, const std::string& header)
{
session->set_header(header, "");
}
void FakeAdditionalProperties_referenceResource::returnResponse(const std::shared_ptr<restbed::Session>& session, const int status, const std::string& result, std::multimap<std::string, std::string>& responseHeaders)
{
responseHeaders.insert(std::make_pair("Connection", "close"));
session->close(status, result, responseHeaders);
}
void FakeAdditionalProperties_referenceResource::defaultSessionClose(const std::shared_ptr<restbed::Session>& session, const int status, const std::string& result)
{
session->close(status, result, { {"Connection", "close"} });
}
void FakeAdditionalProperties_referenceResource::handler_POST_internal(const std::shared_ptr<restbed::Session> session)
{
const auto request = session->get_request();
// body params or form params here from the body content string
std::string bodyContent = extractBodyContent(session);
std::map<std::string, AnyType> requestBody; // TODO
int status_code = 500;
std::string result = "";
try {
status_code =
handler_POST(requestBody);
}
catch(const FakeApiException& e) {
std::tie(status_code, result) = handleFakeApiException(e);
}
catch(const std::exception& e) {
std::tie(status_code, result) = handleStdException(e);
}
catch(...) {
std::tie(status_code, result) = handleUnspecifiedException();
}
std::multimap< std::string, std::string > responseHeaders {};
static const std::vector<std::string> contentTypes{
"application/json"
};
static const std::string acceptTypes{
"application/json, "
};
if (status_code == 200) {
responseHeaders.insert(std::make_pair("Content-Type", selectPreferredContentType(contentTypes)));
if (!acceptTypes.empty()) {
responseHeaders.insert(std::make_pair("Accept", acceptTypes));
}
returnResponse(session, 200, result.empty() ? "{}" : result, responseHeaders);
return;
}
defaultSessionClose(session, status_code, result);
}
int FakeAdditionalProperties_referenceResource::handler_POST(
std::map<std::string, AnyType> & requestBody)
{
return handler_POST_func(requestBody);
}
std::string FakeAdditionalProperties_referenceResource::extractBodyContent(const std::shared_ptr<restbed::Session>& session) {
const auto request = session->get_request();
int content_length = request->get_header("Content-Length", 0);
std::string bodyContent;
session->fetch(content_length,
[&bodyContent](const std::shared_ptr<restbed::Session> session,
const restbed::Bytes &body) {
bodyContent = restbed::String::format(
"%.*s\n", (int)body.size(), body.data());
});
return bodyContent;
}
std::string FakeAdditionalProperties_referenceResource::extractFormParamsFromBody(const std::string& paramName, const std::string& body) {
const auto uri = restbed::Uri("urlencoded?" + body, true);
const auto params = uri.get_query_parameters();
const auto result = params.find(paramName);
if (result != params.cend()) {
return result->second;
}
return "";
}
FakeBody_with_binaryResource::FakeBody_with_binaryResource(const std::string& context /* = "/v2" */)
{
this->set_path(context + "/fake/body-with-binary");
@@ -2370,6 +2485,12 @@ std::shared_ptr<FakeApiResources::FakePropertyEnum_intResource> FakeApi::getFake
}
return m_spFakePropertyEnum_intResource;
}
std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> FakeApi::getFakeAdditionalProperties_referenceResource() {
if (!m_spFakeAdditionalProperties_referenceResource) {
setResource(std::make_shared<FakeApiResources::FakeAdditionalProperties_referenceResource>());
}
return m_spFakeAdditionalProperties_referenceResource;
}
std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> FakeApi::getFakeBody_with_binaryResource() {
if (!m_spFakeBody_with_binaryResource) {
setResource(std::make_shared<FakeApiResources::FakeBody_with_binaryResource>());
@@ -2456,6 +2577,10 @@ void FakeApi::setResource(std::shared_ptr<FakeApiResources::FakePropertyEnum_int
m_spFakePropertyEnum_intResource = resource;
m_service->publish(m_spFakePropertyEnum_intResource);
}
void FakeApi::setResource(std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> resource) {
m_spFakeAdditionalProperties_referenceResource = resource;
m_service->publish(m_spFakeAdditionalProperties_referenceResource);
}
void FakeApi::setResource(std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> resource) {
m_spFakeBody_with_binaryResource = resource;
m_service->publish(m_spFakeBody_with_binaryResource);
@@ -2524,6 +2649,10 @@ void FakeApi::setFakeApiFakePropertyEnum_intResource(std::shared_ptr<FakeApiReso
m_spFakePropertyEnum_intResource = spFakePropertyEnum_intResource;
m_service->publish(m_spFakePropertyEnum_intResource);
}
void FakeApi::setFakeApiFakeAdditionalProperties_referenceResource(std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> spFakeAdditionalProperties_referenceResource) {
m_spFakeAdditionalProperties_referenceResource = spFakeAdditionalProperties_referenceResource;
m_service->publish(m_spFakeAdditionalProperties_referenceResource);
}
void FakeApi::setFakeApiFakeBody_with_binaryResource(std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> spFakeBody_with_binaryResource) {
m_spFakeBody_with_binaryResource = spFakeBody_with_binaryResource;
m_service->publish(m_spFakeBody_with_binaryResource);
@@ -2587,6 +2716,9 @@ void FakeApi::publishDefaultResources() {
if (!m_spFakePropertyEnum_intResource) {
setResource(std::make_shared<FakeApiResources::FakePropertyEnum_intResource>());
}
if (!m_spFakeAdditionalProperties_referenceResource) {
setResource(std::make_shared<FakeApiResources::FakeAdditionalProperties_referenceResource>());
}
if (!m_spFakeBody_with_binaryResource) {
setResource(std::make_shared<FakeApiResources::FakeBody_with_binaryResource>());
}

69
samples/server/petstore/cpp-restbed/generated/3_0/api/FakeApi.h
View File

@@ -31,6 +31,7 @@
#include <corvusoft/restbed/service.hpp>
#include <corvusoft/restbed/settings.hpp>
#include "AnyType.h"
#include "ChildWithNullable.h"
#include "Client.h"
#include "EnumClass.h"
@@ -542,6 +543,68 @@ protected:
OuterObjectWithEnumProperty & outerObjectWithEnumProperty);
protected:
//////////////////////////////////////
// Override these for customization //
//////////////////////////////////////
virtual std::string extractBodyContent(const std::shared_ptr<restbed::Session>& session);
virtual std::string extractFormParamsFromBody(const std::string& paramName, const std::string& body);
virtual std::pair<int, std::string> handleFakeApiException(const FakeApiException& e);
virtual std::pair<int, std::string> handleStdException(const std::exception& e);
virtual std::pair<int, std::string> handleUnspecifiedException();
virtual void setResponseHeader(const std::shared_ptr<restbed::Session>& session,
const std::string& header);
virtual void returnResponse(const std::shared_ptr<restbed::Session>& session,
const int status, const std::string& result, std::multimap<std::string, std::string>& contentType);
virtual void defaultSessionClose(const std::shared_ptr<restbed::Session>& session,
const int status, const std::string& result);
private:
void handler_POST_internal(const std::shared_ptr<restbed::Session> session);
};
/// <summary>
/// test referenced additionalProperties
/// </summary>
/// <remarks>
///
/// </remarks>
class FakeAdditionalProperties_referenceResource: public restbed::Resource
{
public:
FakeAdditionalProperties_referenceResource(const std::string& context = "/v2");
virtual ~FakeAdditionalProperties_referenceResource() = default;
FakeAdditionalProperties_referenceResource(
const FakeAdditionalProperties_referenceResource& other) = default; // copy constructor
FakeAdditionalProperties_referenceResource(FakeAdditionalProperties_referenceResource&& other) noexcept = default; // move constructor
FakeAdditionalProperties_referenceResource& operator=(const FakeAdditionalProperties_referenceResource& other) = default; // copy assignment
FakeAdditionalProperties_referenceResource& operator=(FakeAdditionalProperties_referenceResource&& other) noexcept = default; // move assignment
/////////////////////////////////////////////////////
// Set these to implement the server functionality //
/////////////////////////////////////////////////////
std::function<int(
std::map<std::string, AnyType> & requestBody)> handler_POST_func =
[](std::map<std::string, AnyType> &) -> int
{ throw FakeApiException(501, "Not implemented"); };
protected:
//////////////////////////////////////////////////////////
// As an alternative to setting the `std::function`s //
// override these to implement the server functionality //
//////////////////////////////////////////////////////////
virtual int handler_POST(
std::map<std::string, AnyType> & requestBody);
protected:
//////////////////////////////////////
// Override these for customization //
@@ -1158,6 +1221,7 @@ using FakeApiFakeOuterCompositeResource [[deprecated]] = FakeApiResources::FakeO
using FakeApiFakeOuterNumberResource [[deprecated]] = FakeApiResources::FakeOuterNumberResource;
using FakeApiFakeOuterStringResource [[deprecated]] = FakeApiResources::FakeOuterStringResource;
using FakeApiFakePropertyEnum_intResource [[deprecated]] = FakeApiResources::FakePropertyEnum_intResource;
using FakeApiFakeAdditionalProperties_referenceResource [[deprecated]] = FakeApiResources::FakeAdditionalProperties_referenceResource;
using FakeApiFakeBody_with_binaryResource [[deprecated]] = FakeApiResources::FakeBody_with_binaryResource;
using FakeApiFakeBody_with_file_schemaResource [[deprecated]] = FakeApiResources::FakeBody_with_file_schemaResource;
using FakeApiFakeBody_with_query_paramsResource [[deprecated]] = FakeApiResources::FakeBody_with_query_paramsResource;
@@ -1185,6 +1249,7 @@ public:
std::shared_ptr<FakeApiResources::FakeOuterNumberResource> getFakeOuterNumberResource();
std::shared_ptr<FakeApiResources::FakeOuterStringResource> getFakeOuterStringResource();
std::shared_ptr<FakeApiResources::FakePropertyEnum_intResource> getFakePropertyEnum_intResource();
std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> getFakeAdditionalProperties_referenceResource();
std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> getFakeBody_with_binaryResource();
std::shared_ptr<FakeApiResources::FakeBody_with_file_schemaResource> getFakeBody_with_file_schemaResource();
std::shared_ptr<FakeApiResources::FakeBody_with_query_paramsResource> getFakeBody_with_query_paramsResource();
@@ -1203,6 +1268,7 @@ public:
void setResource(std::shared_ptr<FakeApiResources::FakeOuterNumberResource> resource);
void setResource(std::shared_ptr<FakeApiResources::FakeOuterStringResource> resource);
void setResource(std::shared_ptr<FakeApiResources::FakePropertyEnum_intResource> resource);
void setResource(std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> resource);
void setResource(std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> resource);
void setResource(std::shared_ptr<FakeApiResources::FakeBody_with_file_schemaResource> resource);
void setResource(std::shared_ptr<FakeApiResources::FakeBody_with_query_paramsResource> resource);
@@ -1229,6 +1295,8 @@ public:
[[deprecated("use setResource()")]]
virtual void setFakeApiFakePropertyEnum_intResource(std::shared_ptr<FakeApiResources::FakePropertyEnum_intResource> spFakeApiFakePropertyEnum_intResource);
[[deprecated("use setResource()")]]
virtual void setFakeApiFakeAdditionalProperties_referenceResource(std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> spFakeApiFakeAdditionalProperties_referenceResource);
[[deprecated("use setResource()")]]
virtual void setFakeApiFakeBody_with_binaryResource(std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> spFakeApiFakeBody_with_binaryResource);
[[deprecated("use setResource()")]]
virtual void setFakeApiFakeBody_with_file_schemaResource(std::shared_ptr<FakeApiResources::FakeBody_with_file_schemaResource> spFakeApiFakeBody_with_file_schemaResource);
@@ -1260,6 +1328,7 @@ protected:
std::shared_ptr<FakeApiResources::FakeOuterNumberResource> m_spFakeOuterNumberResource;
std::shared_ptr<FakeApiResources::FakeOuterStringResource> m_spFakeOuterStringResource;
std::shared_ptr<FakeApiResources::FakePropertyEnum_intResource> m_spFakePropertyEnum_intResource;
std::shared_ptr<FakeApiResources::FakeAdditionalProperties_referenceResource> m_spFakeAdditionalProperties_referenceResource;
std::shared_ptr<FakeApiResources::FakeBody_with_binaryResource> m_spFakeBody_with_binaryResource;
std::shared_ptr<FakeApiResources::FakeBody_with_file_schemaResource> m_spFakeBody_with_file_schemaResource;
std::shared_ptr<FakeApiResources::FakeBody_with_query_paramsResource> m_spFakeBody_with_query_paramsResource;