Skip to content

[Java] minor indentation fix for java enum models #3559

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
Aug 9, 2016
Merged

[Java] minor indentation fix for java enum models #3559

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
6 changes: 3 additions & 3 deletions modules/swagger-codegen/src/main/resources/Java/modelEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
@JsonCreator
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue(String text) {
for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions modules/swagger-codegen/src/main/resources/Java/modelInnerEnum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
@JsonCreator
public static {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} fromValue(String text) {
for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public String toString() {
@JsonCreator
public static EnumClass fromValue(String text) {
for (EnumClass b : EnumClass.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
18 changes: 9 additions & 9 deletions samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public String toString() {
@JsonCreator
public static EnumStringEnum fromValue(String text) {
for (EnumStringEnum b : EnumStringEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -92,9 +92,9 @@ public String toString() {
@JsonCreator
public static EnumIntegerEnum fromValue(String text) {
for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -125,9 +125,9 @@ public String toString() {
@JsonCreator
public static EnumNumberEnum fromValue(String text) {
for (EnumNumberEnum b : EnumNumberEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public String toString() {
@JsonCreator
public static InnerEnum fromValue(String text) {
for (InnerEnum b : InnerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public String toString() {
@JsonCreator
public static StatusEnum fromValue(String text) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public String toString() {
@JsonCreator
public static StatusEnum fromValue(String text) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumArrays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public String toString() {
@JsonCreator
public static JustSymbolEnum fromValue(String text) {
for (JustSymbolEnum b : JustSymbolEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -94,9 +94,9 @@ public String toString() {
@JsonCreator
public static ArrayEnumEnum fromValue(String text) {
for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public String toString() {
@JsonCreator
public static EnumClass fromValue(String text) {
for (EnumClass b : EnumClass.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
18 changes: 9 additions & 9 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public String toString() {
@JsonCreator
public static EnumStringEnum fromValue(String text) {
for (EnumStringEnum b : EnumStringEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -92,9 +92,9 @@ public String toString() {
@JsonCreator
public static EnumIntegerEnum fromValue(String text) {
for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -125,9 +125,9 @@ public String toString() {
@JsonCreator
public static EnumNumberEnum fromValue(String text) {
for (EnumNumberEnum b : EnumNumberEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public String toString() {
@JsonCreator
public static InnerEnum fromValue(String text) {
for (InnerEnum b : InnerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public String toString() {
@JsonCreator
public static StatusEnum fromValue(String text) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey1/src/main/java/io/swagger/client/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public String toString() {
@JsonCreator
public static StatusEnum fromValue(String text) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
5 changes: 5 additions & 0 deletions samples/client/petstore/java/jersey2-java8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions ...s/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public String toString() {
@JsonCreator
public static EnumClass fromValue(String text) {
for (EnumClass b : EnumClass.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
18 changes: 9 additions & 9 deletions ...es/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/EnumTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public String toString() {
@JsonCreator
public static EnumStringEnum fromValue(String text) {
for (EnumStringEnum b : EnumStringEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -92,9 +92,9 @@ public String toString() {
@JsonCreator
public static EnumIntegerEnum fromValue(String text) {
for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -125,9 +125,9 @@ public String toString() {
@JsonCreator
public static EnumNumberEnum fromValue(String text) {
for (EnumNumberEnum b : EnumNumberEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions ...les/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/MapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public String toString() {
@JsonCreator
public static InnerEnum fromValue(String text) {
for (InnerEnum b : InnerEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public String toString() {
@JsonCreator
public static StatusEnum fromValue(String text) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/model/Pet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public String toString() {
@JsonCreator
public static StatusEnum fromValue(String text) {
for (StatusEnum b : StatusEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
5 changes: 5 additions & 0 deletions samples/client/petstore/java/jersey2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumArrays.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ public String toString() {
@JsonCreator
public static JustSymbolEnum fromValue(String text) {
for (JustSymbolEnum b : JustSymbolEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down Expand Up @@ -94,9 +94,9 @@ public String toString() {
@JsonCreator
public static ArrayEnumEnum fromValue(String text) {
for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/java/jersey2/src/main/java/io/swagger/client/model/EnumClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ public String toString() {
@JsonCreator
public static EnumClass fromValue(String text) {
for (EnumClass b : EnumClass.values()) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
Expand Down
Loading