Add shop.yml, module.yml support (#986)

Author: tokuhirom

clients/line-bot-module-client/build.gradle.kts

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+plugins {
+    id("sdk.openapi")
+    id("sdk.publish")
+}
+
+openApiGenerate {
+    inputSpec.set("$rootDir/line-openapi/module.yml")
+    apiPackage.set("com.linecorp.bot.module.client")
+    modelPackage.set("com.linecorp.bot.module.model")
+}

clients/line-bot-module-client/src/main/java/com/linecorp/bot/module/client/LineModuleClientException.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.linecorp.bot.module.client;
+
+import com.linecorp.bot.client.base.exception.AbstractLineClientException;
+
+import okhttp3.Response;
+
+/**
+ * An API call exception for module API.
+ */
+@SuppressWarnings("serial")
+public class LineModuleClientException extends AbstractLineClientException {
+    public LineModuleClientException(Response response) {
+        super(response, "An error occurred.");
+    }
+}

clients/line-bot-module-client/src/main/java/com/linecorp/bot/module/client/LineModuleExceptionBuilder.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.linecorp.bot.module.client;
+
+import java.io.IOException;
+
+import com.linecorp.bot.client.base.AbstractExceptionBuilder;
+
+import okhttp3.Response;
+
+public class LineModuleExceptionBuilder extends AbstractExceptionBuilder<Object> {
+    public LineModuleExceptionBuilder() {
+        super(Object.class);
+    }
+
+    @Override
+    protected IOException buildException(Response response, Object errorBody) {
+        return new LineModuleClientException(response);
+    }
+}

clients/line-bot-module-client/src/test/resources/logback-test.xml

@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>

clients/line-bot-shop-client/build.gradle.kts

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+plugins {
+    id("sdk.openapi")
+    id("sdk.publish")
+}
+
+openApiGenerate {
+    inputSpec.set("$rootDir/line-openapi/shop.yml")
+    apiPackage.set("com.linecorp.bot.shop.client")
+    modelPackage.set("com.linecorp.bot.shop.model")
+}

clients/line-bot-shop-client/src/main/java/com/linecorp/bot/shop/client/ShopClientException.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.linecorp.bot.shop.client;
+
+import com.linecorp.bot.client.base.exception.AbstractLineClientException;
+
+import okhttp3.Response;
+
+/**
+ * An API call exception for shop API.
+ */
+@SuppressWarnings("serial")
+public class ShopClientException extends AbstractLineClientException {
+    /**
+     * An error summary.
+     */
+    private final String error;
+
+    public ShopClientException(Response response, String error) {
+        super(response, "error='" + error);
+        this.error = error;
+    }
+
+    public String getError() {
+        return error;
+    }
+}

clients/line-bot-shop-client/src/main/java/com/linecorp/bot/shop/client/ShopExceptionBuilder.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 LINE Corporation
+ *
+ * LINE Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.linecorp.bot.shop.client;
+
+import java.io.IOException;
+
+import com.linecorp.bot.client.base.AbstractExceptionBuilder;
+import com.linecorp.bot.shop.model.ErrorResponse;
+
+import okhttp3.Response;
+
+public class ShopExceptionBuilder extends AbstractExceptionBuilder<ErrorResponse> {
+    public ShopExceptionBuilder() {
+        super(ErrorResponse.class);
+    }
+
+    @Override
+    protected IOException buildException(Response response, ErrorResponse errorBody) {
+        return new ShopClientException(response, errorBody.message());
+    }
+}

clients/line-bot-shop-client/src/test/resources/logback-test.xml

@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>

settings.gradle.kts

@@ -39,8 +39,8 @@ dependencyResolutionManagement {
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 // core components
-include("line-bot-parser")
 include("line-bot-jackson")
+include("line-bot-parser")
 
 // openapi based webhook
 include("line-bot-webhook")
@@ -51,6 +51,8 @@ include("clients:line-bot-insight-client")
 include("clients:line-bot-manage-audience-client")
 include("clients:line-bot-messaging-api-client")
 include("clients:line-bot-module-attach-client")
+include("clients:line-bot-module-client")
+include("clients:line-bot-shop-client")
 include("clients:line-channel-access-token-client")
 include("clients:line-liff-client")
 
@@ -61,10 +63,10 @@ include("spring-boot:line-bot-spring-boot-web")
 include("spring-boot:line-bot-spring-boot-webmvc")
 
 // samples
+include("samples:sample-manage-audience")
 include("samples:sample-spring-boot-echo")
 include("samples:sample-spring-boot-echo-kotlin")
 include("samples:sample-spring-boot-kitchensink")
-include("samples:sample-manage-audience")
 
 // integration test
 include("line-bot-integration-test")

spring-boot/line-bot-spring-boot-client/build.gradle.kts

@@ -24,13 +24,14 @@ dependencies {
     annotationProcessor(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 
     api(project(":clients:line-bot-client-base"))
-    api(project(":clients:line-liff-client"))
     api(project(":clients:line-bot-insight-client"))
-    api(project(":clients:line-channel-access-token-client"))
     api(project(":clients:line-bot-manage-audience-client"))
     api(project(":clients:line-bot-messaging-api-client"))
     api(project(":clients:line-bot-module-attach-client"))
-    api(project(":clients:line-bot-client-base"))
+    api(project(":clients:line-bot-module-client"))
+    api(project(":clients:line-bot-shop-client"))
+    api(project(":clients:line-channel-access-token-client"))
+    api(project(":clients:line-liff-client"))
 
     implementation("org.springframework.boot:spring-boot-autoconfigure")
     implementation("org.springframework.boot:spring-boot-starter")