[Java][Feign] decommission 9.x support

bin/java-petstore-all.sh

@@ -2,7 +2,6 @@
 # update java petstore clients for all supported http libraries
 
 ./bin/java-petstore-feign-10x.sh
-./bin/java-petstore-feign.sh
 ./bin/java-petstore-google-api-client.sh
 ./bin/java-petstore-jersey1.sh
 ./bin/java-petstore-jersey2-java8.sh

bin/windows/java-petstore-all.bat

@@ -1,5 +1,4 @@
 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-java8.bat

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

@@ -237,21 +237,9 @@ public void processOpts() {
         }
         additionalProperties.put(PLAY_VERSION, playVersion);
 
-        // OpenFeign
+        // default to feign 10.x
         if (additionalProperties.containsKey(FEIGN_VERSION)) {
-            this.setFeignVersion(additionalProperties.get(FEIGN_VERSION).toString());
-
-            if ("10.x".equals(feignVersion)) {
-                additionalProperties.put("useFeign10", true);
-            } else if ("9.x".equals(feignVersion)) {
-                additionalProperties.put("useFeign10", false);
-                once(LOGGER).warn("Feign 9.x support has been deprecated. Please use 10.x (default) instead.");
-            } else {
-                throw new RuntimeException("Ivalid feignOoption '{}'. Must be '10.x' or '9.x' (deprecated).");
-            }
-        } else {
-            // default to feign 10.x
-            additionalProperties.put("useFeign10", true);
+            once(LOGGER).warn("feignVersion has been deprecated. 10.x is the default.");
         }
         additionalProperties.put(FEIGN_VERSION, feignVersion);
 

pom.xml

@@ -772,7 +772,7 @@
                 </property>
             </activation>
             <modules>
-                <module>samples/client/petstore/java/feign</module>
+                <module>samples/client/petstore/java/feign10x</module>
             </modules>
         </profile>
         <profile>
@@ -1260,7 +1260,6 @@
                 <module>samples/client/petstore/scala-httpclient</module>
                 <module>samples/client/petstore/scalaz</module>
                 <module>samples/client/petstore/clojure</module>
-                <module>samples/client/petstore/java/feign</module>
                 <module>samples/client/petstore/java/feign10x</module>
                 <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2-java8</module>
@@ -1354,7 +1353,6 @@
                 <module>samples/client/petstore/dart-jaguar/flutter_petstore/openapi</module>
                 <module>samples/client/petstore/scala-akka</module>
                 <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/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit</module>