Allo to generate client as abstract.

Author: afoucret

resources/dev/elastic-openapi-codegen-php/src/main/java/org/elasticsearch/codegen/ElasticClientPhpGenerator.java

@@ -7,30 +7,26 @@
 import io.swagger.v3.oas.models.parameters.RequestBody;
 
 import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.CodegenConfig;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.CodegenType;
-import org.openapitools.codegen.SupportingFile;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.PhpClientCodegen;
 import org.openapitools.codegen.utils.ModelUtils;
 
 public class ElasticClientPhpGenerator extends PhpClientCodegen implements CodegenConfig {
 
-  public static final String GENERATOR_NAME = "elastic-php-client";
-  public static final String HELP_URL       = "helpUrl";
-  public static final String COPYRIGHT      = "copyright";
+  public static final String GENERATOR_NAME         = "elastic-php-client";
+  public static final String HELP_URL               = "helpUrl";
+  public static final String COPYRIGHT              = "copyright";
+  public static final String CLIENT_CLASS           = "clientClass";
+  public static final String CLIENT_CLASS_QUALIFIER = "clientClassQualifier";
 
   public ElasticClientPhpGenerator() {
     super();
 
     cliOptions.add(new CliOption(HELP_URL, "Help URL"));
     cliOptions.add(new CliOption(COPYRIGHT, "Copyright"));
+    cliOptions.add(new CliOption(CLIENT_CLASS, "Client file"));
 
     this.setTemplateDir(ElasticClientPhpGenerator.GENERATOR_NAME);
     this.setSrcBasePath("");
@@ -44,9 +40,17 @@ public ElasticClientPhpGenerator() {
   @Override
   public void processOpts() {
     super.processOpts();
+
+    String clientClass = (String) additionalProperties.getOrDefault(CLIENT_CLASS, "Client");
+    additionalProperties.put(CLIENT_CLASS, clientClass);
+
+    if (clientClass.startsWith("Abstract")) {
+      additionalProperties.put(CLIENT_CLASS_QUALIFIER, "abstract");
+    }
+
     this.resetTemplateFiles();
 
-    supportingFiles.add(new SupportingFile("Client.mustache", "", "Client.php"));
+    supportingFiles.add(new SupportingFile("Client.mustache", "", clientClass.concat(".php")));
     supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
   }
 
@@ -67,19 +71,20 @@ public String toApiName(String name) {
 
   @Override
   @SuppressWarnings("static-method")
-  public void addOperationToGroup(String tag, String resourcePath,
-      Operation operation, CodegenOperation baseCo,
-      Map<String, List<CodegenOperation>> operations) {
-
-    getCodegenOperationAliases(operation, baseCo).forEach(co -> {
+  public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
       String uniqueName = co.operationId;
-
       co.operationIdLowerCase = uniqueName.toLowerCase(Locale.ROOT);
       co.operationIdCamelCase = org.openapitools.codegen.utils.StringUtils.camelize(uniqueName);
       co.operationIdSnakeCase = org.openapitools.codegen.utils.StringUtils.underscore(uniqueName);
 
+      if (co.vendorExtensions == null) {
+        co.vendorExtensions = new HashMap<>();
+      }
+
+      co.vendorExtensions.put("x-operation-scope", co.vendorExtensions.getOrDefault("x-operation-scope", "public"));
+      co.vendorExtensions.put("x-add-to-documentation", co.vendorExtensions.getOrDefault("x-operation-scope", "public").equals("public"));
+
       operations.put(uniqueName, Arrays.asList(co));
-    });
   }
 
   @Override
@@ -150,44 +155,4 @@ private void resetTemplateFiles() {
 
     apiTemplateFiles.put("api.mustache", ".php");
   }
-
-  private List<CodegenOperation> getCodegenOperationAliases(Operation operation, CodegenOperation co) {
-    List<CodegenOperation> operationsAliases = new ArrayList<>();
-
-    operationsAliases.add(co);
-
-    if (operation.getExtensions() != null && operation.getExtensions().containsKey("x-operation-aliases")) {
-      Map<String, Map<String, Object>> aliases = (Map<String, Map<String, Object>>) operation.getExtensions().get("x-operation-aliases");
-      for (Map.Entry<String, Map<String, Object>> alias: aliases.entrySet()) {
-        CodegenOperation aliasCo = new CodegenOperation();
-        List<String> validParamNames = (List) alias.getValue().get("params");
-        Predicate<CodegenParameter> paramFilter = codegenParameter -> validParamNames.contains(codegenParameter.paramName);
-        Arrays.asList(CodegenOperation.class.getFields()).stream().forEach(f -> {
-          try {
-            Object fieldValue = f.get(co);
-            if (f.getName().endsWith("Params") && fieldValue instanceof List) {
-              List<CodegenParameter> params = (List<CodegenParameter>) ((List) fieldValue).stream().filter(paramFilter).map(
-                  p -> ReflectionClone.clone(p, new CodegenParameter())
-              ).collect(Collectors.toList());
-
-              if (params.isEmpty() == false) {
-                params.get(params.size() -1).hasMore = false;
-              }
-              fieldValue = params;
-            }
-            f.set(aliasCo, fieldValue);
-          } catch (IllegalAccessException e) {
-            ;
-          }
-          aliasCo.operationId = alias.getKey();
-          if (alias.getValue().containsKey("summary")) {
-            aliasCo.summary = (String) alias.getValue().get("summary");
-          }
-        });
-        operationsAliases.add(aliasCo);
-      }
-    }
-
-    return operationsAliases;
-  }
 }

resources/dev/elastic-openapi-codegen-php/src/main/java/org/elasticsearch/codegen/ReflectionClone.java

@@ -8,7 +8,7 @@ namespace {{invokerPackage}};
  *
  * @package {{invokerPackage}}
  */
-class Client extends \Elastic\OpenApi\Codegen\AbstractClient
+{{#clientClassQualifier}}{{{.}}} {{/clientClassQualifier}}class {{clientClass}} extends \Elastic\OpenApi\Codegen\AbstractClient
 {
     // phpcs:disable
 {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}
@@ -31,7 +31,7 @@ class Client extends \Elastic\OpenApi\Codegen\AbstractClient
      *
      * @return array
      */
-    public function {{operationId}}({{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
+    {{vendorExtensions.x-operation-scope}} function {{operationId}}({{#allParams}}${{paramName}}{{^required}} = {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}{{/required}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
     {
 {{#allParams.0}}
         $params = [

resources/dev/elastic-openapi-codegen-php/src/main/resources/elastic-php-client/Client.mustache

@@ -6,8 +6,8 @@
 
 Method      | Description | Documentation
 ------------|-------------|--------------
-{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}**`{{operationId}}`**| {{#summary}}{{.}}{{/summary}}{{#allParams.0}}<br/> <br/> **Parameters :** <br />{{#allParams}}  - `${{paramName}}`{{#required}} (required) {{/required}}{{#hasMore}}<br /> {{/hasMore}}{{/allParams}}{{/allParams.0}}<br/>{{#externalDocs}}|[Endpoint Documentation]({{url}}){{/externalDocs}}
-{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{#vendorExtensions.x-add-to-documentation}}**`{{operationId}}`**| {{#summary}}{{.}}{{/summary}}{{#allParams.0}}<br/> <br/> **Parameters :** <br />{{#allParams}}  - `${{paramName}}`{{#required}} (required) {{/required}}{{#hasMore}}<br /> {{/hasMore}}{{/allParams}}{{/allParams.0}}<br/>{{#externalDocs}}|[Endpoint Documentation]({{url}}){{/externalDocs}}
+{{/vendorExtensions.x-add-to-documentation}}{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
 {{>readme_dev}}
 {{>readme_faq}}
 {{>readme_contrib}}