Skip to content

Fixes in JaxRS (2) #38

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
HugoMario merged 3 commits into from
Mar 13, 2018
Merged

Fixes in JaxRS (2) #38

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
508891b
jersey1: fix Cannot find symbol Map
jmini Mar 12, 2018
11b6cfa
Add "validation-api" dependency in jetty
jmini Mar 13, 2018
1eb8167
Use extensions instead of 'is*' properties
jmini Mar 13, 2018
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
16 changes: 8 additions & 8 deletions src/main/resources/v2/JavaJaxRS/cxf/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
{{#vendorExtensions.extraAnnotation}}
{{{vendorExtensions.extraAnnotation}}}
{{/vendorExtensions.extraAnnotation}}
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#is this 'enum'}}{{^isListContainer}}{{^isMapContainer}}public {{datatype}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} {{#is this 'enum'}}{{#isNot this 'list-container'}}{{#isNot this 'map-container'}}public {{datatype}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
if ({{name}} == null) {
return null;
}
return {{name}}.value();
}{{/isMapContainer}}{{/isListContainer}}{{/is}}{{#is this 'enum'}}{{#isListContainer}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
}{{/isNot}}{{/isNot}}{{/is}}{{#is this 'enum'}}{{#is this 'list-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
return {{name}};
}{{/isListContainer}}{{/is}}{{#is this 'enum'}}{{#isMapContainer}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
}{{/is}}{{/is}}{{#is this 'enum'}}{{#is this 'map-container'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
return {{name}};
}{{/isMapContainer}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
}{{/is}}{{/is}}{{#isNot this 'enum'}}public {{{datatypeWithEnum}}} {{#is this 'boolean'}}is{{/is}}{{getter}}() {
return {{name}};
}{{/isNot}}

Expand All @@ -86,20 +86,20 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {
this.{{name}} = {{name}};
return this;
}
{{#isListContainer}}
{{#is this 'list-container'}}

public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
this.{{name}}.add({{name}}Item);
return this;
}
{{/isListContainer}}
{{#isMapContainer}}
{{/is}}
{{#is this 'map-container'}}

public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
this.{{name}}.put(key, {{name}}Item);
return this;
}
{{/isMapContainer}}
{{/is}}
{{/isReadOnly}}

{{/vars}}
Expand Down
13 changes: 11 additions & 2 deletions src/main/resources/v2/JavaJaxRS/cxf/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@
<idleTimeout>60000</idleTimeout>
</httpConnector>
</configuration>
{{#useBeanValidation}}
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${beanvalidation-version}</version>
</dependency>
</dependencies>
{{/useBeanValidation}}
<executions>
<execution>
<id>start-jetty</id>
Expand Down Expand Up @@ -194,9 +203,9 @@
<junit-version>4.12</junit-version>
<logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
{{#useBeanValidation}}
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
{{/useBeanValidation}}
{{/useBeanValidation}}
<cxf-version>3.2.1</cxf-version>
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
13 changes: 11 additions & 2 deletions src/main/resources/v2/JavaJaxRS/cxf/server/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@
<idleTimeout>60000</idleTimeout>
</httpConnector>
</configuration>
{{#useBeanValidation}}
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${beanvalidation-version}</version>
</dependency>
</dependencies>
{{/useBeanValidation}}
<executions>
<execution>
<id>start-jetty</id>
Expand Down Expand Up @@ -245,9 +254,9 @@
<junit-version>4.12</junit-version>
<logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
{{#useBeanValidation}}
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
{{/useBeanValidation}}
{{/useBeanValidation}}
{{#generateSpringApplication}}
<spring-version>4.3.13.RELEASE</spring-version>
{{/generateSpringApplication}}
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiService.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.sun.jersey.multipart.FormDataParam;
{{#imports}}import {{import}};
{{/imports}}

import java.util.Map;
import java.util.List;
import {{package}}.NotFoundException;

Expand Down
1 change: 1 addition & 0 deletions src/main/resources/v2/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.sun.jersey.multipart.FormDataParam;
{{#imports}}import {{import}};
{{/imports}}

import java.util.Map;
import java.util.List;
import {{package}}.NotFoundException;

Expand Down
14 changes: 13 additions & 1 deletion src/main/resources/v2/JavaJaxRS/libraries/jersey1/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@
<idleTimeout>60000</idleTimeout>
</httpConnector>
</configuration>
{{#useBeanValidation}}
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${beanvalidation-version}</version>
</dependency>
</dependencies>
{{/useBeanValidation}}
<executions>
<execution>
<id>start-jetty</id>
Expand Down Expand Up @@ -173,7 +182,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
<version>${beanvalidation-version}</version>
<scope>provided</scope>
</dependency>
{{/useBeanValidation}}
Expand All @@ -198,6 +207,9 @@
<slf4j-version>1.7.21</slf4j-version>
<junit-version>4.12</junit-version>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
{{/useBeanValidation}}
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
8 changes: 4 additions & 4 deletions src/main/resources/v2/JavaJaxRS/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
this.{{name}} = {{name}};
return this;
}
{{#isListContainer}}
{{#is this 'list-container'}}

public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) {
{{^required}}
Expand All @@ -48,8 +48,8 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
this.{{name}}.add({{name}}Item);
return this;
}
{{/isListContainer}}
{{#isMapContainer}}
{{/is}}
{{#is this 'map-container'}}

public {{classname}} put{{nameInCamelCase}}Item(String key, {{{items.datatypeWithEnum}}} {{name}}Item) {
{{^required}}
Expand All @@ -60,7 +60,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
this.{{name}}.put(key, {{name}}Item);
return this;
}
{{/isMapContainer}}
{{/is}}

{{/isReadOnly}}
/**
Expand Down
14 changes: 13 additions & 1 deletion src/main/resources/v2/JavaJaxRS/pom.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@
<idleTimeout>60000</idleTimeout>
</httpConnector>
</configuration>
{{#useBeanValidation}}
<dependencies>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${beanvalidation-version}</version>
</dependency>
</dependencies>
{{/useBeanValidation}}
<executions>
<execution>
<id>start-jetty</id>
Expand Down Expand Up @@ -178,7 +187,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
<version>${beanvalidation-version}</version>
<scope>provided</scope>
</dependency>
{{/useBeanValidation}}
Expand Down Expand Up @@ -208,6 +217,9 @@
<junit-version>4.12</junit-version>
<logback-version>1.1.7</logback-version>
<servlet-api-version>2.5</servlet-api-version>
{{#useBeanValidation}}
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
{{/useBeanValidation}}
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
2 changes: 1 addition & 1 deletion src/main/resources/v2/JavaJaxRS/resteasy/returnTypes.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#returnContainer}}{{#is this 'map-container'}}Map<String, {{{returnType}}}>{{/is}}{{#is this 'list-container'}}List<{{{returnType}}}>{{/is}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
2 changes: 1 addition & 1 deletion src/main/resources/v2/JavaJaxRS/returnTypes.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{#returnContainer}}{{#isMapContainer}}Map<String, {{{returnType}}}>{{/isMapContainer}}{{#isListContainer}}List<{{{returnType}}}>{{/isListContainer}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}
{{#returnContainer}}{{#is this 'map-container'}}Map<String, {{{returnType}}}>{{/is}}{{#is this 'list-container'}}List<{{{returnType}}}>{{/is}}{{/returnContainer}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}}