Better handling of operationID starting with numbers

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

@@ -603,6 +603,12 @@ public String toOperationId(String operationId) {
             operationId = "call_" + operationId;
         }
 
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
+        }
+
         return camelize(sanitizeName(operationId));
     }
 

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

@@ -314,7 +314,13 @@ public String toOperationId(String operationId) {
         // method name cannot use reserved keyword, e.g. return
         if (isReservedWord(sanitizedOperationId)) {
             LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to "
-                    + camelize("call_" + operationId));
+                    + camelize("call_" + sanitizedOperationId));
+            sanitizedOperationId = "call_" + sanitizedOperationId;
+        }
+
+        // operationId starts with a number
+        if (sanitizedOperationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize("call_" + sanitizedOperationId));
             sanitizedOperationId = "call_" + sanitizedOperationId;
         }
 

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

@@ -884,6 +884,12 @@ public String toOperationId(String operationId) {
             return newOperationId;
         }
 
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
+            operationId = camelize("call_" + operationId, true);
+        }
+
         return operationId;
     }
 

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

@@ -377,8 +377,14 @@ public String toOperationId(String operationId) {
 
         // method name cannot use reserved keyword, e.g. return
         if (isReservedWord(operationId)) {
-            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + underscore("call_" + operationId));
-            return underscore("call_" + operationId);
+            LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + underscore(sanitizeName("call_" + operationId)));
+            return underscore(sanitizeName("call_" + operationId));
+        }
+
+        // operationId starts with a number
+        if (operationId.matches("^\\d.*")) {
+            LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + underscore(sanitizeName("call_" + operationId)));
+            operationId = "call_" + operationId;
         }
 
         //return underscore(operationId).replaceAll("[^A-Za-z0-9_]", "");

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

@@ -552,7 +552,7 @@ public String toOperationId(String operationId) {
             operationId = "call_" + operationId;
         }
 
-        // model name starts with a number
+        // operationId starts with a number
         if (operationId.matches("^\\d.*")) {
             LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + underscore(sanitizeName("call_" + operationId)));
             operationId = "call_" + operationId;

modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -929,8 +929,8 @@ paths:
       tags:
         - "$another-fake?"
       summary: To test special tags
-      description: To test special tags
-      operationId: test_special_tags
+      description: To test special tags and operation ID starting with number
+      operationId: 123_test_@#$%_special_tags
       consumes:
         - application/json
       produces:

modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -898,8 +898,8 @@ paths:
       tags:
         - $another-fake?
       summary: To test special tags
-      description: To test special tags
-      operationId: test_special_tags
+      description: To test special tags and operation ID starting with number
+      operationId: 123_test_@#$%_special_tags
       responses:
         '200':
           description: successful operation

samples/client/petstore/go/go-petstore/.openapi-generator/VERSION

@@ -1 +1 @@
-3.1.1-SNAPSHOT
+3.2.0-SNAPSHOT

samples/client/petstore/go/go-petstore/README.md

@@ -30,7 +30,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*AnotherFakeApi* | [**TestSpecialTags**](docs/AnotherFakeApi.md#testspecialtags) | **Patch** /another-fake/dummy | To test special tags
+*AnotherFakeApi* | [**Call123TestSpecialTags**](docs/AnotherFakeApi.md#call123testspecialtags) | **Patch** /another-fake/dummy | To test special tags
 *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **Post** /fake/outer/boolean | 
 *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **Post** /fake/outer/composite | 
 *FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **Post** /fake/outer/number | 

samples/client/petstore/go/go-petstore/api/openapi.yaml

@@ -954,8 +954,8 @@ paths:
       - fake
   /another-fake/dummy:
     patch:
-      description: To test special tags
-      operationId: test_special_tags
+      description: To test special tags and operation ID starting with number
+      operationId: 123_test_@#$%_special_tags
       requestBody:
         content:
           application/json:

samples/client/petstore/go/go-petstore/api_another_fake.go

@@ -26,12 +26,12 @@ type AnotherFakeApiService service
 
 /*
 AnotherFakeApiService To test special tags
-To test special tags
+To test special tags and operation ID starting with number
  * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
  * @param client client model
 @return Client
 */
-func (a *AnotherFakeApiService) TestSpecialTags(ctx context.Context, client Client) (Client, *http.Response, error) {
+func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx context.Context, client Client) (Client, *http.Response, error) {
 	var (
 		localVarHttpMethod = strings.ToUpper("Patch")
 		localVarPostBody     interface{}

samples/client/petstore/go/go-petstore/docs/AnotherFakeApi.md

@@ -4,14 +4,14 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**TestSpecialTags**](AnotherFakeApi.md#TestSpecialTags) | **Patch** /another-fake/dummy | To test special tags
+[**Call123TestSpecialTags**](AnotherFakeApi.md#Call123TestSpecialTags) | **Patch** /another-fake/dummy | To test special tags
 
 
-# **TestSpecialTags**
-> Client TestSpecialTags(ctx, client)
+# **Call123TestSpecialTags**
+> Client Call123TestSpecialTags(ctx, client)
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Required Parameters
 

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -17,7 +17,7 @@ public interface AnotherFakeApi extends ApiClient.Api {
 
   /**
    * To test special tags
-   * To test special tags
+   * To test special tags and operation ID starting with number
     * @param client client model (required)
    * @return Client
    */
@@ -26,5 +26,5 @@ public interface AnotherFakeApi extends ApiClient.Api {
     "Content-Type: application/json",
     "Accept: application/json",
   })
-  Client testSpecialTags(Client client);
+  Client call123testSpecialTags(Client client);
 }

samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md

@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-<a name="testSpecialTags"></a>
-# **testSpecialTags**
-> Client testSpecialTags(client)
+<a name="call123testSpecialTags"></a>
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```java
@@ -25,10 +25,10 @@ To test special tags
 AnotherFakeApi apiInstance = new AnotherFakeApi();
 Client client = new Client(); // Client | client model
 try {
-    Client result = apiInstance.testSpecialTags(client);
+    Client result = apiInstance.call123testSpecialTags(client);
     System.out.println(result);
 } catch (ApiException e) {
-    System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+    System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
     e.printStackTrace();
 }
 ```

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -42,37 +42,37 @@ public void setApiClient(ApiClient apiClient) {
 
   /**
     * To test special tags
-    * To test special tags
+    * To test special tags and operation ID starting with number
     * <p><b>200</b> - successful operation
     * @param client client model
     * @return Client
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public Client testSpecialTags(Client client) throws IOException {
-        HttpResponse response = testSpecialTagsForHttpResponse(client);
+    public Client call123testSpecialTags(Client client) throws IOException {
+        HttpResponse response = call123testSpecialTagsForHttpResponse(client);
         TypeReference typeRef = new TypeReference<Client>() {};
         return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
     }
 
   /**
     * To test special tags
-    * To test special tags
+    * To test special tags and operation ID starting with number
     * <p><b>200</b> - successful operation
     * @param client client model
     * @param params Map of query params. A collection will be interpreted as passing in multiple instances of the same query param.
     * @return Client
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public Client testSpecialTags(Client client, Map<String, Object> params) throws IOException {
-        HttpResponse response = testSpecialTagsForHttpResponse(client, params);
+    public Client call123testSpecialTags(Client client, Map<String, Object> params) throws IOException {
+        HttpResponse response = call123testSpecialTagsForHttpResponse(client, params);
         TypeReference typeRef = new TypeReference<Client>() {};
         return apiClient.getObjectMapper().readValue(response.getContent(), typeRef);
     }
 
-    public HttpResponse testSpecialTagsForHttpResponse(Client client) throws IOException {
+    public HttpResponse call123testSpecialTagsForHttpResponse(Client client) throws IOException {
         // verify the required parameter 'client' is set
         if (client == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testSpecialTags");
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling call123testSpecialTags");
         }
         UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/another-fake/dummy");
 
@@ -83,10 +83,10 @@ public HttpResponse testSpecialTagsForHttpResponse(Client client) throws IOExcep
         return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
     }
 
-      public HttpResponse testSpecialTagsForHttpResponse(java.io.InputStream client, String mediaType) throws IOException {
+      public HttpResponse call123testSpecialTagsForHttpResponse(java.io.InputStream client, String mediaType) throws IOException {
           // verify the required parameter 'client' is set
               if (client == null) {
-              throw new IllegalArgumentException("Missing the required parameter 'client' when calling testSpecialTags");
+              throw new IllegalArgumentException("Missing the required parameter 'client' when calling call123testSpecialTags");
               }
               UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/another-fake/dummy");
 
@@ -99,10 +99,10 @@ apiClient.new JacksonJsonHttpContent(null) :
               return apiClient.getHttpRequestFactory().buildRequest(HttpMethods.PATCH, genericUrl, content).execute();
       }
 
-    public HttpResponse testSpecialTagsForHttpResponse(Client client, Map<String, Object> params) throws IOException {
+    public HttpResponse call123testSpecialTagsForHttpResponse(Client client, Map<String, Object> params) throws IOException {
         // verify the required parameter 'client' is set
         if (client == null) {
-            throw new IllegalArgumentException("Missing the required parameter 'client' when calling testSpecialTags");
+            throw new IllegalArgumentException("Missing the required parameter 'client' when calling call123testSpecialTags");
         }
         UriBuilder uriBuilder = UriBuilder.fromUri(apiClient.getBasePath() + "/another-fake/dummy");
 

samples/client/petstore/java/google-api-client/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java

@@ -35,15 +35,15 @@ public class AnotherFakeApiTest {
     /**
      * To test special tags
      *
-     * To test special tags
+     * To test special tags and operation ID starting with number
      *
      * @throws IOException
      *          if the Api call fails
      */
     @Test
-    public void testSpecialTagsTest() throws IOException {
+    public void call123testSpecialTagsTest() throws IOException {
         Client client = null;
-        Client response = api.testSpecialTags(client);
+        Client response = api.call123testSpecialTags(client);
 
         // TODO: test validations
     }

samples/client/petstore/java/jersey1/docs/AnotherFakeApi.md

@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-<a name="testSpecialTags"></a>
-# **testSpecialTags**
-> Client testSpecialTags(client)
+<a name="call123testSpecialTags"></a>
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```java
@@ -25,10 +25,10 @@ To test special tags
 AnotherFakeApi apiInstance = new AnotherFakeApi();
 Client client = new Client(); // Client | client model
 try {
-    Client result = apiInstance.testSpecialTags(client);
+    Client result = apiInstance.call123testSpecialTags(client);
     System.out.println(result);
 } catch (ApiException e) {
-    System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+    System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
     e.printStackTrace();
 }
 ```

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/api/AnotherFakeApi.java

@@ -50,17 +50,17 @@ public void setApiClient(ApiClient apiClient) {
 
   /**
    * To test special tags
-   * To test special tags
+   * To test special tags and operation ID starting with number
    * @param client client model (required)
    * @return Client
    * @throws ApiException if fails to make API call
    */
-  public Client testSpecialTags(Client client) throws ApiException {
+  public Client call123testSpecialTags(Client client) throws ApiException {
     Object localVarPostBody = client;
 
     // verify the required parameter 'client' is set
     if (client == null) {
-      throw new ApiException(400, "Missing the required parameter 'client' when calling testSpecialTags");
+      throw new ApiException(400, "Missing the required parameter 'client' when calling call123testSpecialTags");
     }
 
     // create path and map variables

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java

@@ -35,15 +35,15 @@ public class AnotherFakeApiTest {
     /**
      * To test special tags
      *
-     * To test special tags
+     * To test special tags and operation ID starting with number
      *
      * @throws ApiException
      *          if the Api call fails
      */
     @Test
-    public void testSpecialTagsTest() throws ApiException {
+    public void call123testSpecialTagsTest() throws ApiException {
         Client client = null;
-        Client response = api.testSpecialTags(client);
+        Client response = api.call123testSpecialTags(client);
 
         // TODO: test validations
     }

samples/client/petstore/java/jersey2-java6/docs/AnotherFakeApi.md

@@ -4,16 +4,16 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 
 Method | HTTP request | Description
 ------------- | ------------- | -------------
-[**testSpecialTags**](AnotherFakeApi.md#testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
 
 
-<a name="testSpecialTags"></a>
-# **testSpecialTags**
-> Client testSpecialTags(client)
+<a name="call123testSpecialTags"></a>
+# **call123testSpecialTags**
+> Client call123testSpecialTags(client)
 
 To test special tags
 
-To test special tags
+To test special tags and operation ID starting with number
 
 ### Example
 ```java
@@ -25,10 +25,10 @@ To test special tags
 AnotherFakeApi apiInstance = new AnotherFakeApi();
 Client client = new Client(); // Client | client model
 try {
-    Client result = apiInstance.testSpecialTags(client);
+    Client result = apiInstance.call123testSpecialTags(client);
     System.out.println(result);
 } catch (ApiException e) {
-    System.err.println("Exception when calling AnotherFakeApi#testSpecialTags");
+    System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
     e.printStackTrace();
 }
 ```