Skip to content

Commit 0572030

Browse files
authored
[Java][jersey2] minor improvement to jersey2 tests (#6418)
* minor improvement to jersey2 test, remove script/bat * remove tests for java7 jersey2 * remove log from abstrct java class * undo change to jaxrs path
1 parent c73cafe commit 0572030

File tree

510 files changed

+43
-62277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

510 files changed

+43
-62277
lines changed

bin/java-petstore-all.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
./bin/java-petstore-feign.sh
66
./bin/java-petstore-google-api-client.sh
77
./bin/java-petstore-jersey1.sh
8-
./bin/java-petstore-jersey2-java6.sh
9-
./bin/java-petstore-jersey2-java7.sh
108
./bin/java-petstore-jersey2-java8.sh
119
./bin/java-petstore-microprofile.sh
1210
./bin/java-petstore-native.sh

bin/java-petstore-jersey2-java6.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

bin/java-petstore-jersey2-java7.sh

Lines changed: 0 additions & 48 deletions
This file was deleted.

bin/windows/java-petstore-all.bat

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ call .\bin\windows\java-petstore-feign-10x.bat
22
call .\bin\windows\java-petstore-feign.bat
33
call .\bin\windows\java-petstore-google-api-client.bat
44
call .\bin\windows\java-petstore-jersey1.bat
5-
call .\bin\windows\java-petstore-jersey2-java6.bat
6-
call .\bin\windows\java-petstore-jersey2-java7.bat
75
call .\bin\windows\java-petstore-jersey2-java8.bat
86
call .\bin\windows\java-petstore-native.bat
97
call .\bin\windows\java-petstore-okhttp-gson-parcelable.bat

bin/windows/java-petstore-jersey2-java6.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

bin/windows/java-petstore-jersey2-java7.bat

Lines changed: 0 additions & 10 deletions
This file was deleted.

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -486,15 +486,12 @@ public void processOpts() {
486486
importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator");
487487

488488
if (additionalProperties.containsKey(JAVA8_MODE)) {
489-
LOGGER.info("containing java 8 mode ...");
490489
setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
491490
if (java8Mode) {
492-
LOGGER.info("containing java 8 mode to true...");
493491
additionalProperties.put("java8", true);
494492
} else {
495493
additionalProperties.put("java8", false);
496494
}
497-
LOGGER.info("containing java 8 mode to something {}...", java8Mode);
498495
}
499496

500497
if (additionalProperties.containsKey(SUPPORT_ASYNC)) {

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api_test.mustache

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

33
package {{package}};
44

5-
import {{invokerPackage}}.ApiException;
5+
import {{invokerPackage}}.*;
6+
import {{invokerPackage}}.auth.*;
67
{{#imports}}import {{import}};
78
{{/imports}}
89
import org.junit.Test;
@@ -23,7 +24,8 @@ public class {{classname}}Test {
2324
2425
private final {{classname}} api = new {{classname}}();
2526

26-
{{#operations}}{{#operation}}
27+
{{#operations}}
28+
{{#operation}}
2729
/**
2830
* {{summary}}
2931
*
@@ -47,5 +49,7 @@ public class {{classname}}Test {
4749
{{/vendorExtensions.x-group-parameters}}
4850
// TODO: test validations
4951
}
50-
{{/operation}}{{/operations}}
52+
53+
{{/operation}}
54+
{{/operations}}
5155
}

pom.xml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -692,27 +692,15 @@
692692
</modules>
693693
</profile>
694694
<profile>
695-
<id>java-client-jersey2-java7</id>
695+
<id>java-client-jersey2-java8</id>
696696
<activation>
697697
<property>
698698
<name>env</name>
699699
<value>java</value>
700700
</property>
701701
</activation>
702702
<modules>
703-
<module>samples/client/petstore/java/jersey2-java7</module>
704-
</modules>
705-
</profile>
706-
<profile>
707-
<id>java-client-jersey2-java6</id>
708-
<activation>
709-
<property>
710-
<name>env</name>
711-
<value>java</value>
712-
</property>
713-
</activation>
714-
<modules>
715-
<module>samples/client/petstore/java/jersey2-java6</module>
703+
<module>samples/client/petstore/java/jersey2-java8</module>
716704
</modules>
717705
</profile>
718706
<profile>
@@ -1368,7 +1356,6 @@
13681356
<module>samples/client/petstore/scala-httpclient</module>
13691357
<module>samples/client/petstore/java/feign</module>
13701358
<module>samples/client/petstore/java/jersey1</module>
1371-
<module>samples/client/petstore/java/jersey2-java7</module>
13721359
<module>samples/client/petstore/java/okhttp-gson</module>
13731360
<module>samples/client/petstore/java/retrofit</module>
13741361
<module>samples/client/petstore/java/retrofit2</module>

samples/client/petstore/java/jersey2-java6/.gitignore

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)