Fix generateAliasAsModels in the default generator#3951

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

Merged
wing328 merged 1 commit into from
Sep 26, 2019
Merged

Fix generateAliasAsModels in the default generator #3951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
if (modelTemplate != null && modelTemplate.containsKey("model")) {
CodegenModel m = (CodegenModel) modelTemplate.get("model");
if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
// alias to number, string, enum, etc, which should not be generated as model
// for PythonClientExperimentalCodegen, all aliases are generated as models
continue; // Don't create user-defined classes for aliases
}
}
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
* Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
*
* @param name the template name (e.g. model.mustache)
*
* @return The {@link Path} to the template
*/
@Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
if (authMethods != null && !authMethods.isEmpty()) {
codegenOperation.authMethods = config.fromSecurity(authMethods);
List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
if (codegenOperation.authMethods != null){
for (CodegenSecurity security : codegenOperation.authMethods){
if (codegenOperation.authMethods != null){
for (CodegenSecurity security : codegenOperation.authMethods){
if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
securities != null){
for (SecurityRequirement req : securities){
securities != null){
for (SecurityRequirement req : securities){
if (req == null) continue;
for (String key : req.keySet()){
if (security.name != null && key.equals(security.name)){
for (String key : req.keySet()){
if (security.name != null && key.equals(security.name)){
int count = 0;
for (String sc : req.get(key)){
for (String sc : req.get(key)){
Map<String, Object> scope = new HashMap<String, Object>();
scope.put("scope", sc);
scope.put("description", "");
count++;
if (req.get(key) != null && count < req.get(key).size()){
if (req.get(key) != null && count < req.get(key).size()){
scope.put("hasMore", "true");
} else {
scope.put("hasMore", null);
Expand Down
18 changes: 8 additions & 10 deletions ...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

// default this to true so the python ModelSimple models will be generated
ModelUtils.setGenerateAliasAsModel(true);
if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
}

LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
}

/**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

/**
* Return the default value of the property
*
* @param p OpenAPI property object
* @return string presentation of the default value of the property
*/
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
}
return defaultValue;
} else {
return defaultObject.toString();
return defaultObject.toString();
}
}

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
} else {
if (cp.isEnum == true || cp.hasValidation == true) {
// this model has validations and/or enums so we will generate it
Schema sc = ModelUtils.getSchemaFromResponse(response);
Schema sc = ModelUtils.getSchemaFromResponse(response);
newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
}
}
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
/**
* Set op's returnBaseType, returnType, examples etc.
*
* @param operation endpoint Operation
* @param schemas a map of the schemas in the openapi spec
* @param op endpoint CodegenOperation
* @param operation endpoint Operation
* @param schemas a map of the schemas in the openapi spec
* @param op endpoint CodegenOperation
* @param methodResponse the default ApiResponse for the endpoint
*/
@Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

// fix all property references to non-object models, make those properties non-primitive and
// set their dataType and complexType to the model name, so documentation will refer to the correct model
ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
listOfLists.add(result.vars);
listOfLists.add(result.allVars);
listOfLists.add(result.requiredVars);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix generateAliasAsModels in the default generator#3951

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

 Merged

wing328
merged 1 commit into

from

Sep 26, 2019
 Merged


Fix generateAliasAsModels in the default generator
#3951
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


22 changes: 12 additions & 10 deletions
modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.openapitools.codegen.config.GlobalSettings;
import org.openapitools.codegen.api.TemplatingEngineAdapter;
import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
import org.openapitools.codegen.meta.GeneratorMetadata;
import org.openapitools.codegen.meta.Stability;
import org.openapitools.codegen.serializer.SerializerUtils;
Expand DownExpand Up@@ -492,7 +493,9 @@ private Model getParent(Model model) {
 Map<String, Object> modelTemplate = (Map<String, Object>) ((List<Object>) models.get("models")).get(0);
 if (modelTemplate != null && modelTemplate.containsKey("model")) {
 CodegenModel m = (CodegenModel) modelTemplate.get("model");
 if (m.isAlias && !ModelUtils.isGenerateAliasAsModel()) {
 if (m.isAlias && !(config instanceof PythonClientExperimentalCodegen)) {
 // alias to number, string, enum, etc, which should not be generated as model
 // for PythonClientExperimentalCodegen, all aliases are generated as models
 continue; // Don't create user-defined classes for aliases
 }
 }
Expand DownExpand Up@@ -942,7 +945,6 @@ public String getFullTemplateContents(String templateName) {
 * Returns the path of a template, allowing access to the template where consuming literal contents aren't desirable or possible.
 *
 * @param name the template name (e.g. model.mustache)
 *
 * @return The {@link Path} to the template
 */
 @Override
Expand DownExpand Up@@ -1062,21 +1064,21 @@ private void processOperation(String resourcePath, String httpMethod, Operation
 if (authMethods != null && !authMethods.isEmpty()) {
 codegenOperation.authMethods = config.fromSecurity(authMethods);
 List<Map<String, Object>> scopes = new ArrayList<Map<String, Object>>();
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (codegenOperation.authMethods != null){
 for (CodegenSecurity security : codegenOperation.authMethods){
 if (security != null && security.isBasicBearer != null && security.isBasicBearer &&
 securities != null){
 for (SecurityRequirement req : securities){
securities != null){
 for (SecurityRequirement req : securities){
 if (req == null) continue;
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 for (String key : req.keySet()){
 if (security.name != null && key.equals(security.name)){
 int count = 0;
 for (String sc : req.get(key)){
 for (String sc : req.get(key)){
 Map<String, Object> scope = new HashMap<String, Object>();
 scope.put("scope", sc);
 scope.put("description", "");
 count++;
 if (req.get(key) != null && count < req.get(key).size()){
 if (req.get(key) != null && count < req.get(key).size()){
 scope.put("hasMore", "true");
 } else {
 scope.put("hasMore", null);
Expand Down

18 changes: 8 additions & 10 deletions
...tor/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,10 +78,7 @@ public void processOpts() {

 // default this to true so the python ModelSimple models will be generated
 ModelUtils.setGenerateAliasAsModel(true);
 if (additionalProperties.containsKey(CodegenConstants.GENERATE_ALIAS_AS_MODEL)) {
 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 LOGGER.info(CodegenConstants.GENERATE_ALIAS_AS_MODEL + " is hard coded to true in this generator. Alias models will only be generated if they contain validations or enums");
 }

 /**
Expand All@@ -108,6 +105,7 @@ public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFo

 /**
 * Return the default value of the property
 *
 * @param p OpenAPI property object
 * @return string presentation of the default value of the property
 */
Expand DownExpand Up@@ -194,7 +192,7 @@ public String toDefaultValue(Schema p) {
 }
 return defaultValue;
 } else {
 return defaultObject.toString();
 return defaultObject.toString();
 }
 }

Expand DownExpand Up@@ -387,7 +385,7 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 } else {
 if (cp.isEnum == true || cp.hasValidation == true) {
 // this model has validations and/or enums so we will generate it
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 Schema sc = ModelUtils.getSchemaFromResponse(response);
 newBaseType = ModelUtils.getSimpleRef(sc.get$ref());
 }
 }
Expand All@@ -406,9 +404,9 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
 /**
 * Set op's returnBaseType, returnType, examples etc.
 *
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param operation endpoint Operation
 * @param schemas a map of the schemas in the openapi spec
 * @param op endpoint CodegenOperation
 * @param methodResponse the default ApiResponse for the endpoint
 */
 @Override
Expand DownExpand Up@@ -568,7 +566,7 @@ public CodegenModel fromModel(String name, Schema schema) {

 // fix all property references to non-object models, make those properties non-primitive and
 // set their dataType and complexType to the model name, so documentation will refer to the correct model
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 ArrayList<List<CodegenProperty>> listOfLists= new ArrayList<List<CodegenProperty>>();
 listOfLists.add(result.vars);
 listOfLists.add(result.allVars);
 listOfLists.add(result.requiredVars);
Expand Down