Merge master

Author: jpfinne

modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/httpServiceProxyFactoryInterfacesConfigurator.mustache

@@ -0,0 +1,35 @@
+/**
+* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) ({{{generatorVersion}}}).
+* https://openapi-generator.tech
+* Do not edit the class manually.
+*/
+package {{configPackage}};
+
+{{#apiInfo}}
+    {{#apis}}
+import {{apiPackage}}.{{classname}};
+    {{/apis}}
+{{/apiInfo}}
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.service.invoker.HttpServiceProxyFactory;
+
+public abstract class HttpInterfacesAbstractConfigurator {
+
+    private final HttpServiceProxyFactory factory;
+
+    public HttpInterfacesAbstractConfigurator(final HttpServiceProxyFactory factory) {
+        this.factory = factory;
+    }
+
+{{#apiInfo}}
+{{#apis}}
+    @Bean(name = "{{configPackage}}.HttpInterfacesAbstractConfigurator.{{classVarName}}")
+    {{classname}} {{classVarName}}HttpProxy() {
+        return factory.createClient({{classname}}.class);
+    }
+
+{{/apis}}
+{{/apiInfo}}
+
+}

…aries/spring-http-interface/pom.mustache …s/spring-http-interface/pom-sb3.mustachemodules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom.mustache renamed to modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb3.mustache modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom.mustache renamed to modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-http-interface/pom-sb3.mustache

@@ -89,20 +89,20 @@
             <version>0.2.9</version>
         </dependency>
         {{/openApiNullable}}
-        {{#lombok}}
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <optional>true</optional>
-            </dependency>
-        {{/lombok}}
         {{#useJspecify}}
         <dependency>
             <groupId>org.jspecify</groupId>
             <artifactId>jspecify</artifactId>
             <version>1.0.0</version>
         </dependency>
         {{/useJspecify}}
+        {{#lombok}}
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <optional>true</optional>
+            </dependency>
+        {{/lombok}}
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>