Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !10597

Revert "[JAVA][jersey2] import the auto generated supporting JSON class only when discriminator is needed"

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged William Cheng requested to merge revert-10557-bugfix/java_jersey2_JSON into master 3 years ago
  • Overview 0
  • Commits 1
  • Pipelines 0
  • Changes 172

Reverts OpenAPITools/openapi-generator#10557

Compare
  • master (base)

and
  • latest version
    66a4e7e9
    1 commit, 2 years ago

172 files
+ 171
- 2

    Preferences

    File browser
    Compare changes
modules/…/…/…‎/…/…/…/jersey2‎
model.m‎ustache‎ +0 -2
sam‎ples‎
client/pet‎store/java‎
jersey2-java8/src/…‎/…/…/…/client/model‎
AdditionalProper‎tiesAnyType.java‎ +1 -0
AdditionalPrope‎rtiesArray.java‎ +1 -0
AdditionalProper‎tiesBoolean.java‎ +1 -0
AdditionalPrope‎rtiesClass.java‎ +1 -0
AdditionalProper‎tiesInteger.java‎ +1 -0
AdditionalPrope‎rtiesNumber.java‎ +1 -0
AdditionalPrope‎rtiesObject.java‎ +1 -0
AdditionalPrope‎rtiesString.java‎ +1 -0
Anima‎l.java‎ +1 -0
ArrayOfArrayOf‎NumberOnly.java‎ +1 -0
ArrayOfNumb‎erOnly.java‎ +1 -0
ArrayTe‎st.java‎ +1 -0
BigCa‎t.java‎ +1 -0
BigCatAl‎lOf.java‎ +1 -0
Capitaliz‎ation.java‎ +1 -0
Cat.‎java‎ +1 -0
CatAll‎Of.java‎ +1 -0
Catego‎ry.java‎ +1 -0
ClassMo‎del.java‎ +1 -0
Clien‎t.java‎ +1 -0
Dog.‎java‎ +1 -0
DogAll‎Of.java‎ +1 -0
EnumArr‎ays.java‎ +1 -0
EnumCla‎ss.java‎ +1 -0
EnumTe‎st.java‎ +1 -0
FileSchemaTe‎stClass.java‎ +1 -0
FormatT‎est.java‎ +1 -0
HasOnlyRea‎dOnly.java‎ +1 -0
MapTes‎t.java‎ +1 -0
MixedPropertiesAndAdditi‎onalPropertiesClass.java‎ +1 -0
Model200Re‎sponse.java‎ +1 -0
ModelApiRe‎sponse.java‎ +1 -0
ModelRet‎urn.java‎ +1 -0
Name‎.java‎ +1 -0
NumberO‎nly.java‎ +1 -0
Order‎.java‎ +1 -0
OuterComp‎osite.java‎ +1 -0
OuterEn‎um.java‎ +1 -0
Pet.‎java‎ +1 -0
ReadOnlyF‎irst.java‎ +1 -0
SpecialMod‎elName.java‎ +1 -0
Tag.‎java‎ +1 -0
TypeHolderD‎efault.java‎ +1 -0
TypeHolderE‎xample.java‎ +1 -0
User‎.java‎ +1 -0
XmlIte‎m.java‎ +1 -0
…/…/…/…‎/…/…/…/…‎
AdditionalProper‎tiesAnyType.java‎ +1 -0
AdditionalPrope‎rtiesArray.java‎ +1 -0
AdditionalProper‎tiesBoolean.java‎ +1 -0
AdditionalPrope‎rtiesClass.java‎ +1 -0
AdditionalProper‎tiesInteger.java‎ +1 -0
AdditionalPrope‎rtiesNumber.java‎ +1 -0
AdditionalPrope‎rtiesObject.java‎ +1 -0
AdditionalPrope‎rtiesString.java‎ +1 -0
Anima‎l.java‎ +1 -0
ArrayOfArrayOf‎NumberOnly.java‎ +1 -0
ArrayOfNumb‎erOnly.java‎ +1 -0
ArrayTe‎st.java‎ +1 -0
BigCa‎t.java‎ +1 -0
BigCatAl‎lOf.java‎ +1 -0
Capitaliz‎ation.java‎ +1 -0
Cat.‎java‎ +1 -0
CatAll‎Of.java‎ +1 -0
Catego‎ry.java‎ +1 -0
ClassMo‎del.java‎ +1 -0
Clien‎t.java‎ +1 -0
Dog.‎java‎ +1 -0
DogAll‎Of.java‎ +1 -0
EnumArr‎ays.java‎ +1 -0
EnumCla‎ss.java‎ +1 -0
EnumTe‎st.java‎ +1 -0
FileSchemaTe‎stClass.java‎ +1 -0
FormatT‎est.java‎ +1 -0
HasOnlyRea‎dOnly.java‎ +1 -0
MapTes‎t.java‎ +1 -0
MixedPropertiesAndAdditi‎onalPropertiesClass.java‎ +1 -0
Model200Re‎sponse.java‎ +1 -0
ModelApiRe‎sponse.java‎ +1 -0
ModelRet‎urn.java‎ +1 -0
Name‎.java‎ +1 -0
NumberO‎nly.java‎ +1 -0
Order‎.java‎ +1 -0
OuterComp‎osite.java‎ +1 -0
OuterEn‎um.java‎ +1 -0
Pet.‎java‎ +1 -0
ReadOnlyF‎irst.java‎ +1 -0
SpecialMod‎elName.java‎ +1 -0
Tag.‎java‎ +1 -0
TypeHolderD‎efault.java‎ +1 -0
TypeHolderE‎xample.java‎ +1 -0
User‎.java‎ +1 -0
XmlIte‎m.java‎ +1 -0
openapi3/clien‎t/petstore/java‎
jersey2-java8/src/…‎/…/…/…/client/model‎
AdditionalPrope‎rtiesClass.java‎ +1 -0
Anima‎l.java‎ +1 -0
Apple‎.java‎ +1 -0
AppleR‎eq.java‎ +1 -0
ArrayOfArrayOf‎NumberOnly.java‎ +1 -0
ArrayOfNumb‎erOnly.java‎ +1 -0
ArrayTe‎st.java‎ +1 -0
Banan‎a.java‎ +1 -0
BananaR‎eq.java‎ +1 -0
BasqueP‎ig.java‎ +1 -0
Capitaliz‎ation.java‎ +1 -0
Cat.‎java‎ +1 -0
CatAll‎Of.java‎ +1 -0
Catego‎ry.java‎ +1 -0
ChildC‎at.java‎ +1 -0
ChildCatA‎llOf.java‎ +1 -0
ClassMo‎del.java‎ +1 -0
Clien‎t.java‎ +1 -0
ComplexQuadr‎ilateral.java‎ +1 -0
DanishP‎ig.java‎ +1 -0
Deprecated‎Object.java‎ +1 -0
Dog.‎java‎ +1 -0
DogAll‎Of.java‎ +1 -0
Drawin‎g.java‎ +1 -0
EnumArr‎ays.java‎ +1 -0
EnumCla‎ss.java‎ +1 -0
EnumTe‎st.java‎ +1 -0
EquilateralT‎riangle.java‎ +1 -0
FileSchemaTe‎stClass.java‎ +1 -0
Foo.‎java‎ +1 -0
FormatT‎est.java‎ +1 -0
Fruit‎.java‎ +1 -0
FruitR‎eq.java‎ +1 -0
GmFrui‎t.java‎ +1 -0
Grandparent‎Animal.java‎ +1 -0
HasOnlyRea‎dOnly.java‎ +1 -0
HealthCheck‎Result.java‎ +1 -0
InlineRespons‎eDefault.java‎ +1 -0
IsoscelesTr‎iangle.java‎ +1 -0
Mamma‎l.java‎ +1 -0
MapTes‎t.java‎ +1 -0
MixedPropertiesAndAdditi‎onalPropertiesClass.java‎ +1 -0
Model200Re‎sponse.java‎ +1 -0
ModelApiRe‎sponse.java‎ +1 -0
ModelRet‎urn.java‎ +1 -0
Name‎.java‎ +1 -0
NullableC‎lass.java‎ +1 -0
NullableS‎hape.java‎ +1 -0
NumberO‎nly.java‎ +1 -0
ObjectWithDepre‎catedFields.java‎ +1 -0
Order‎.java‎ +1 -0
OuterComp‎osite.java‎ +1 -0
OuterEn‎um.java‎ +1 -0
OuterEnumDefa‎ultValue.java‎ +1 -0
OuterEnumI‎nteger.java‎ +1 -0
OuterEnumInteger‎DefaultValue.java‎ +1 -0
ParentP‎et.java‎ +1 -0
Pet.‎java‎ +1 -0
Pig.‎java‎ +1 -0
Quadrilat‎eral.java‎ +1 -0
Quadrilateral‎Interface.java‎ +1 -0
ReadOnlyF‎irst.java‎ +1 -0
ScaleneTri‎angle.java‎ +1 -0
Shape‎.java‎ +1 -0
ShapeInte‎rface.java‎ +1 -0
ShapeOrN‎ull.java‎ +1 -0
SimpleQuadri‎lateral.java‎ +1 -0
SpecialMod‎elName.java‎ +1 -0
Tag.‎java‎ +1 -0
Triang‎le.java‎ +1 -0
TriangleInt‎erface.java‎ +1 -0
User‎.java‎ +1 -0
Whale‎.java‎ +1 -0
Zebra‎.java‎ +1 -0
…/…/…/…‎/…/…/…/…‎
ChildSch‎ema.java‎ +1 -0
ChildSchem‎aAllOf.java‎ +1 -0
MySchemaNameC‎haracters.java‎ +1 -0
MySchemaNameChar‎actersAllOf.java‎ +1 -0
Paren‎t.java‎ +1 -0
modules/openapi-generator/src/main/resources/Java/libraries/jersey2/model.mustache
+ 0
- 2
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -46,9 +46,7 @@ import javax.validation.Valid;
{{#performBeanValidation}}
import org.hibernate.validator.constraints.*;
{{/performBeanValidation}}
{{#discriminator}}
import {{invokerPackage}}.JSON;
{{/discriminator}}
{{#models}}
{{#model}}
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -30,6 +30,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -29,6 +29,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -30,6 +30,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -30,6 +30,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -29,6 +29,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -30,6 +30,7 @@ import org.openapitools.client.model.BigCat;
import org.openapitools.client.model.Cat;
import org.openapitools.client.model.Dog;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -28,6 +28,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+ 1
- 0
  • View file @ 66a4e7e9

  • Edit in single-file editor

  • Open in Web IDE


@@ -28,6 +28,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import org.openapitools.client.JSON;
/**
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
5.3.0
5.3.0 (expired)
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
1
1 participant
William Cheng
Reference: OpenAPITools/openapi-generator!10597
Source branch: revert-10557-bugfix/java_jersey2_JSON

Menu

Explore Projects Groups Snippets