[BREAKING CHANGE] Drop authentication related arguments from ChannelA… (

#1157) …ccessTokenClient. The endpoint is not require authenticaiton informantion.
line · Nov 16, 2023 · 8c33b7d · 8c33b7d
1 parent da009fb
commit 8c33b7d
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 277 deletions.
diff --git a/clients/line-channel-access-token-client/.openapi-generator/FILES b/clients/line-channel-access-token-client/.openapi-generator/FILES
@@ -5,3 +5,4 @@ src/main/java/com/linecorp/bot/oauth/model/IssueChannelAccessTokenResponse.java
 src/main/java/com/linecorp/bot/oauth/model/IssueShortLivedChannelAccessTokenResponse.java
 src/main/java/com/linecorp/bot/oauth/model/IssueStatelessChannelAccessTokenResponse.java
 src/main/java/com/linecorp/bot/oauth/model/VerifyChannelAccessTokenResponse.java
+src/test/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClientTest.java
diff --git a/...ss-token-client/src/main/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClient.java b/...ss-token-client/src/main/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClient.java
@@ -20,9 +20,8 @@
  */
 package com.linecorp.bot.oauth.client;
 
-import com.linecorp.bot.client.base.ApiAuthenticatedClientBuilder;
+import com.linecorp.bot.client.base.ApiClientBuilder;
 import com.linecorp.bot.client.base.Result;
-import com.linecorp.bot.client.base.channel.ChannelTokenSupplier;
 import com.linecorp.bot.oauth.model.ChannelAccessTokenKeyIdsResponse;
 import com.linecorp.bot.oauth.model.IssueChannelAccessTokenResponse;
 import com.linecorp.bot.oauth.model.IssueShortLivedChannelAccessTokenResponse;
@@ -168,21 +167,10 @@ CompletableFuture<Result<VerifyChannelAccessTokenResponse>> verifyChannelToken(
   CompletableFuture<Result<VerifyChannelAccessTokenResponse>> verifyChannelTokenByJWT(
       @Query("access_token") String accessToken);
 
-  public static ApiAuthenticatedClientBuilder<ChannelAccessTokenClient> builder(
-      String channelToken) {
-    return new ApiAuthenticatedClientBuilder<>(
+  public static ApiClientBuilder<ChannelAccessTokenClient> builder() {
+    return new ApiClientBuilder<>(
         URI.create("https://api.line.me"),
         ChannelAccessTokenClient.class,
-        new ChannelAccessTokenExceptionBuilder(),
-        channelToken);
-  }
-
-  public static ApiAuthenticatedClientBuilder<ChannelAccessTokenClient> builder(
-      ChannelTokenSupplier channelTokenSupplier) {
-    return new ApiAuthenticatedClientBuilder<>(
-        URI.create("https://api.line.me"),
-        ChannelAccessTokenClient.class,
-        new ChannelAccessTokenExceptionBuilder(),
-        channelTokenSupplier);
+        new ChannelAccessTokenExceptionBuilder());
   }
 }
diff --git a/...en-client/src/test/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClientExTest.java b/...en-client/src/test/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClientExTest.java
@@ -60,7 +60,7 @@ public void setUp() {
         wireMockServer.start();
         WireMock.configureFor("localhost", wireMockServer.port());
 
-        target = ChannelAccessTokenClient.builder("MY_ACCESS_TOKEN")
+        target = ChannelAccessTokenClient.builder()
                 .apiEndPoint(URI.create(wireMockServer.baseUrl()))
                 .build();
     }

diff --git a/...oken-client/src/test/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClientTest.java b/...oken-client/src/test/java/com/linecorp/bot/oauth/client/ChannelAccessTokenClientTest.java
diff --git a/generator/pom.xml b/generator/pom.xml
@@ -100,8 +100,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>9</source>
+                    <target>9</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/generator/src/main/resources/line-java-codegen/api.pebble b/generator/src/main/resources/line-java-codegen/api.pebble
@@ -3,7 +3,7 @@
 {# @pebvariable name="package" type="java.lang.String" -#}
 {# @pebvariable name="generatorClass" type="java.lang.String" -#}
 {# @pebvariable name="classname" type="java.lang.String" -#}
-{# @pebvariable name="authenticated" type="java.lang.Boolean" -#}
+{# @pebvariable name="authMethods" type="java.util.ArrayList<org.openapitools.codegen.CodegenSecurity>" -#}
 {% include "./licenseInfo.pebble" %}
 package {{ package }};
 {% import "./macros/api_param.pebble" %}
@@ -71,7 +71,7 @@ public interface {{classname}} {
 
 {% endfor %}
 
-{% if authenticated %}
+{% if authMethods != null %}
     public static ApiAuthenticatedClientBuilder<{{classname}}> builder(String channelToken) {
         return new ApiAuthenticatedClientBuilder<>(URI.create("{{ endpoint(classname) }}"), {{classname}}.class, new {{ exceptionbuilderclassname(classname) }}(), channelToken);
     }

diff --git a/generator/src/main/resources/line-java-codegen/api_test.pebble b/generator/src/main/resources/line-java-codegen/api_test.pebble
@@ -2,7 +2,7 @@
 {# @pebvariable name="operations" type="org.openapitools.codegen.model.OperationMap" -#}
 {# @pebvariable name="generatorClass" type="java.lang.String" -#}
 {# @pebvariable name="classname" type="java.lang.String" -#}
-{# @pebvariable name="authenticated" type="boolean" -#}
+{# @pebvariable name="authMethods" type="java.util.ArrayList<org.openapitools.codegen.CodegenSecurity>" -#}
 {% include "./licenseInfo.pebble" %}
 
 package {# @pebvariable name="package" type="java.lang.String" -#}{{package}};
@@ -71,7 +71,7 @@ public class {{classname}}Test {
         configureFor("localhost", wireMockServer.port());
 
 
-        api = {{classname}}.builder({% if authenticated %}"MY_OWN_TOKEN"{% endif %})
+        api = {{classname}}.builder({% if authMethods != null %}"MY_OWN_TOKEN"{% endif %})
             .apiEndPoint(URI.create(wireMockServer.baseUrl()))
             .build();
     }