Skip to content
Open
Changes from all commits
Commits
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
15 changes: 6 additions & 9 deletions code-generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class JavaCodeGenerator {
* @param {type.Model} elem
* @param {Object} options
*/
writeConstructor (codeWriter, elem, options, imports, curPackage) {
writeConstructor (codeWriter, elem, options, imports, curPackage) {
if (elem.name.length > 0) {
var terms = []
// Doc
Expand Down Expand Up @@ -461,6 +461,7 @@ class JavaCodeGenerator {
var terms = []
var params = elem.getNonReturnParameters()
var returnParam = elem.getReturnParameter()
var isConstructor = (elem.name === owner.name)

// doc
var doc = elem.documentation.trim()
Expand Down Expand Up @@ -490,14 +491,10 @@ class JavaCodeGenerator {
}

// type
if (returnParam) {
if (returnParam && !isConstructor) {
terms.push(this.getType(returnParam, imports, curPackage))
} else {
if (elem.name === owner.name) {
//constructor has no return
}else{
terms.push('void')
}
} else if (!isConstructor) {
terms.push('void')
}

// name + parameters
Expand Down Expand Up @@ -528,7 +525,7 @@ class JavaCodeGenerator {
}

// return statement
if (returnParam) {
if (returnParam && !isConstructor) {
var returnType = this.getType(returnParam, imports, curPackage)
if (returnType === 'boolean') {
codeWriter.writeLine('return false;')
Expand Down