Skip to content

Commit

Permalink
[Java][jersey2] minor improvement to jersey2 tests (#6418)
Browse files Browse the repository at this point in the history
* minor improvement to jersey2 test, remove script/bat

* remove tests for java7 jersey2

* remove log from abstrct java class

* undo change to jaxrs path
  • Loading branch information
wing328 authored May 26, 2020
1 parent c73cafe commit 0572030
Show file tree
Hide file tree
Showing 510 changed files with 43 additions and 62,277 deletions.
2 changes: 0 additions & 2 deletions bin/java-petstore-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
./bin/java-petstore-feign.sh
./bin/java-petstore-google-api-client.sh
./bin/java-petstore-jersey1.sh
./bin/java-petstore-jersey2-java6.sh
./bin/java-petstore-jersey2-java7.sh
./bin/java-petstore-jersey2-java8.sh
./bin/java-petstore-microprofile.sh
./bin/java-petstore-native.sh
Expand Down
39 changes: 0 additions & 39 deletions bin/java-petstore-jersey2-java6.sh

This file was deleted.

48 changes: 0 additions & 48 deletions bin/java-petstore-jersey2-java7.sh

This file was deleted.

2 changes: 0 additions & 2 deletions bin/windows/java-petstore-all.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ call .\bin\windows\java-petstore-feign-10x.bat
call .\bin\windows\java-petstore-feign.bat
call .\bin\windows\java-petstore-google-api-client.bat
call .\bin\windows\java-petstore-jersey1.bat
call .\bin\windows\java-petstore-jersey2-java6.bat
call .\bin\windows\java-petstore-jersey2-java7.bat
call .\bin\windows\java-petstore-jersey2-java8.bat
call .\bin\windows\java-petstore-native.bat
call .\bin\windows\java-petstore-okhttp-gson-parcelable.bat
Expand Down
10 changes: 0 additions & 10 deletions bin/windows/java-petstore-jersey2-java6.bat

This file was deleted.

10 changes: 0 additions & 10 deletions bin/windows/java-petstore-jersey2-java7.bat

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -486,15 +486,12 @@ public void processOpts() {
importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator");

if (additionalProperties.containsKey(JAVA8_MODE)) {
LOGGER.info("containing java 8 mode ...");
setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
if (java8Mode) {
LOGGER.info("containing java 8 mode to true...");
additionalProperties.put("java8", true);
} else {
additionalProperties.put("java8", false);
}
LOGGER.info("containing java 8 mode to something {}...", java8Mode);
}

if (additionalProperties.containsKey(SUPPORT_ASYNC)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

package {{package}};

import {{invokerPackage}}.ApiException;
import {{invokerPackage}}.*;
import {{invokerPackage}}.auth.*;
{{#imports}}import {{import}};
{{/imports}}
import org.junit.Test;
Expand All @@ -23,7 +24,8 @@ public class {{classname}}Test {
private final {{classname}} api = new {{classname}}();

{{#operations}}{{#operation}}
{{#operations}}
{{#operation}}
/**
* {{summary}}
*
Expand All @@ -47,5 +49,7 @@ public class {{classname}}Test {
{{/vendorExtensions.x-group-parameters}}
// TODO: test validations
}
{{/operation}}{{/operations}}

{{/operation}}
{{/operations}}
}
17 changes: 2 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -692,27 +692,15 @@
</modules>
</profile>
<profile>
<id>java-client-jersey2-java7</id>
<id>java-client-jersey2-java8</id>
<activation>
<property>
<name>env</name>
<value>java</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/java/jersey2-java7</module>
</modules>
</profile>
<profile>
<id>java-client-jersey2-java6</id>
<activation>
<property>
<name>env</name>
<value>java</value>
</property>
</activation>
<modules>
<module>samples/client/petstore/java/jersey2-java6</module>
<module>samples/client/petstore/java/jersey2-java8</module>
</modules>
</profile>
<profile>
Expand Down Expand Up @@ -1368,7 +1356,6 @@
<module>samples/client/petstore/scala-httpclient</module>
<module>samples/client/petstore/java/feign</module>
<module>samples/client/petstore/java/jersey1</module>
<module>samples/client/petstore/java/jersey2-java7</module>
<module>samples/client/petstore/java/okhttp-gson</module>
<module>samples/client/petstore/java/retrofit</module>
<module>samples/client/petstore/java/retrofit2</module>
Expand Down
21 changes: 0 additions & 21 deletions samples/client/petstore/java/jersey2-java6/.gitignore

This file was deleted.

This file was deleted.

141 changes: 0 additions & 141 deletions samples/client/petstore/java/jersey2-java6/.openapi-generator/FILES

This file was deleted.

Loading

0 comments on commit 0572030

Please sign in to comment.