Skip to content

Commit 72310a3

Browse files
HugoMarioHugoMario
committed
fixed jaxrs templates to work with interfaces
1 parent b5ca3bc commit 72310a3

18 files changed

+88
-8
lines changed

‎src/main/resources/handlebars/JavaJaxRS/cxf-cdi/interface.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
3+
*/
4+
public interface {{{classname}}} {
5+
6+
}

‎src/main/resources/handlebars/JavaJaxRS/cxf-cdi/model.mustache

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
package {{package}};
22

3+
{{^x-is-composed-model}}
34
{{#imports}}import {{import}};
45
{{/imports}}
56
{{#useBeanValidation}}
67
import javax.validation.constraints.*;
78
{{/useBeanValidation}}
9+
{{/x-is-composed-model}}
810
{{#models}}
9-
{{#model}}{{#description}}
11+
{{#model}}
12+
{{#isComposedModel}}
13+
{{>interface}}
14+
{{/isComposedModel}}
15+
{{^isComposedModel}}
16+
{{#description}}
1017
/**
1118
* {{description}}
1219
**/{{/description}}
1320
{{#is this 'enum'}}{{>enumClass}}{{/is}}
1421
{{#isNot this 'enum'}}{{>pojo}}{{/isNot}}
22+
{{/isComposedModel}}
1523
{{/model}}
1624
{{/models}}

‎src/main/resources/handlebars/JavaJaxRS/cxf-cdi/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import javax.xml.bind.annotation.*;
1010

1111
{{#description}}{{#useOas2}}@ApiModel{{/useOas2}}{{^useOas2}}@Schema{{/useOas2}}(description = "{{{description}}}"){{/description}}
1212

13-
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}, {{name}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{name}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
13+
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}, {{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
1414
{{#vars}}
1515
{{#baseItems this}}
1616
{{#is this 'enum'}}

‎src/main/resources/handlebars/JavaJaxRS/cxf/interface.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
3+
*/
4+
public interface {{{classname}}} {
5+
6+
}

‎src/main/resources/handlebars/JavaJaxRS/cxf/model.mustache

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
package {{package}};
22

3+
{{^isComposedModel}}
34
{{#imports}}import {{import}};
45
{{/imports}}
56
{{#useBeanValidation}}
67
import javax.validation.constraints.*;
78
{{/useBeanValidation}}
9+
{{/isComposedModel}}
810

911
{{#models}}
1012
{{#model}}
13+
{{#isComposedModel}}
14+
{{>interface}}
15+
{{/isComposedModel}}
16+
{{^isComposedModel}}
1117
{{#is this 'enum'}}
1218
{{>enumOuterClass}}
1319
{{/is}}
1420
{{#isNot this 'enum'}}
1521
{{>pojo}}
1622
{{/isNot}}
23+
{{/isComposedModel}}
1724
{{/model}}
1825
{{/models}}

‎src/main/resources/handlebars/JavaJaxRS/cxf/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
2929
**/
3030
{{#useOas2}}@ApiModel{{/useOas2}}{{^useOas2}}@Schema{{/useOas2}}(description="{{{description}}}")
3131
{{/description}}
32-
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#interfaceModels}}{{#@first}}implements {{/@first}}{{name}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}} {
32+
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}} {
3333
{{#vars}}{{#baseItems this}}{{#is this 'enum'}}
3434
{{>modelInnerEnum}}{{/is~}}{{/baseItems}}
3535
{{#withXml}}

‎src/main/resources/handlebars/JavaJaxRS/interface.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
3+
*/
4+
public interface {{{classname}}} {
5+
6+
}

‎src/main/resources/handlebars/JavaJaxRS/model.mustache

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
package {{package}};
44

5+
{{^x-is-composed-model}}
56
{{^supportJava6}}
67
import java.util.Objects;
78
{{/supportJava6}}
@@ -16,9 +17,15 @@ import java.io.Serializable;
1617
{{#useBeanValidation}}
1718
import javax.validation.constraints.*;
1819
{{/useBeanValidation}}
20+
{{/x-is-composed-model}}
1921

2022
{{#models}}
2123
{{#model}}
24+
{{#isComposedModel}}
25+
{{>interface}}
26+
{{/isComposedModel}}
27+
{{^isComposedModel}}
2228
{{#is this 'enum'}}{{>modelEnum}}{{/is}}{{#isNot this 'enum'}}{{>pojo}}{{/isNot}}
29+
{{/isComposedModel}}
2330
{{/model}}
2431
{{/models}}

‎src/main/resources/handlebars/JavaJaxRS/pojo.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/{{#description}}
44
{{#useOas2}}@ApiModel{{/useOas2}}{{^useOas2}}@Schema{{/useOas2}}(description = "{{{description}}}"){{/description}}
55
{{>generatedAnnotation}}
6-
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}, {{name}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{name}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
6+
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable {{#interfaceModels}}, {{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}}{{^serializableModel}}{{#interfaceModels}}{{#@first}}implements {{/@first}}{{classname}}{{^@last}}, {{/@last}}{{#@last}} {{/@last}}{{/interfaceModels}}{{/serializableModel}} {
77
{{#vars}}
88
{{#baseItems this}}
99
{{#is this 'enum'}}

‎src/main/resources/handlebars/JavaJaxRS/resteasy/eap/interface.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/**
2+
* {{#description}}{{.}}{{/description}}{{^description}}{{classname}}{{/description}}
3+
*/
4+
public interface {{{classname}}} {
5+
6+
}

0 commit comments

Comments
 (0)