From 94ac94c1c7d2a5194aa0ebe13ded789d750e3daf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:47:19 +0900 Subject: [PATCH] Remove obsolete feature: Audience Match (#1528) https://github.com/line/line-openapi/pull/80 The Audience Match feature (/bot/ad/multicast/phone) was sunset in October 2023. This change removes it as it's no longer necessary to include it in line-openapi. --------- Co-authored-by: github-actions Co-authored-by: Yuta Kasai --- .gitignore | 3 + .../.openapi-generator/FILES | 1 - .../messaging/client/MessagingApiClient.java | 12 --- .../model/AudienceMatchMessagesRequest.java | 75 ------------------- .../client/MessagingApiClientTest.java | 27 ------- 5 files changed, 3 insertions(+), 115 deletions(-) delete mode 100644 clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/model/AudienceMatchMessagesRequest.java diff --git a/.gitignore b/.gitignore index 905323531..8dc5c4086 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ integration_test_settings.yml # Mac .DS_Store bin/ + +# github workflow +pr_info.json diff --git a/clients/line-bot-messaging-api-client/.openapi-generator/FILES b/clients/line-bot-messaging-api-client/.openapi-generator/FILES index b76d2a0b5..f1789fd7f 100644 --- a/clients/line-bot-messaging-api-client/.openapi-generator/FILES +++ b/clients/line-bot-messaging-api-client/.openapi-generator/FILES @@ -9,7 +9,6 @@ src/main/java/com/linecorp/bot/messaging/model/AppTypeDemographic.java src/main/java/com/linecorp/bot/messaging/model/AppTypeDemographicFilter.java src/main/java/com/linecorp/bot/messaging/model/AreaDemographic.java src/main/java/com/linecorp/bot/messaging/model/AreaDemographicFilter.java -src/main/java/com/linecorp/bot/messaging/model/AudienceMatchMessagesRequest.java src/main/java/com/linecorp/bot/messaging/model/AudienceRecipient.java src/main/java/com/linecorp/bot/messaging/model/AudioMessage.java src/main/java/com/linecorp/bot/messaging/model/BotInfoResponse.java diff --git a/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/client/MessagingApiClient.java b/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/client/MessagingApiClient.java index b1e115494..c2333a8ce 100644 --- a/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/client/MessagingApiClient.java +++ b/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/client/MessagingApiClient.java @@ -23,7 +23,6 @@ import com.linecorp.bot.client.base.ApiAuthenticatedClientBuilder; import com.linecorp.bot.client.base.Result; import com.linecorp.bot.client.base.channel.ChannelTokenSupplier; -import com.linecorp.bot.messaging.model.AudienceMatchMessagesRequest; import com.linecorp.bot.messaging.model.BotInfoResponse; import com.linecorp.bot.messaging.model.BroadcastRequest; import com.linecorp.bot.messaging.model.CreateRichMenuAliasRequest; @@ -77,17 +76,6 @@ @javax.annotation.Generated(value = "com.linecorp.bot.codegen.LineJavaCodegenGenerator") public interface MessagingApiClient { - /** - * Send a message using phone number - * - * @param audienceMatchMessagesRequest (required) - * @see - * Documentation - */ - @POST("/bot/ad/multicast/phone") - CompletableFuture> audienceMatch( - @Body AudienceMatchMessagesRequest audienceMatchMessagesRequest); - /** * Sends a message to multiple users at any time. * diff --git a/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/model/AudienceMatchMessagesRequest.java b/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/model/AudienceMatchMessagesRequest.java deleted file mode 100644 index a627a8d79..000000000 --- a/clients/line-bot-messaging-api-client/src/main/java/com/linecorp/bot/messaging/model/AudienceMatchMessagesRequest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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. - */ - -/** - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech Do not edit the class manually. - */ -package com.linecorp.bot.messaging.model; - - - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - -/** - * AudienceMatchMessagesRequest - * - * @see - * Documentation - */ -@JsonInclude(Include.NON_NULL) -@javax.annotation.Generated(value = "com.linecorp.bot.codegen.LineJavaCodegenGenerator") -public record AudienceMatchMessagesRequest( - /** - * Destination of the message (A value obtained by hashing the telephone number, which is - * another value normalized to E.164 format, with SHA256). - */ - @JsonProperty("messages") List messages, - /** Message to send. */ - @JsonProperty("to") List to, - /** - * `true`: The user doesn’t receive a push notification when a message is sent. - * `false`: The user receives a push notification when the message is sent (unless - * they have disabled push notifications in LINE and/or their device). The default value is - * false. - */ - @JsonProperty("notificationDisabled") Boolean notificationDisabled) { - - public static class Builder { - private List messages; - private List to; - private Boolean notificationDisabled; - - public Builder(List messages, List to) { - - this.messages = messages; - - this.to = to; - } - - public Builder notificationDisabled(Boolean notificationDisabled) { - this.notificationDisabled = notificationDisabled; - return this; - } - - public AudienceMatchMessagesRequest build() { - return new AudienceMatchMessagesRequest(messages, to, notificationDisabled); - } - } -} diff --git a/clients/line-bot-messaging-api-client/src/test/java/com/linecorp/bot/messaging/client/MessagingApiClientTest.java b/clients/line-bot-messaging-api-client/src/test/java/com/linecorp/bot/messaging/client/MessagingApiClientTest.java index 09872be24..f776e3d76 100644 --- a/clients/line-bot-messaging-api-client/src/test/java/com/linecorp/bot/messaging/client/MessagingApiClientTest.java +++ b/clients/line-bot-messaging-api-client/src/test/java/com/linecorp/bot/messaging/client/MessagingApiClientTest.java @@ -32,7 +32,6 @@ import static org.assertj.core.api.Assertions.assertThat; import com.github.tomakehurst.wiremock.WireMockServer; -import com.linecorp.bot.messaging.model.AudienceMatchMessagesRequest; import com.linecorp.bot.messaging.model.BotInfoResponse; import com.linecorp.bot.messaging.model.BroadcastRequest; import com.linecorp.bot.messaging.model.CreateRichMenuAliasRequest; @@ -117,32 +116,6 @@ public void tearDown() { wireMockServer.stop(); } - @Test - public void audienceMatchTest() { - stubFor( - post(urlPathTemplate("/bot/ad/multicast/phone")) - .willReturn( - aResponse() - .withStatus(200) - .withHeader("content-type", "application/json") - .withBody("{}"))); - - AudienceMatchMessagesRequest audienceMatchMessagesRequest = - Arranger.some( - AudienceMatchMessagesRequest.class, - Map.of( - "message", - () -> new TextMessage("hello"), - "recipient", - () -> null, - "filter", - () -> null)); - - api.audienceMatch(audienceMatchMessagesRequest).join().body(); - - // TODO: test validations - } - @Test public void broadcastTest() { stubFor(