Merge pull request #502 from tokuhirom/fix-pom-xml

fix generator

Author: tokuhirom

.github/workflows/test.yml

@@ -17,6 +17,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: actions/setup-java@v3
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 17
+        architecture: x64
     - name: Setup Node.js
       uses: actions/setup-node@v3
       with:
@@ -28,3 +36,5 @@ jobs:
       run: npm test
     - name: Test building docs
       run: export NODE_OPTIONS=--openssl-legacy-provider; npm run docs:build
+    - name: Test generator
+      run: cd generator; mvn package

generator/pom.xml

@@ -45,17 +45,16 @@
                 </configuration>
             </plugin>
 
-            <!-- attach test jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.3.0</version>
                 <executions>
                     <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
+                      <id>default-jar</id>
+                      <goals>
+                        <goal>jar</goal>
+                      </goals>
                     </execution>
                 </executions>
                 <configuration>

generator/src/main/resources/line-bot-sdk-nodejs-generator/model.mustache

@@ -12,7 +12,7 @@ import { {{modelName}} } from './models';
 
 export type {{classname}} =
 {{#mappedModels}}
-        | {{modelName}} // {{mappingName}}
+        {{^-first}}| {{/-first}}{{modelName}} // {{mappingName}}
 {{/mappedModels}}
         | Unknown{{classname}}
 ;
@@ -38,10 +38,10 @@ export type {{classname}}{{#discriminator}}Base{{/discriminator}} = {{#parent}}{
 {{#description}}
     * {{{.}}}
 {{/description}}
-    {{#externalDocs}}
+    {{#externalDocumentation}}
      * {{description}}
-     * @see <a href="{{url}}">{{summary}} Documentation</a>
-    {{/externalDocs}}
+     * @see <a href="{{url}}">{{name}} Documentation</a>
+    {{/externalDocumentation}}
     */
     '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}/*{{#defaultValue}} = {{#isEnum}}{{classname}}.{{/isEnum}}{{{.}}}{{/defaultValue}}*/;
 {{/vars}}
@@ -54,7 +54,7 @@ export namespace {{classname}} {
     export type {{enumName}} = 
         {{#allowableValues}}
         {{#enumVars}}
-            {{^-last}}| {{/-last}}{{{value}}}
+            {{^-first}}| {{/-first}}{{{value}}}
         {{/enumVars}}
         {{/allowableValues}}
     ;

lib/channel-access-token/model/channelAccessTokenKeyIdsResponse.ts

@@ -16,6 +16,8 @@
 export type ChannelAccessTokenKeyIdsResponse = {
   /**
    * Array of channel access token key IDs.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#get-all-valid-channel-access-token-key-ids-v2-1">kids Documentation</a>
    */
   kids: Array<string> /**/;
 };

lib/channel-access-token/model/issueChannelAccessTokenResponse.ts

@@ -16,18 +16,26 @@
 export type IssueChannelAccessTokenResponse = {
   /**
    * Channel access token.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">accessToken Documentation</a>
    */
   accessToken: string /**/;
   /**
    * Amount of time in seconds from issue to expiration of the channel access token
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">expiresIn Documentation</a>
    */
   expiresIn: number /**/;
   /**
    * A token type.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">tokenType Documentation</a>
    */
   tokenType: string /* = 'Bearer'*/;
   /**
    * Unique key ID for identifying the channel access token.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-channel-access-token-v2-1">keyId Documentation</a>
    */
   keyId: string /**/;
 };

lib/channel-access-token/model/issueShortLivedChannelAccessTokenResponse.ts

@@ -16,14 +16,20 @@
 export type IssueShortLivedChannelAccessTokenResponse = {
   /**
    * A short-lived channel access token. Valid for 30 days. Note: Channel access tokens cannot be refreshed.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-shortlived-channel-access-token">accessToken Documentation</a>
    */
   accessToken: string /**/;
   /**
    * Time until channel access token expires in seconds from time the token is issued.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-shortlived-channel-access-token">expiresIn Documentation</a>
    */
   expiresIn: number /**/;
   /**
    * Token type. The value is always `Bearer`.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-shortlived-channel-access-token">tokenType Documentation</a>
    */
   tokenType: string /* = 'Bearer'*/;
 };

lib/channel-access-token/model/issueStatelessChannelAccessTokenResponse.ts

@@ -16,14 +16,20 @@
 export type IssueStatelessChannelAccessTokenResponse = {
   /**
    * A stateless channel access token. The token is an opaque string which means its format is an implementation detail and the consumer of this token should never try to use the data parsed from the token.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-stateless-channel-access-token">accessToken Documentation</a>
    */
   accessToken: string /**/;
   /**
    * Duration in seconds after which the issued access token expires
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-stateless-channel-access-token">expiresIn Documentation</a>
    */
   expiresIn: number /**/;
   /**
    * Token type. The value is always `Bearer`.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#issue-stateless-channel-access-token">tokenType Documentation</a>
    */
   tokenType: string /* = 'Bearer'*/;
 };

lib/insight/model/ageTile.ts

@@ -31,6 +31,6 @@ export namespace AgeTile {
     | "from35to39"
     | "from40to44"
     | "from45to49"
-    | "from50";
-  "unknown";
+    | "from50"
+    | "unknown";
 }

lib/insight/model/appTypeTile.ts

@@ -22,6 +22,5 @@ export type AppTypeTile = {
 };
 
 export namespace AppTypeTile {
-  export type AppTypeEnum = "ios" | "android";
-  "others";
+  export type AppTypeEnum = "ios" | "android" | "others";
 }

lib/insight/model/errorResponse.ts

@@ -14,10 +14,14 @@ import { ErrorDetail } from "./errorDetail";
 export type ErrorResponse = {
   /**
    * Message containing information about the error.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#error-responses">message Documentation</a>
    */
   message: string /**/;
   /**
    * An array of error details. If the array is empty, this property will not be included in the response.
+   *
+   * @see <a href="https://developers.line.biz/en/reference/messaging-api/#error-responses">details Documentation</a>
    */
   details?: Array<ErrorDetail> /**/;
 };