spring-http-interface: introduce useHttpServiceProxyFactoryInterfacesConfigurator config

Author: ibaranga

.github/workflows/samples-jdk17.yaml

@@ -10,7 +10,7 @@ on:
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/spring-http-interface-reactive-noResponseEntity/**
       - samples/client/petstore/spring-http-interface-noResponseEntity/**
-      - samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration/**
+      - samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/**
       - samples/client/petstore/java/webclient-jakarta/**
       - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
@@ -28,7 +28,7 @@ on:
       - samples/client/petstore/spring-http-interface/**
       - samples/client/petstore/spring-http-interface-reactive-noResponseEntity/**
       - samples/client/petstore/spring-http-interface-noResponseEntity/**
-      - samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration/**
+      - samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/**
       - samples/client/petstore/java/webclient-jakarta/**
       - samples/client/petstore/java/microprofile-rest-client-outer-enum/**
       # servers
@@ -52,7 +52,7 @@ jobs:
           - samples/client/petstore/spring-http-interface
           - samples/client/petstore/spring-http-interface-reactive-noResponseEntity
           - samples/client/petstore/spring-http-interface-noResponseEntity
-          - samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration
+          - samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator
           - samples/client/petstore/java/webclient-jakarta
           - samples/client/petstore/java/microprofile-rest-client-outer-enum
           # servers

bin/configs/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration.yaml

@@ -1,10 +1,10 @@
 generatorName: spring
 library: spring-http-interface
-outputDir: samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration
+outputDir: samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator
 inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/JavaSpring
 additionalProperties:
-  artifactId: spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration
+  artifactId: spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator
   snapshotVersion: "true"
   hideGenerationTimestamp: "true"
   # documentation provider should be ignored
@@ -14,7 +14,7 @@ additionalProperties:
   # validation should be ignored
   useBeanValidation: "true"
   performBeanValidation: "true"
-  useHttpServiceProxyFactoryInterfacesConfiguration: "true"
+  useHttpServiceProxyFactoryInterfacesConfigurator: "true"
   # needed until updating the default parentVersion (3.1.3) to 3.2+
   parentGroupId: "org.springframework.boot"
   parentArtifactId: "spring-boot-starter-parent"

docs/generators/java-camel.md

@@ -102,7 +102,7 @@ public class SpringCodegen extends AbstractJavaCodegen
     public static final String SPRING_BOOT = "spring-boot";
     public static final String SPRING_CLOUD_LIBRARY = "spring-cloud";
     public static final String SPRING_HTTP_INTERFACE = "spring-http-interface";
-    public static final String USE_HTTP_SERVICE_PROXY_FACTORY_INTERFACES_CONFIGURATION = "useHttpServiceProxyFactoryInterfacesConfiguration";
+    public static final String USE_HTTP_SERVICE_PROXY_FACTORY_INTERFACES_CONFIGURATOR = "useHttpServiceProxyFactoryInterfacesConfigurator";
     public static final String HTTP_INTERFACES_CONFIGURATOR_DEPENDENCY = "httpInterfacesConfiguratorDependency";
     public static final String API_FIRST = "apiFirst";
     public static final String SPRING_CONTROLLER = "useSpringController";
@@ -167,7 +167,7 @@ public class SpringCodegen extends AbstractJavaCodegen
     protected boolean generatedConstructorWithRequiredArgs = true;
     @Getter @Setter
     protected RequestMappingMode requestMappingMode = RequestMappingMode.controller;
-    @Setter boolean useHttpServiceProxyFactoryInterfacesConfiguration = false;
+    @Setter boolean useHttpServiceProxyFactoryInterfacesConfigurator = false;
 
     public SpringCodegen() {
         super();
@@ -271,7 +271,7 @@ public SpringCodegen() {
             generatedConstructorWithRequiredArgs));
         cliOptions.add(new CliOption(RESOURCE_FOLDER, RESOURCE_FOLDER_DESC).defaultValue(this.getResourceFolder()));
 
-        cliOptions.add(CliOption.newString(USE_HTTP_SERVICE_PROXY_FACTORY_INTERFACES_CONFIGURATION,
+        cliOptions.add(CliOption.newString(USE_HTTP_SERVICE_PROXY_FACTORY_INTERFACES_CONFIGURATOR,
             "Generate HttpInterfacesAbstractConfigurator based on an HttpServiceProxyFactory instance (as opposed to a WebClient instance, when disabled) for generating Spring HTTP interfaces. Requires spring-web 6.1+.")
             .defaultValue("false")
         );
@@ -452,7 +452,7 @@ public void processOpts() {
         }
 
         convertPropertyToStringAndWriteBack(RESOURCE_FOLDER, this::setResourceFolder);
-        convertPropertyToBooleanAndWriteBack(USE_HTTP_SERVICE_PROXY_FACTORY_INTERFACES_CONFIGURATION, this::setUseHttpServiceProxyFactoryInterfacesConfiguration);
+        convertPropertyToBooleanAndWriteBack(USE_HTTP_SERVICE_PROXY_FACTORY_INTERFACES_CONFIGURATOR, this::setUseHttpServiceProxyFactoryInterfacesConfigurator);
 
         typeMapping.put("file", "org.springframework.core.io.Resource");
         importMapping.put("org.springframework.core.io.Resource", "org.springframework.core.io.Resource");
@@ -537,8 +537,8 @@ public void processOpts() {
                     }
                 }
             } else if (SPRING_HTTP_INTERFACE.equals(library)) {
-                String httpInterfacesAbstractConfiguratorFile = useHttpServiceProxyFactoryInterfacesConfiguration ?
-                    "httpServiceProxyFactoryInterfacesConfiguration.mustache" :
+                String httpInterfacesAbstractConfiguratorFile = useHttpServiceProxyFactoryInterfacesConfigurator ?
+                    "httpServiceProxyFactoryInterfacesConfigurator.mustache" :
                     "httpInterfacesConfiguration.mustache";
 
                 supportingFiles.add(new SupportingFile(httpInterfacesAbstractConfiguratorFile,
@@ -547,7 +547,7 @@ public void processOpts() {
                 writePropertyBack(USE_BEANVALIDATION, false);
 
                 writePropertyBack(HTTP_INTERFACES_CONFIGURATOR_DEPENDENCY,
-                    useHttpServiceProxyFactoryInterfacesConfiguration ?
+                    useHttpServiceProxyFactoryInterfacesConfigurator ?
                     "HttpServiceProxyFactory" :
                     "WebClient"
                 );

docs/generators/spring.md

@@ -1,3 +1,4 @@
+.openapi-generator-ignore
 README.md
 pom.xml
 src/main/java/org/openapitools/api/AnotherFakeApi.java

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

@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapitools</groupId>
-    <artifactId>spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration</artifactId>
+    <artifactId>spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator</artifactId>
     <packaging>jar</packaging>
-    <name>spring-http-interface-useHttpServiceProxyFactoryInterfacesConfiguration</name>
+    <name>spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator</name>
     <version>1.0.0-SNAPSHOT</version>
     <properties>
         <java.version>17</java.version>