Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit ae9d4ee

Browse files
authored
[Java][Feign] decommission 9.x support (OpenAPITools#6445)
* decommission feign 9.x * update ci
1 parent e3faeac commit ae9d4ee

File tree

148 files changed

+12
-18051
lines changed

Some content is hidden

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

148 files changed

+12
-18051
lines changed

bin/java-petstore-all.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# update java petstore clients for all supported http libraries
33

44
./bin/java-petstore-feign-10x.sh
5-
./bin/java-petstore-feign.sh
65
./bin/java-petstore-google-api-client.sh
76
./bin/java-petstore-jersey1.sh
87
./bin/java-petstore-jersey2-java8.sh

bin/java-petstore-feign-9x.json

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

bin/java-petstore-feign.json

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

bin/java-petstore-feign.sh

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

bin/windows/java-petstore-all.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
call .\bin\windows\java-petstore-feign-10x.bat
2-
call .\bin\windows\java-petstore-feign.bat
32
call .\bin\windows\java-petstore-google-api-client.bat
43
call .\bin\windows\java-petstore-jersey1.bat
54
call .\bin\windows\java-petstore-jersey2-java8.bat

bin/windows/java-petstore-feign.bat

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

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -237,21 +237,9 @@ public void processOpts() {
237237
}
238238
additionalProperties.put(PLAY_VERSION, playVersion);
239239

240-
// OpenFeign
240+
// default to feign 10.x
241241
if (additionalProperties.containsKey(FEIGN_VERSION)) {
242-
this.setFeignVersion(additionalProperties.get(FEIGN_VERSION).toString());
243-
244-
if ("10.x".equals(feignVersion)) {
245-
additionalProperties.put("useFeign10", true);
246-
} else if ("9.x".equals(feignVersion)) {
247-
additionalProperties.put("useFeign10", false);
248-
once(LOGGER).warn("Feign 9.x support has been deprecated. Please use 10.x (default) instead.");
249-
} else {
250-
throw new RuntimeException("Ivalid feignOoption '{}'. Must be '10.x' or '9.x' (deprecated).");
251-
}
252-
} else {
253-
// default to feign 10.x
254-
additionalProperties.put("useFeign10", true);
242+
once(LOGGER).warn("feignVersion has been deprecated. 10.x is the default.");
255243
}
256244
additionalProperties.put(FEIGN_VERSION, feignVersion);
257245

pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
</property>
773773
</activation>
774774
<modules>
775-
<module>samples/client/petstore/java/feign</module>
775+
<module>samples/client/petstore/java/feign10x</module>
776776
</modules>
777777
</profile>
778778
<profile>
@@ -1261,7 +1261,6 @@
12611261
<module>samples/client/petstore/scala-httpclient</module>
12621262
<module>samples/client/petstore/scalaz</module>
12631263
<module>samples/client/petstore/clojure</module>
1264-
<module>samples/client/petstore/java/feign</module>
12651264
<module>samples/client/petstore/java/feign10x</module>
12661265
<module>samples/client/petstore/java/jersey1</module>
12671266
<module>samples/client/petstore/java/jersey2-java8</module>
@@ -1355,7 +1354,6 @@
13551354
<module>samples/client/petstore/dart-jaguar/flutter_petstore/openapi</module>
13561355
<module>samples/client/petstore/scala-akka</module>
13571356
<module>samples/client/petstore/scala-httpclient</module>
1358-
<module>samples/client/petstore/java/feign</module>
13591357
<module>samples/client/petstore/java/jersey1</module>
13601358
<module>samples/client/petstore/java/okhttp-gson</module>
13611359
<module>samples/client/petstore/java/retrofit</module>

samples/client/petstore/java/feign/.gitignore

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

samples/client/petstore/java/feign/.openapi-generator-ignore

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

samples/client/petstore/java/feign/.openapi-generator/FILES

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

samples/client/petstore/java/feign/.openapi-generator/VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

samples/client/petstore/java/feign/.travis.yml

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

samples/client/petstore/java/feign/README.md

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

0 commit comments

Comments
 (0)