Skip to content

[Java] Remove duplicated model description in Spring, JAX-RS models #3887

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 3 commits into from
Sep 28, 2016
Merged

[Java] Remove duplicated model description in Spring, JAX-RS models #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eee0028
fix duplicated description in spring model
wing328 Sep 28, 2016
d40ed7e
fix duplicated description in jaxrs models
wing328 Sep 28, 2016
3be10ee
fix resteasy dependency
wing328 Sep 28, 2016
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
13 changes: 7 additions & 6 deletions modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ package {{package}};
{{/imports}}

{{#models}}
{{#model}}{{#description}}
/**
* {{description}}
**/{{/description}}
{{#isEnum}}{{>enumClass}}{{/isEnum}}
{{^isEnum}}{{>pojo}}{{/isEnum}}
{{#model}}
{{#isEnum}}
{{>enumClass}}
{{/isEnum}}
{{^isEnum}}
{{>pojo}}
{{/isEnum}}
{{/model}}
{{/models}}
17 changes: 10 additions & 7 deletions modules/swagger-codegen/src/main/resources/JavaJaxRS/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ package {{package}};
import java.util.Objects;
{{#imports}}import {{import}};
{{/imports}}
{{#serializableModel}}
import java.io.Serializable;
{{/serializableModel}}

{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
{{#models}}
{{#model}}{{#description}}
/**
* {{description}}
**/{{/description}}
{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
{{^isEnum}}{{>pojo}}{{/isEnum}}
{{#model}}
{{#isEnum}}
{{>enumOuterClass}}
{{/isEnum}}
{{^isEnum}}
{{>pojo}}
{{/isEnum}}
{{/model}}
{{/models}}
17 changes: 10 additions & 7 deletions modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ import java.util.Objects;
import java.util.ArrayList;
{{#imports}}import {{import}};
{{/imports}}
{{#serializableModel}}
import java.io.Serializable;
{{/serializableModel}}

{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
{{#models}}
{{#model}}{{#description}}
/**
* {{description}}
**/{{/description}}
{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
{{^isEnum}}{{>pojo}}{{/isEnum}}
{{#model}}
{{#isEnum}}
{{>enumOuterClass}}
{{/isEnum}}
{{^isEnum}}
{{>pojo}}
{{/isEnum}}
{{/model}}
{{/models}}
8 changes: 6 additions & 2 deletions modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@
<artifactId>joda-time</artifactId>
<version>2.7</version>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -152,4 +156,4 @@
<junit-version>4.8.1</junit-version>
<servlet-api-version>2.5</servlet-api-version>
</properties>
</project>
</project>
17 changes: 10 additions & 7 deletions modules/swagger-codegen/src/main/resources/JavaSpring/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ package {{package}};
import java.util.Objects;
{{#imports}}import {{import}};
{{/imports}}
{{#serializableModel}}
import java.io.Serializable;
{{/serializableModel}}

{{#serializableModel}}import java.io.Serializable;{{/serializableModel}}
{{#models}}
{{#model}}{{#description}}
/**
* {{description}}
**/{{/description}}
{{#isEnum}}{{>enumOuterClass}}{{/isEnum}}
{{^isEnum}}{{>pojo}}{{/isEnum}}
{{#model}}
{{#isEnum}}
{{>enumOuterClass}}
{{/isEnum}}
{{^isEnum}}
{{>pojo}}
{{/isEnum}}
{{/model}}
{{/models}}
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* A category for a pet
**/

/**
* A category for a pet
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* Describes the result of uploading an image resource
**/

/**
* Describes the result of uploading an image resource
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
import io.swagger.annotations.ApiModelProperty;
import org.joda.time.DateTime;



/**
* An order for a pets from the pet store
**/

/**
* An order for a pets from the pet store
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
import java.util.ArrayList;
import java.util.List;



/**
* A pet for sale in the pet store
**/

/**
* A pet for sale in the pet store
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* A tag for a pet
**/

/**
* A tag for a pet
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-cloud/src/main/java/io/swagger/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* A User who is purchasing from the pet store
**/

/**
* A User who is purchasing from the pet store
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* A category for a pet
**/

/**
* A category for a pet
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* Describes the result of uploading an image resource
**/

/**
* Describes the result of uploading an image resource
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
import io.swagger.annotations.ApiModelProperty;
import org.joda.time.DateTime;



/**
* An order for a pets from the pet store
**/

/**
* An order for a pets from the pet store
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@
import java.util.ArrayList;
import java.util.List;



/**
* A pet for sale in the pet store
**/

/**
* A pet for sale in the pet store
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* A tag for a pet
**/

/**
* A tag for a pet
*/
Expand Down
6 changes: 0 additions & 6 deletions samples/client/petstore/spring-stubs/src/main/java/io/swagger/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;



/**
* A User who is purchasing from the pet store
**/

/**
* A User who is purchasing from the pet store
*/
Expand Down
3 changes: 1 addition & 2 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.swagger.model;



import io.swagger.annotations.ApiModel;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
Expand Down
3 changes: 1 addition & 2 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.swagger.model;



import io.swagger.annotations.ApiModel;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
Expand Down
3 changes: 1 addition & 2 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.swagger.model;



import io.swagger.annotations.ApiModel;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
Expand Down
3 changes: 1 addition & 2 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package io.swagger.model;

import io.swagger.annotations.ApiModel;
import io.swagger.model.Category;
import io.swagger.model.Tag;
import java.util.ArrayList;
import java.util.List;



import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlAccessType;
Expand Down
3 changes: 1 addition & 2 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.swagger.model;



import io.swagger.annotations.ApiModel;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
Expand Down
3 changes: 1 addition & 2 deletions samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.swagger.model;



import io.swagger.annotations.ApiModel;

import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
Expand Down
8 changes: 6 additions & 2 deletions samples/server/petstore/jaxrs-resteasy/default/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,11 @@
<artifactId>joda-time</artifactId>
<version>2.7</version>
</dependency>

<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>${swagger-core-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down Expand Up @@ -152,4 +156,4 @@
<junit-version>4.8.1</junit-version>
<servlet-api-version>2.5</servlet-api-version>
</properties>
</project>
</project>
2 changes: 1 addition & 1 deletion samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import io.swagger.api.factories.PetApiServiceFactory;

import io.swagger.model.Pet;
import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.model.ModelApiResponse;

import java.util.List;
import io.swagger.api.NotFoundException;
Expand Down
2 changes: 1 addition & 1 deletion ...les/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/PetApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@


import io.swagger.model.Pet;
import io.swagger.model.ModelApiResponse;
import java.io.File;
import io.swagger.model.ModelApiResponse;

import java.util.List;
import io.swagger.api.NotFoundException;
Expand Down
5 changes: 2 additions & 3 deletions samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/Category.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
import java.util.Objects;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonProperty;



import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;


public class Category {
Expand Down
5 changes: 2 additions & 3 deletions ...erver/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/model/ModelApiResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
import java.util.Objects;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonProperty;



import com.fasterxml.jackson.annotation.JsonCreator;
import io.swagger.annotations.ApiModel;


public class ModelApiResponse {
Expand Down
Loading