Skip to content

[Java] do not generate default constructor if lombok.RequiredArgsCon… #22092

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+37 −5
Open

[Java] do not generate default constructor if lombok.RequiredArgsCon… #22092

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
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
{{#parent}}
{{#parcelableModel}}
Expand All @@ -97,6 +98,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/discriminator}}
{{/gson}}
}
{{/lombok.RequiredArgsConstructor}}
{{#vendorExtensions.x-has-readonly-properties}}
{{^withXml}}

Expand Down
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() { {{#parent}}{{#parcelableModel}}
super();{{/parcelableModel}}{{/parent}}{{#gson}}{{#discriminator}}
this.{{{discriminatorName}}} = this.getClass().getSimpleName();{{/discriminator}}{{/gson}}
}{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}{{#jackson}}
}{{/lombok.RequiredArgsConstructor}}{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}{{#jackson}}

@JsonCreator
public {{classname}}(
Expand Down
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() { {{#parent}}{{#parcelableModel}}
super();{{/parcelableModel}}{{/parent}}{{#gson}}{{#discriminator}}
this.{{{discriminatorName}}} = this.getClass().getSimpleName();{{/discriminator}}{{/gson}}
}{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}{{#jackson}}
}{{/lombok.RequiredArgsConstructor}}{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}{{#jackson}}

@JsonCreator
public {{classname}}(
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
{{>additional_properties}}

{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
}
{{/lombok.RequiredArgsConstructor}}

{{#jsonb}}@JsonbCreator{{/jsonb}}{{#jackson}}@JsonCreator{{/jackson}}
public {{classname}}(
Expand Down
3 changes: 2 additions & 1 deletion modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,11 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() { {{#parent}}{{#parcelableModel}}
super();{{/parcelableModel}}{{/parent}}{{#gson}}{{#discriminator}}
this.{{{discriminatorName}}} = this.getClass().getSimpleName();{{/discriminator}}{{/gson}}
}{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}
}{{/lombok.RequiredArgsConstructor}}{{#vendorExtensions.x-has-readonly-properties}}{{^withXml}}

{{#jackson}}@JsonCreator{{/jackson}}
public {{classname}}(
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
{{#parent}}
{{#parcelableModel}}
Expand All @@ -94,6 +95,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/discriminator.isEnum}}
{{/discriminator}}
}
{{/lombok.RequiredArgsConstructor}}
{{#vendorExtensions.x-has-readonly-properties}}
{{^withXml}}

Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
{{#parent}}
{{#parcelableModel}}
Expand All @@ -107,6 +108,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{/discriminator}}
{{/gson}}
}
{{/lombok.RequiredArgsConstructor}}
{{#vendorExtensions.x-has-readonly-properties}}
{{^withXml}}
/**
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
{{#parent}}
{{#parcelableModel}}
Expand All @@ -107,6 +108,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/discriminator}}
{{/gson}}
}
{{/lombok.RequiredArgsConstructor}}
{{#vendorExtensions.x-has-readonly-properties}}
{{^withXml}}
/**
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
{{#parent}}
{{#parcelableModel}}
Expand All @@ -107,6 +108,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v
{{/discriminator}}
{{/gson}}
}
{{/lombok.RequiredArgsConstructor}}
{{#vendorExtensions.x-has-readonly-properties}}
{{^withXml}}
/**
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/vendorExtensions.x-is-jackson-optional-nullable}}

{{/vars}}
{{^lombok.RequiredArgsConstructor}}
public {{classname}}() {
{{#parent}}
{{#parcelableModel}}
Expand All @@ -107,6 +108,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
{{/discriminator}}
{{/gson}}
}
{{/lombok.RequiredArgsConstructor}}
{{#vendorExtensions.x-has-readonly-properties}}
{{^withXml}}
/**
Expand Down
19 changes: 17 additions & 2 deletions .../openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
import org.openapitools.codegen.java.assertions.JavaFileAssert;
import org.openapitools.codegen.languages.AbstractJavaCodegen;
import org.openapitools.codegen.languages.JavaClientCodegen;
import org.openapitools.codegen.languages.RubyClientCodegen;
import org.openapitools.codegen.languages.features.BeanValidationFeatures;
import org.openapitools.codegen.languages.features.CXFServerFeatures;
import org.openapitools.codegen.meta.features.SecurityFeature;
Expand All @@ -49,7 +48,6 @@
import org.openapitools.codegen.testutils.ConfigAssert;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;

import java.io.File;
Expand Down Expand Up @@ -3591,6 +3589,23 @@ public void testEnumWithImplements() {
JavaFileAssert.assertThat(files.get("Type.java")).fileContains("Type implements java.io.Serializable {");
}

@Test(dataProvider = "supportedLibraries")
void testLombokRequiredArgsConstructor(Library library) {
final Path output = newTempFolder();
final CodegenConfigurator configurator = new CodegenConfigurator()
.setGeneratorName(JAVA_GENERATOR)
.setLibrary(library.getValue())
.setAdditionalProperties(Map.of(
AbstractJavaCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, "@lombok.RequiredArgsConstructor"
))
.setInputSpec("src/test/resources/3_1/java/petstore.yaml")
.setOutputDir(output.toString().replace("\\", "/"));
new DefaultGenerator().opts(configurator.toClientOptInput()).generate();

JavaFileAssert.assertThat(output.resolve("src/main/java/org/openapitools/client/model/Pet.java"))
.hasNoConstructor();
}

/**
* This checks bug issue-20718
* A situation when schemaMapping is used and oneOf also is used with one of the schema-mapped dataTypes and the dataType
Expand Down