Skip to content

#176 support seperate enum classes #177

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
stevehu merged 1 commit into from
Sep 6, 2018
Merged

#176 support seperate enum classes #177

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
11 changes: 11 additions & 0 deletions light-rest-4j/src/main/java/com/networknt/codegen/rest/OpenApiGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ public void generate(String targetPath, Object model, Any config) throws IOExcep
String key = entry.getKey();
Map<String, Any> value = entry.getValue().asMap();
String type = null;
String enums = null;
boolean isEnum = false;
boolean isEnumClass = false;
Map<String, Any> properties = null;
List<Any> required = null;

Expand All @@ -177,6 +179,11 @@ public void generate(String targetPath, Object model, Any config) throws IOExcep
type = entrySchema.getValue().toString();
if("enum".equals(type)) isEnum = true;
}
if("enum".equals(entrySchema.getKey())) {
isEnumClass = true;
enums = entrySchema.getValue().asList().toString();
enums = enums.substring(enums.indexOf("[") + 1, enums.indexOf("]"));
}
if("properties".equals(entrySchema.getKey())) {
properties = entrySchema.getValue().asMap();
// transform properties
Expand Down Expand Up @@ -304,6 +311,10 @@ public void generate(String targetPath, Object model, Any config) throws IOExcep
if(!overwriteModel && checkExist(targetPath, ("src.main.java." + modelPackage).replace(".", separator), modelFileName + ".java")) {
continue;
}
if (isEnumClass) {
transfer(targetPath, ("src.main.java." + modelPackage).replace(".", separator), modelFileName + ".java", templates.rest.enumClass.template(modelPackage, modelFileName, enums));
continue;
}
transfer(targetPath, ("src.main.java." + modelPackage).replace(".", separator), modelFileName + ".java", templates.rest.pojo.template(modelPackage, modelFileName, classVarName, props));
}
}
Expand Down
38 changes: 6 additions & 32 deletions light-rest-4j/src/main/resources/templates/rest/enumClass.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,8 @@
@import com.jsoniter.any.Any
@import java.util.Map
@import java.util.List
@args (Map<String, Any> prop)
@with (v = prop.get("nameWithEnum") + ".values()", value = prop.get("value").asList()) {
public enum @prop.get("nameWithEnum") {
@for((i, item) : value) {
@with(u = item.toString().toUpperCase().replaceAll("-", "_")) {@if (i.index() < value.size() - 1) {@u ("@item"),}@if(i.index() == value.size() - 1) {@u ("@item");}}
}
@args (String modelPackage, String className, String enums)
package @modelPackage;
import java.util.Enumeration;

private final @prop.get("type") value;
public enum @className {
@enums;

@prop.get("nameWithEnum")(@prop.get("type") value) {
this.value = value;
}

@@Override
public String toString() {
return String.valueOf(value);
}

public static @prop.get("nameWithEnum") fromValue(String text) {
for (@prop.get("nameWithEnum") b : @v) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
}

private @prop.get("nameWithEnum") @prop.get("name");

}
}
34 changes: 34 additions & 0 deletions light-rest-4j/src/main/resources/templates/rest/enumInline.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
@import com.jsoniter.any.Any
@import java.util.Map
@import java.util.List
@args (Map<String, Any> prop)
@with (v = prop.get("nameWithEnum") + ".values()", value = prop.get("value").asList()) {
public enum @prop.get("nameWithEnum") {
@for((i, item) : value) {
@with(u = item.toString().toUpperCase().replaceAll("-", "_")) {@if (i.index() < value.size() - 1) {@u ("@item"),}@if(i.index() == value.size() - 1) {@u ("@item");}}
}

private final @prop.get("type") value;

@prop.get("nameWithEnum")(@prop.get("type") value) {
this.value = value;
}

@@Override
public String toString() {
return String.valueOf(value);
}

public static @prop.get("nameWithEnum") fromValue(String text) {
for (@prop.get("nameWithEnum") b : @v) {
if (String.valueOf(b.value).equals(text)) {
return b;
}
}
return null;
}
}

private @prop.get("nameWithEnum") @prop.get("name");

}
2 changes: 1 addition & 1 deletion light-rest-4j/src/main/resources/templates/rest/pojo.rocker.raw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class @className {

@for (prop: props) {
@if(prop.get("isEnum").toBoolean()) {@templates.rest.enumClass.template(prop)} else {private @prop.get("type") @prop.get("name");}
@if(prop.get("isEnum").toBoolean()) {@templates.rest.enumInline.template(prop)} else {private @prop.get("type") @prop.get("name");}
}

public @className () {
Expand Down