diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..1a9e7ec --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,119 @@ +name: Release + +on: + push: + branches: + - main + workflow_dispatch: + inputs: + version: + description: 'Version to publish (leave empty to use current version)' + required: false + default: '' + +jobs: + release: + name: Create GitHub Release + runs-on: ubuntu-latest + outputs: + new_release_published: ${{ steps.semantic.outputs.new_release_published }} + permissions: + contents: write + issues: write + pull-requests: write + steps: + - name: Checkout + uses: actions/checkout@v5 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} + - name: Create GitHub Release + id: semantic + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + output=$(npx -p semantic-release \ + -p @semantic-release/changelog \ + -p @semantic-release/git \ + -p @semantic-release/github \ + -p conventional-changelog-conventionalcommits \ + semantic-release 2>&1) && exit_code=0 || exit_code=$? + echo "$output" + if echo "$output" | grep -q "Published release"; then + echo "new_release_published=true" >> "$GITHUB_OUTPUT" + else + echo "new_release_published=false" >> "$GITHUB_OUTPUT" + fi + exit $exit_code + + publish: + name: Publish to Maven Central + needs: release + if: needs.release.outputs.new_release_published == 'true' + runs-on: ubuntu-latest + env: + MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} + MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} + SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} + GPG_FILE_NAME: onesignal_sdk_gpg_subkeys.gpg + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Java + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Set version from input + if: github.event.inputs.version != '' + run: | + echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV + sed -i "s/version = '[^']*'/version = '${{ github.event.inputs.version }}'/" build.gradle + + - name: Build project + run: ./gradlew build + + - name: Run tests + run: ./gradlew test + + - name: Decode GPG file from secret + run: | + echo "${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}" | base64 -d > "$GPG_FILE_NAME" + echo "GPG_FILE_PATH=$(pwd)/$GPG_FILE_NAME" >> $GITHUB_ENV + + - name: Verify GPG file + run: | + ls -lh "$GPG_FILE_PATH" + gpg --list-packets "$GPG_FILE_PATH" || echo "Invalid key file!" + + - name: Publish to Maven Central + run: | + ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache \ + -PmavenCentralUsername="$MAVEN_CENTRAL_USERNAME" \ + -PmavenCentralPassword="$MAVEN_CENTRAL_PASSWORD" \ + -Psigning.keyId="$SIGNING_KEY_ID" \ + -Psigning.password="$SIGNING_PASSWORD" \ + -Psigning.secretKeyRingFile="$GPG_FILE_PATH" + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + if: always() + with: + name: build-artifacts + path: build/libs/ diff --git a/api/openapi.yaml b/api/openapi.yaml index fc8e610..d8fbad2 100644 --- a/api/openapi.yaml +++ b/api/openapi.yaml @@ -5117,6 +5117,12 @@ components: nullable: true type: string writeOnly: true + email_reply_to_address: + description: "Channel: Email\nThe email address where replies should be\ + \ sent. If not specified, replies will go to the from address.\n" + nullable: true + type: string + writeOnly: true email_preheader: description: "Channel: Email\nThe preheader text of the email.\nPreheader\ \ is the preview text displayed immediately after an email subject that\ @@ -5170,6 +5176,49 @@ components: nullable: true type: object writeOnly: true + huawei_badge_class: + description: "Channel: Push Notifications\nPlatform: Huawei\nFull path of\ + \ the app entry activity class" + nullable: true + type: string + writeOnly: true + huawei_badge_add_num: + description: "Channel: Push Notifications\nPlatform: Huawei\nAccumulative\ + \ badge number, which is an integer ranging from 1 to 99" + nullable: true + type: integer + writeOnly: true + huawei_badge_set_num: + description: "Channel: Push Notifications\nPlatform: Huawei\nBadge number,\ + \ which is an integer ranging from 0 to 99" + nullable: true + type: integer + writeOnly: true + huawei_category: + description: "Channel: Push Notifications\nPlatform: Huawei\nCategory of\ + \ the push notification for HMS classification." + enum: + - IM + - VOIP + - SUBSCRIPTION + - TRAVEL + - HEALTH + - WORK + - ACCOUNT + - EXPRESS + - FINANCE + - DEVICE_REMINDER + - MAIL + - MARKETING + nullable: true + type: string + writeOnly: true + huawei_bi_tag: + description: "Channel: Push Notifications\nPlatform: Huawei\nA tag used\ + \ for Huawei business intelligence and analytics." + nullable: true + type: string + writeOnly: true type: object Notification_allOf: properties: diff --git a/docs/BasicNotification.md b/docs/BasicNotification.md index 8db9fae..0d54f41 100644 --- a/docs/BasicNotification.md +++ b/docs/BasicNotification.md @@ -108,6 +108,7 @@ |**emailBody** | **String** | Channel: Email Required unless template_id is set. HTML suported The body of the email you wish to send. Typically, customers include their own HTML templates here. Must include [unsubscribe_url] in an <a> tag somewhere in the email. Note: any malformed HTML content will be sent to users. Please double-check your HTML is valid. | [optional] | |**emailFromName** | **String** | Channel: Email The name the email is from. If not specified, will default to \"from name\" set in the OneSignal Dashboard Email Settings. | [optional] | |**emailFromAddress** | **String** | Channel: Email The email address the email is from. If not specified, will default to \"from email\" set in the OneSignal Dashboard Email Settings. | [optional] | +|**emailReplyToAddress** | **String** | Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. | [optional] | |**emailPreheader** | **String** | Channel: Email The preheader text of the email. Preheader is the preview text displayed immediately after an email subject that provides additional context about the email content. If not specified, will default to null. | [optional] | |**disableEmailClickTracking** | **Boolean** | Channel: Email Default is `false`. If set to `true`, the URLs sent within the email will not include link tracking and will be the same as originally set; otherwise, all the URLs in the email will be tracked. | [optional] | |**includeUnsubscribed** | **Boolean** | Channel: Email Default is `false`. This field is used to send transactional notifications. If set to `true`, this notification will also be sent to unsubscribed emails. If a `template_id` is provided, the `include_unsubscribed` value from the template will be inherited. If you are using a third-party ESP, this field requires the ESP's list of unsubscribed emails to be cleared. | [optional] | @@ -115,6 +116,11 @@ |**smsMediaUrls** | **List<String>** | Channel: SMS URLs for the media files to be attached to the SMS content. Limit: 10 media urls with a total max. size of 5MBs. | [optional] | |**filters** | [**List<FilterExpression>**](FilterExpression.md) | | [optional] | |**customData** | **Object** | Channel: All JSON object that can be used as a source of message personalization data for fields that support tag variable substitution. Push, SMS: Can accept up to 2048 bytes of valid JSON. Email: Can accept up to 10000 bytes of valid JSON. Example: {\"order_id\": 123, \"currency\": \"USD\", \"amount\": 25} | [optional] | +|**huaweiBadgeClass** | **String** | Channel: Push Notifications Platform: Huawei Full path of the app entry activity class | [optional] | +|**huaweiBadgeAddNum** | **Integer** | Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 | [optional] | +|**huaweiBadgeSetNum** | **Integer** | Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 | [optional] | +|**huaweiCategory** | [**HuaweiCategoryEnum**](#HuaweiCategoryEnum) | Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. | [optional] | +|**huaweiBiTag** | **String** | Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. | [optional] | @@ -137,3 +143,22 @@ +## Enum: HuaweiCategoryEnum + +| Name | Value | +|---- | -----| +| IM | "IM" | +| VOIP | "VOIP" | +| SUBSCRIPTION | "SUBSCRIPTION" | +| TRAVEL | "TRAVEL" | +| HEALTH | "HEALTH" | +| WORK | "WORK" | +| ACCOUNT | "ACCOUNT" | +| EXPRESS | "EXPRESS" | +| FINANCE | "FINANCE" | +| DEVICE_REMINDER | "DEVICE_REMINDER" | +| MAIL | "MAIL" | +| MARKETING | "MARKETING" | + + + diff --git a/docs/BasicNotificationAllOf.md b/docs/BasicNotificationAllOf.md index de9974e..720d397 100644 --- a/docs/BasicNotificationAllOf.md +++ b/docs/BasicNotificationAllOf.md @@ -95,6 +95,7 @@ |**emailBody** | **String** | Channel: Email Required unless template_id is set. HTML suported The body of the email you wish to send. Typically, customers include their own HTML templates here. Must include [unsubscribe_url] in an <a> tag somewhere in the email. Note: any malformed HTML content will be sent to users. Please double-check your HTML is valid. | [optional] | |**emailFromName** | **String** | Channel: Email The name the email is from. If not specified, will default to \"from name\" set in the OneSignal Dashboard Email Settings. | [optional] | |**emailFromAddress** | **String** | Channel: Email The email address the email is from. If not specified, will default to \"from email\" set in the OneSignal Dashboard Email Settings. | [optional] | +|**emailReplyToAddress** | **String** | Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. | [optional] | |**emailPreheader** | **String** | Channel: Email The preheader text of the email. Preheader is the preview text displayed immediately after an email subject that provides additional context about the email content. If not specified, will default to null. | [optional] | |**disableEmailClickTracking** | **Boolean** | Channel: Email Default is `false`. If set to `true`, the URLs sent within the email will not include link tracking and will be the same as originally set; otherwise, all the URLs in the email will be tracked. | [optional] | |**includeUnsubscribed** | **Boolean** | Channel: Email Default is `false`. This field is used to send transactional notifications. If set to `true`, this notification will also be sent to unsubscribed emails. If a `template_id` is provided, the `include_unsubscribed` value from the template will be inherited. If you are using a third-party ESP, this field requires the ESP's list of unsubscribed emails to be cleared. | [optional] | @@ -102,6 +103,11 @@ |**smsMediaUrls** | **List<String>** | Channel: SMS URLs for the media files to be attached to the SMS content. Limit: 10 media urls with a total max. size of 5MBs. | [optional] | |**filters** | [**List<FilterExpression>**](FilterExpression.md) | | [optional] | |**customData** | **Object** | Channel: All JSON object that can be used as a source of message personalization data for fields that support tag variable substitution. Push, SMS: Can accept up to 2048 bytes of valid JSON. Email: Can accept up to 10000 bytes of valid JSON. Example: {\"order_id\": 123, \"currency\": \"USD\", \"amount\": 25} | [optional] | +|**huaweiBadgeClass** | **String** | Channel: Push Notifications Platform: Huawei Full path of the app entry activity class | [optional] | +|**huaweiBadgeAddNum** | **Integer** | Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 | [optional] | +|**huaweiBadgeSetNum** | **Integer** | Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 | [optional] | +|**huaweiCategory** | [**HuaweiCategoryEnum**](#HuaweiCategoryEnum) | Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. | [optional] | +|**huaweiBiTag** | **String** | Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. | [optional] | @@ -114,3 +120,22 @@ +## Enum: HuaweiCategoryEnum + +| Name | Value | +|---- | -----| +| IM | "IM" | +| VOIP | "VOIP" | +| SUBSCRIPTION | "SUBSCRIPTION" | +| TRAVEL | "TRAVEL" | +| HEALTH | "HEALTH" | +| WORK | "WORK" | +| ACCOUNT | "ACCOUNT" | +| EXPRESS | "EXPRESS" | +| FINANCE | "FINANCE" | +| DEVICE_REMINDER | "DEVICE_REMINDER" | +| MAIL | "MAIL" | +| MARKETING | "MARKETING" | + + + diff --git a/docs/Notification.md b/docs/Notification.md index a543799..cabbf23 100644 --- a/docs/Notification.md +++ b/docs/Notification.md @@ -108,6 +108,7 @@ |**emailBody** | **String** | Channel: Email Required unless template_id is set. HTML suported The body of the email you wish to send. Typically, customers include their own HTML templates here. Must include [unsubscribe_url] in an <a> tag somewhere in the email. Note: any malformed HTML content will be sent to users. Please double-check your HTML is valid. | [optional] | |**emailFromName** | **String** | Channel: Email The name the email is from. If not specified, will default to \"from name\" set in the OneSignal Dashboard Email Settings. | [optional] | |**emailFromAddress** | **String** | Channel: Email The email address the email is from. If not specified, will default to \"from email\" set in the OneSignal Dashboard Email Settings. | [optional] | +|**emailReplyToAddress** | **String** | Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. | [optional] | |**emailPreheader** | **String** | Channel: Email The preheader text of the email. Preheader is the preview text displayed immediately after an email subject that provides additional context about the email content. If not specified, will default to null. | [optional] | |**disableEmailClickTracking** | **Boolean** | Channel: Email Default is `false`. If set to `true`, the URLs sent within the email will not include link tracking and will be the same as originally set; otherwise, all the URLs in the email will be tracked. | [optional] | |**includeUnsubscribed** | **Boolean** | Channel: Email Default is `false`. This field is used to send transactional notifications. If set to `true`, this notification will also be sent to unsubscribed emails. If a `template_id` is provided, the `include_unsubscribed` value from the template will be inherited. If you are using a third-party ESP, this field requires the ESP's list of unsubscribed emails to be cleared. | [optional] | @@ -115,6 +116,11 @@ |**smsMediaUrls** | **List<String>** | Channel: SMS URLs for the media files to be attached to the SMS content. Limit: 10 media urls with a total max. size of 5MBs. | [optional] | |**filters** | [**List<FilterExpression>**](FilterExpression.md) | | [optional] | |**customData** | **Object** | Channel: All JSON object that can be used as a source of message personalization data for fields that support tag variable substitution. Push, SMS: Can accept up to 2048 bytes of valid JSON. Email: Can accept up to 10000 bytes of valid JSON. Example: {\"order_id\": 123, \"currency\": \"USD\", \"amount\": 25} | [optional] | +|**huaweiBadgeClass** | **String** | Channel: Push Notifications Platform: Huawei Full path of the app entry activity class | [optional] | +|**huaweiBadgeAddNum** | **Integer** | Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 | [optional] | +|**huaweiBadgeSetNum** | **Integer** | Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 | [optional] | +|**huaweiCategory** | [**HuaweiCategoryEnum**](#HuaweiCategoryEnum) | Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. | [optional] | +|**huaweiBiTag** | **String** | Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. | [optional] | |**sendAfter** | **OffsetDateTime** | Channel: All Schedule notification for future delivery. API defaults to UTC -1100 Examples: All examples are the exact same date & time. \"Thu Sep 24 2015 14:00:00 GMT-0700 (PDT)\" \"September 24th 2015, 2:00:00 pm UTC-07:00\" \"2015-09-24 14:00:00 GMT-0700\" \"Sept 24 2015 14:00:00 GMT-0700\" \"Thu Sep 24 2015 14:00:00 GMT-0700 (Pacific Daylight Time)\" Note: SMS currently only supports send_after parameter. | [optional] | @@ -138,3 +144,22 @@ +## Enum: HuaweiCategoryEnum + +| Name | Value | +|---- | -----| +| IM | "IM" | +| VOIP | "VOIP" | +| SUBSCRIPTION | "SUBSCRIPTION" | +| TRAVEL | "TRAVEL" | +| HEALTH | "HEALTH" | +| WORK | "WORK" | +| ACCOUNT | "ACCOUNT" | +| EXPRESS | "EXPRESS" | +| FINANCE | "FINANCE" | +| DEVICE_REMINDER | "DEVICE_REMINDER" | +| MAIL | "MAIL" | +| MARKETING | "MARKETING" | + + + diff --git a/docs/NotificationWithMeta.md b/docs/NotificationWithMeta.md index 768a30b..fe2e4c4 100644 --- a/docs/NotificationWithMeta.md +++ b/docs/NotificationWithMeta.md @@ -108,6 +108,7 @@ |**emailBody** | **String** | Channel: Email Required unless template_id is set. HTML suported The body of the email you wish to send. Typically, customers include their own HTML templates here. Must include [unsubscribe_url] in an <a> tag somewhere in the email. Note: any malformed HTML content will be sent to users. Please double-check your HTML is valid. | [optional] | |**emailFromName** | **String** | Channel: Email The name the email is from. If not specified, will default to \"from name\" set in the OneSignal Dashboard Email Settings. | [optional] | |**emailFromAddress** | **String** | Channel: Email The email address the email is from. If not specified, will default to \"from email\" set in the OneSignal Dashboard Email Settings. | [optional] | +|**emailReplyToAddress** | **String** | Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. | [optional] | |**emailPreheader** | **String** | Channel: Email The preheader text of the email. Preheader is the preview text displayed immediately after an email subject that provides additional context about the email content. If not specified, will default to null. | [optional] | |**disableEmailClickTracking** | **Boolean** | Channel: Email Default is `false`. If set to `true`, the URLs sent within the email will not include link tracking and will be the same as originally set; otherwise, all the URLs in the email will be tracked. | [optional] | |**includeUnsubscribed** | **Boolean** | Channel: Email Default is `false`. This field is used to send transactional notifications. If set to `true`, this notification will also be sent to unsubscribed emails. If a `template_id` is provided, the `include_unsubscribed` value from the template will be inherited. If you are using a third-party ESP, this field requires the ESP's list of unsubscribed emails to be cleared. | [optional] | @@ -115,6 +116,11 @@ |**smsMediaUrls** | **List<String>** | Channel: SMS URLs for the media files to be attached to the SMS content. Limit: 10 media urls with a total max. size of 5MBs. | [optional] | |**filters** | [**List<FilterExpression>**](FilterExpression.md) | | [optional] | |**customData** | **Object** | Channel: All JSON object that can be used as a source of message personalization data for fields that support tag variable substitution. Push, SMS: Can accept up to 2048 bytes of valid JSON. Email: Can accept up to 10000 bytes of valid JSON. Example: {\"order_id\": 123, \"currency\": \"USD\", \"amount\": 25} | [optional] | +|**huaweiBadgeClass** | **String** | Channel: Push Notifications Platform: Huawei Full path of the app entry activity class | [optional] | +|**huaweiBadgeAddNum** | **Integer** | Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 | [optional] | +|**huaweiBadgeSetNum** | **Integer** | Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 | [optional] | +|**huaweiCategory** | [**HuaweiCategoryEnum**](#HuaweiCategoryEnum) | Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. | [optional] | +|**huaweiBiTag** | **String** | Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. | [optional] | |**successful** | **Integer** | Number of notifications that were successfully delivered. | [optional] | |**failed** | **Integer** | Number of notifications that could not be delivered due to those devices being unsubscribed. | [optional] | |**errored** | **Integer** | Number of notifications that could not be delivered due to an error. You can find more information by viewing the notification in the dashboard. | [optional] | @@ -149,3 +155,22 @@ +## Enum: HuaweiCategoryEnum + +| Name | Value | +|---- | -----| +| IM | "IM" | +| VOIP | "VOIP" | +| SUBSCRIPTION | "SUBSCRIPTION" | +| TRAVEL | "TRAVEL" | +| HEALTH | "HEALTH" | +| WORK | "WORK" | +| ACCOUNT | "ACCOUNT" | +| EXPRESS | "EXPRESS" | +| FINANCE | "FINANCE" | +| DEVICE_REMINDER | "DEVICE_REMINDER" | +| MAIL | "MAIL" | +| MARKETING | "MARKETING" | + + + diff --git a/src/main/java/com/onesignal/client/ApiException.java b/src/main/java/com/onesignal/client/ApiException.java index 94aaad6..f9ee9af 100644 --- a/src/main/java/com/onesignal/client/ApiException.java +++ b/src/main/java/com/onesignal/client/ApiException.java @@ -161,6 +161,6 @@ public String getResponseBody() { */ public String getMessage() { return String.format("Message: %s%nHTTP response code: %s%nHTTP response body: %s%nHTTP response headers: %s", - super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders().toString()); + super.getMessage(), this.getCode(), this.getResponseBody(), this.getResponseHeaders()); } } diff --git a/src/main/java/com/onesignal/client/api/DefaultApi.java b/src/main/java/com/onesignal/client/api/DefaultApi.java index c364330..5c96edb 100644 --- a/src/main/java/com/onesignal/client/api/DefaultApi.java +++ b/src/main/java/com/onesignal/client/api/DefaultApi.java @@ -154,7 +154,7 @@ public okhttp3.Call cancelNotificationCall(String appId, String notificationId, Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -308,7 +308,7 @@ public okhttp3.Call copyTemplateToAppCall(String templateId, String appId, CopyT Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -470,7 +470,7 @@ public okhttp3.Call createAliasCall(String appId, String aliasLabel, String alia Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -643,7 +643,7 @@ public okhttp3.Call createAliasBySubscriptionCall(String appId, String subscript Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -803,7 +803,7 @@ public okhttp3.Call createApiKeyCall(String appId, CreateApiKeyRequest createApi Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -945,7 +945,7 @@ public okhttp3.Call createAppCall(App app, final ApiCallback _callback) throws A Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -1085,7 +1085,7 @@ public okhttp3.Call createCustomEventsCall(String appId, CustomEventsRequest cus Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -1233,7 +1233,7 @@ public okhttp3.Call createNotificationCall(Notification notification, final ApiC Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -1373,7 +1373,7 @@ public okhttp3.Call createSegmentCall(String appId, Segment segment, final ApiCa Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -1525,7 +1525,7 @@ public okhttp3.Call createSubscriptionCall(String appId, String aliasLabel, Stri Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -1695,7 +1695,7 @@ public okhttp3.Call createTemplateCall(CreateTemplateRequest createTemplateReque Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -1837,7 +1837,7 @@ public okhttp3.Call createUserCall(String appId, User user, final ApiCallback _c Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -2000,7 +2000,7 @@ public okhttp3.Call deleteAliasCall(String appId, String aliasLabel, String alia Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -2169,7 +2169,7 @@ public okhttp3.Call deleteApiKeyCall(String appId, String tokenId, final ApiCall Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -2315,7 +2315,7 @@ public okhttp3.Call deleteSegmentCall(String appId, String segmentId, final ApiC Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -2468,7 +2468,7 @@ public okhttp3.Call deleteSubscriptionCall(String appId, String subscriptionId, Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -2617,7 +2617,7 @@ public okhttp3.Call deleteTemplateCall(String templateId, String appId, final Ap Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -2772,7 +2772,7 @@ public okhttp3.Call deleteUserCall(String appId, String aliasLabel, String alias Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -2927,7 +2927,7 @@ public okhttp3.Call exportEventsCall(String notificationId, String appId, final Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -3081,7 +3081,7 @@ public okhttp3.Call exportSubscriptionsCall(String appId, ExportSubscriptionsReq Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -3227,7 +3227,7 @@ public okhttp3.Call getAliasesCall(String appId, String aliasLabel, String alias Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -3386,7 +3386,7 @@ public okhttp3.Call getAliasesBySubscriptionCall(String appId, String subscripti Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -3532,7 +3532,7 @@ public okhttp3.Call getAppCall(String appId, final ApiCallback _callback) throws Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -3668,7 +3668,7 @@ public okhttp3.Call getAppsCall(final ApiCallback _callback) throws ApiException Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -3800,7 +3800,7 @@ public okhttp3.Call getNotificationCall(String appId, String notificationId, fin Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -3955,7 +3955,7 @@ public okhttp3.Call getNotificationHistoryCall(String notificationId, GetNotific Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -4106,7 +4106,7 @@ public okhttp3.Call getNotificationsCall(String appId, Integer limit, Integer of Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -4274,7 +4274,7 @@ public okhttp3.Call getOutcomesCall(String appId, String outcomeNames, String ou Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (outcomeNames != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("outcome_names", outcomeNames)); @@ -4454,7 +4454,7 @@ public okhttp3.Call getSegmentsCall(String appId, Integer offset, Integer limit, Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (offset != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("offset", offset)); @@ -4611,7 +4611,7 @@ public okhttp3.Call getUserCall(String appId, String aliasLabel, String aliasId, Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -4769,7 +4769,7 @@ public okhttp3.Call rotateApiKeyCall(String appId, String tokenId, final ApiCall Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -4915,7 +4915,7 @@ public okhttp3.Call startLiveActivityCall(String appId, String activityType, Sta Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -5074,7 +5074,7 @@ public okhttp3.Call transferSubscriptionCall(String appId, String subscriptionId Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -5237,7 +5237,7 @@ public okhttp3.Call unsubscribeEmailWithTokenCall(String appId, String notificat Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (token != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("token", token)); @@ -5397,7 +5397,7 @@ public okhttp3.Call updateApiKeyCall(String appId, String tokenId, UpdateApiKeyR Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -5549,7 +5549,7 @@ public okhttp3.Call updateAppCall(String appId, App app, final ApiCallback _call Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -5698,7 +5698,7 @@ public okhttp3.Call updateLiveActivityCall(String appId, String activityId, Upda Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -5857,7 +5857,7 @@ public okhttp3.Call updateSubscriptionCall(String appId, String subscriptionId, Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -6018,7 +6018,7 @@ public okhttp3.Call updateSubscriptionByTokenCall(String appId, String tokenType Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -6181,7 +6181,7 @@ public okhttp3.Call updateTemplateCall(String templateId, String appId, UpdateTe Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -6342,7 +6342,7 @@ public okhttp3.Call updateUserCall(String appId, String aliasLabel, String alias Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -6506,7 +6506,7 @@ public okhttp3.Call viewApiKeysCall(String appId, final ApiCallback _callback) t Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); final String[] localVarAccepts = { "application/json" @@ -6642,7 +6642,7 @@ public okhttp3.Call viewTemplateCall(String templateId, String appId, final ApiC Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); @@ -6794,7 +6794,7 @@ public okhttp3.Call viewTemplatesCall(String appId, Integer limit, Integer offse Map localVarFormParams = new HashMap(); // Adds client sdk version header - localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0-beta1"); + localVarHeaderParams.put("OS-Usage-Data", "kind=sdk, sdk-name=onesignal-java, version=5.3.0"); if (appId != null) { localVarQueryParams.addAll(localVarApiClient.parameterToPair("app_id", appId)); diff --git a/src/main/java/com/onesignal/client/model/BasicNotification.java b/src/main/java/com/onesignal/client/model/BasicNotification.java index 86650ae..f91302c 100644 --- a/src/main/java/com/onesignal/client/model/BasicNotification.java +++ b/src/main/java/com/onesignal/client/model/BasicNotification.java @@ -565,6 +565,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_EMAIL_FROM_ADDRESS) private String emailFromAddress; + public static final String SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS = "email_reply_to_address"; + @SerializedName(SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS) + private String emailReplyToAddress; + public static final String SERIALIZED_NAME_EMAIL_PREHEADER = "email_preheader"; @SerializedName(SERIALIZED_NAME_EMAIL_PREHEADER) private String emailPreheader; @@ -593,6 +597,93 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_CUSTOM_DATA) private Object customData; + public static final String SERIALIZED_NAME_HUAWEI_BADGE_CLASS = "huawei_badge_class"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_CLASS) + private String huaweiBadgeClass; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM = "huawei_badge_add_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM) + private Integer huaweiBadgeAddNum; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM = "huawei_badge_set_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM) + private Integer huaweiBadgeSetNum; + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + */ + @JsonAdapter(HuaweiCategoryEnum.Adapter.class) + public enum HuaweiCategoryEnum { + IM("IM"), + + VOIP("VOIP"), + + SUBSCRIPTION("SUBSCRIPTION"), + + TRAVEL("TRAVEL"), + + HEALTH("HEALTH"), + + WORK("WORK"), + + ACCOUNT("ACCOUNT"), + + EXPRESS("EXPRESS"), + + FINANCE("FINANCE"), + + DEVICE_REMINDER("DEVICE_REMINDER"), + + MAIL("MAIL"), + + MARKETING("MARKETING"); + + private String value; + + HuaweiCategoryEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static HuaweiCategoryEnum fromValue(String value) { + for (HuaweiCategoryEnum b : HuaweiCategoryEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + return null; + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final HuaweiCategoryEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public HuaweiCategoryEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return HuaweiCategoryEnum.fromValue(value); + } + } + } + + public static final String SERIALIZED_NAME_HUAWEI_CATEGORY = "huawei_category"; + @SerializedName(SERIALIZED_NAME_HUAWEI_CATEGORY) + private HuaweiCategoryEnum huaweiCategory; + + public static final String SERIALIZED_NAME_HUAWEI_BI_TAG = "huawei_bi_tag"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BI_TAG) + private String huaweiBiTag; + public BasicNotification() { } @@ -3025,6 +3116,29 @@ public void setEmailFromAddress(String emailFromAddress) { } + public BasicNotification emailReplyToAddress(String emailReplyToAddress) { + + this.emailReplyToAddress = emailReplyToAddress; + return this; + } + + /** + * Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. + * @return emailReplyToAddress + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. ") + + public String getEmailReplyToAddress() { + return emailReplyToAddress; + } + + + public void setEmailReplyToAddress(String emailReplyToAddress) { + this.emailReplyToAddress = emailReplyToAddress; + } + + public BasicNotification emailPreheader(String emailPreheader) { this.emailPreheader = emailPreheader; @@ -3202,6 +3316,121 @@ public void setCustomData(Object customData) { } + public BasicNotification huaweiBadgeClass(String huaweiBadgeClass) { + + this.huaweiBadgeClass = huaweiBadgeClass; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Full path of the app entry activity class + * @return huaweiBadgeClass + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Full path of the app entry activity class") + + public String getHuaweiBadgeClass() { + return huaweiBadgeClass; + } + + + public void setHuaweiBadgeClass(String huaweiBadgeClass) { + this.huaweiBadgeClass = huaweiBadgeClass; + } + + + public BasicNotification huaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 + * @return huaweiBadgeAddNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99") + + public Integer getHuaweiBadgeAddNum() { + return huaweiBadgeAddNum; + } + + + public void setHuaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + } + + + public BasicNotification huaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 + * @return huaweiBadgeSetNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99") + + public Integer getHuaweiBadgeSetNum() { + return huaweiBadgeSetNum; + } + + + public void setHuaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + } + + + public BasicNotification huaweiCategory(HuaweiCategoryEnum huaweiCategory) { + + this.huaweiCategory = huaweiCategory; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + * @return huaweiCategory + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification.") + + public HuaweiCategoryEnum getHuaweiCategory() { + return huaweiCategory; + } + + + public void setHuaweiCategory(HuaweiCategoryEnum huaweiCategory) { + this.huaweiCategory = huaweiCategory; + } + + + public BasicNotification huaweiBiTag(String huaweiBiTag) { + + this.huaweiBiTag = huaweiBiTag; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. + * @return huaweiBiTag + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics.") + + public String getHuaweiBiTag() { + return huaweiBiTag; + } + + + public void setHuaweiBiTag(String huaweiBiTag) { + this.huaweiBiTag = huaweiBiTag; + } + + @Override public boolean equals(Object o) { @@ -3313,13 +3542,19 @@ public boolean equals(Object o) { Objects.equals(this.emailBody, basicNotification.emailBody) && Objects.equals(this.emailFromName, basicNotification.emailFromName) && Objects.equals(this.emailFromAddress, basicNotification.emailFromAddress) && + Objects.equals(this.emailReplyToAddress, basicNotification.emailReplyToAddress) && Objects.equals(this.emailPreheader, basicNotification.emailPreheader) && Objects.equals(this.disableEmailClickTracking, basicNotification.disableEmailClickTracking) && Objects.equals(this.includeUnsubscribed, basicNotification.includeUnsubscribed) && Objects.equals(this.smsFrom, basicNotification.smsFrom) && Objects.equals(this.smsMediaUrls, basicNotification.smsMediaUrls) && Objects.equals(this.filters, basicNotification.filters) && - Objects.equals(this.customData, basicNotification.customData); + Objects.equals(this.customData, basicNotification.customData) && + Objects.equals(this.huaweiBadgeClass, basicNotification.huaweiBadgeClass) && + Objects.equals(this.huaweiBadgeAddNum, basicNotification.huaweiBadgeAddNum) && + Objects.equals(this.huaweiBadgeSetNum, basicNotification.huaweiBadgeSetNum) && + Objects.equals(this.huaweiCategory, basicNotification.huaweiCategory) && + Objects.equals(this.huaweiBiTag, basicNotification.huaweiBiTag); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -3328,7 +3563,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData); + return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag); } private static int hashCodeNullable(JsonNullable a) { @@ -3443,6 +3678,7 @@ public String toString() { sb.append(" emailBody: ").append(toIndentedString(emailBody)).append("\n"); sb.append(" emailFromName: ").append(toIndentedString(emailFromName)).append("\n"); sb.append(" emailFromAddress: ").append(toIndentedString(emailFromAddress)).append("\n"); + sb.append(" emailReplyToAddress: ").append(toIndentedString(emailReplyToAddress)).append("\n"); sb.append(" emailPreheader: ").append(toIndentedString(emailPreheader)).append("\n"); sb.append(" disableEmailClickTracking: ").append(toIndentedString(disableEmailClickTracking)).append("\n"); sb.append(" includeUnsubscribed: ").append(toIndentedString(includeUnsubscribed)).append("\n"); @@ -3450,6 +3686,11 @@ public String toString() { sb.append(" smsMediaUrls: ").append(toIndentedString(smsMediaUrls)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" customData: ").append(toIndentedString(customData)).append("\n"); + sb.append(" huaweiBadgeClass: ").append(toIndentedString(huaweiBadgeClass)).append("\n"); + sb.append(" huaweiBadgeAddNum: ").append(toIndentedString(huaweiBadgeAddNum)).append("\n"); + sb.append(" huaweiBadgeSetNum: ").append(toIndentedString(huaweiBadgeSetNum)).append("\n"); + sb.append(" huaweiCategory: ").append(toIndentedString(huaweiCategory)).append("\n"); + sb.append(" huaweiBiTag: ").append(toIndentedString(huaweiBiTag)).append("\n"); sb.append("}"); return sb.toString(); } @@ -3573,6 +3814,7 @@ private String toIndentedString(Object o) { openapiFields.add("email_body"); openapiFields.add("email_from_name"); openapiFields.add("email_from_address"); + openapiFields.add("email_reply_to_address"); openapiFields.add("email_preheader"); openapiFields.add("disable_email_click_tracking"); openapiFields.add("include_unsubscribed"); @@ -3580,6 +3822,11 @@ private String toIndentedString(Object o) { openapiFields.add("sms_media_urls"); openapiFields.add("filters"); openapiFields.add("custom_data"); + openapiFields.add("huawei_badge_class"); + openapiFields.add("huawei_badge_add_num"); + openapiFields.add("huawei_badge_set_num"); + openapiFields.add("huawei_category"); + openapiFields.add("huawei_bi_tag"); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(); diff --git a/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java b/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java index 6c0c35e..6070669 100644 --- a/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java +++ b/src/main/java/com/onesignal/client/model/BasicNotificationAllOf.java @@ -460,6 +460,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_EMAIL_FROM_ADDRESS) private String emailFromAddress; + public static final String SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS = "email_reply_to_address"; + @SerializedName(SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS) + private String emailReplyToAddress; + public static final String SERIALIZED_NAME_EMAIL_PREHEADER = "email_preheader"; @SerializedName(SERIALIZED_NAME_EMAIL_PREHEADER) private String emailPreheader; @@ -488,6 +492,93 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_CUSTOM_DATA) private Object customData; + public static final String SERIALIZED_NAME_HUAWEI_BADGE_CLASS = "huawei_badge_class"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_CLASS) + private String huaweiBadgeClass; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM = "huawei_badge_add_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM) + private Integer huaweiBadgeAddNum; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM = "huawei_badge_set_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM) + private Integer huaweiBadgeSetNum; + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + */ + @JsonAdapter(HuaweiCategoryEnum.Adapter.class) + public enum HuaweiCategoryEnum { + IM("IM"), + + VOIP("VOIP"), + + SUBSCRIPTION("SUBSCRIPTION"), + + TRAVEL("TRAVEL"), + + HEALTH("HEALTH"), + + WORK("WORK"), + + ACCOUNT("ACCOUNT"), + + EXPRESS("EXPRESS"), + + FINANCE("FINANCE"), + + DEVICE_REMINDER("DEVICE_REMINDER"), + + MAIL("MAIL"), + + MARKETING("MARKETING"); + + private String value; + + HuaweiCategoryEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static HuaweiCategoryEnum fromValue(String value) { + for (HuaweiCategoryEnum b : HuaweiCategoryEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + return null; + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final HuaweiCategoryEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public HuaweiCategoryEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return HuaweiCategoryEnum.fromValue(value); + } + } + } + + public static final String SERIALIZED_NAME_HUAWEI_CATEGORY = "huawei_category"; + @SerializedName(SERIALIZED_NAME_HUAWEI_CATEGORY) + private HuaweiCategoryEnum huaweiCategory; + + public static final String SERIALIZED_NAME_HUAWEI_BI_TAG = "huawei_bi_tag"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BI_TAG) + private String huaweiBiTag; + public BasicNotificationAllOf() { } @@ -2525,6 +2616,29 @@ public void setEmailFromAddress(String emailFromAddress) { } + public BasicNotificationAllOf emailReplyToAddress(String emailReplyToAddress) { + + this.emailReplyToAddress = emailReplyToAddress; + return this; + } + + /** + * Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. + * @return emailReplyToAddress + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. ") + + public String getEmailReplyToAddress() { + return emailReplyToAddress; + } + + + public void setEmailReplyToAddress(String emailReplyToAddress) { + this.emailReplyToAddress = emailReplyToAddress; + } + + public BasicNotificationAllOf emailPreheader(String emailPreheader) { this.emailPreheader = emailPreheader; @@ -2702,6 +2816,121 @@ public void setCustomData(Object customData) { } + public BasicNotificationAllOf huaweiBadgeClass(String huaweiBadgeClass) { + + this.huaweiBadgeClass = huaweiBadgeClass; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Full path of the app entry activity class + * @return huaweiBadgeClass + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Full path of the app entry activity class") + + public String getHuaweiBadgeClass() { + return huaweiBadgeClass; + } + + + public void setHuaweiBadgeClass(String huaweiBadgeClass) { + this.huaweiBadgeClass = huaweiBadgeClass; + } + + + public BasicNotificationAllOf huaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 + * @return huaweiBadgeAddNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99") + + public Integer getHuaweiBadgeAddNum() { + return huaweiBadgeAddNum; + } + + + public void setHuaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + } + + + public BasicNotificationAllOf huaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 + * @return huaweiBadgeSetNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99") + + public Integer getHuaweiBadgeSetNum() { + return huaweiBadgeSetNum; + } + + + public void setHuaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + } + + + public BasicNotificationAllOf huaweiCategory(HuaweiCategoryEnum huaweiCategory) { + + this.huaweiCategory = huaweiCategory; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + * @return huaweiCategory + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification.") + + public HuaweiCategoryEnum getHuaweiCategory() { + return huaweiCategory; + } + + + public void setHuaweiCategory(HuaweiCategoryEnum huaweiCategory) { + this.huaweiCategory = huaweiCategory; + } + + + public BasicNotificationAllOf huaweiBiTag(String huaweiBiTag) { + + this.huaweiBiTag = huaweiBiTag; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. + * @return huaweiBiTag + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics.") + + public String getHuaweiBiTag() { + return huaweiBiTag; + } + + + public void setHuaweiBiTag(String huaweiBiTag) { + this.huaweiBiTag = huaweiBiTag; + } + + @Override public boolean equals(Object o) { @@ -2800,13 +3029,19 @@ public boolean equals(Object o) { Objects.equals(this.emailBody, basicNotificationAllOf.emailBody) && Objects.equals(this.emailFromName, basicNotificationAllOf.emailFromName) && Objects.equals(this.emailFromAddress, basicNotificationAllOf.emailFromAddress) && + Objects.equals(this.emailReplyToAddress, basicNotificationAllOf.emailReplyToAddress) && Objects.equals(this.emailPreheader, basicNotificationAllOf.emailPreheader) && Objects.equals(this.disableEmailClickTracking, basicNotificationAllOf.disableEmailClickTracking) && Objects.equals(this.includeUnsubscribed, basicNotificationAllOf.includeUnsubscribed) && Objects.equals(this.smsFrom, basicNotificationAllOf.smsFrom) && Objects.equals(this.smsMediaUrls, basicNotificationAllOf.smsMediaUrls) && Objects.equals(this.filters, basicNotificationAllOf.filters) && - Objects.equals(this.customData, basicNotificationAllOf.customData); + Objects.equals(this.customData, basicNotificationAllOf.customData) && + Objects.equals(this.huaweiBadgeClass, basicNotificationAllOf.huaweiBadgeClass) && + Objects.equals(this.huaweiBadgeAddNum, basicNotificationAllOf.huaweiBadgeAddNum) && + Objects.equals(this.huaweiBadgeSetNum, basicNotificationAllOf.huaweiBadgeSetNum) && + Objects.equals(this.huaweiCategory, basicNotificationAllOf.huaweiCategory) && + Objects.equals(this.huaweiBiTag, basicNotificationAllOf.huaweiBiTag); } private static boolean equalsNullable(JsonNullable a, JsonNullable b) { @@ -2815,7 +3050,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData); + return Objects.hash(id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag); } private static int hashCodeNullable(JsonNullable a) { @@ -2917,6 +3152,7 @@ public String toString() { sb.append(" emailBody: ").append(toIndentedString(emailBody)).append("\n"); sb.append(" emailFromName: ").append(toIndentedString(emailFromName)).append("\n"); sb.append(" emailFromAddress: ").append(toIndentedString(emailFromAddress)).append("\n"); + sb.append(" emailReplyToAddress: ").append(toIndentedString(emailReplyToAddress)).append("\n"); sb.append(" emailPreheader: ").append(toIndentedString(emailPreheader)).append("\n"); sb.append(" disableEmailClickTracking: ").append(toIndentedString(disableEmailClickTracking)).append("\n"); sb.append(" includeUnsubscribed: ").append(toIndentedString(includeUnsubscribed)).append("\n"); @@ -2924,6 +3160,11 @@ public String toString() { sb.append(" smsMediaUrls: ").append(toIndentedString(smsMediaUrls)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" customData: ").append(toIndentedString(customData)).append("\n"); + sb.append(" huaweiBadgeClass: ").append(toIndentedString(huaweiBadgeClass)).append("\n"); + sb.append(" huaweiBadgeAddNum: ").append(toIndentedString(huaweiBadgeAddNum)).append("\n"); + sb.append(" huaweiBadgeSetNum: ").append(toIndentedString(huaweiBadgeSetNum)).append("\n"); + sb.append(" huaweiCategory: ").append(toIndentedString(huaweiCategory)).append("\n"); + sb.append(" huaweiBiTag: ").append(toIndentedString(huaweiBiTag)).append("\n"); sb.append("}"); return sb.toString(); } @@ -3034,6 +3275,7 @@ private String toIndentedString(Object o) { openapiFields.add("email_body"); openapiFields.add("email_from_name"); openapiFields.add("email_from_address"); + openapiFields.add("email_reply_to_address"); openapiFields.add("email_preheader"); openapiFields.add("disable_email_click_tracking"); openapiFields.add("include_unsubscribed"); @@ -3041,6 +3283,11 @@ private String toIndentedString(Object o) { openapiFields.add("sms_media_urls"); openapiFields.add("filters"); openapiFields.add("custom_data"); + openapiFields.add("huawei_badge_class"); + openapiFields.add("huawei_badge_add_num"); + openapiFields.add("huawei_badge_set_num"); + openapiFields.add("huawei_category"); + openapiFields.add("huawei_bi_tag"); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet(); diff --git a/src/main/java/com/onesignal/client/model/Notification.java b/src/main/java/com/onesignal/client/model/Notification.java index 780f8ec..1804304 100644 --- a/src/main/java/com/onesignal/client/model/Notification.java +++ b/src/main/java/com/onesignal/client/model/Notification.java @@ -566,6 +566,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_EMAIL_FROM_ADDRESS) private String emailFromAddress; + public static final String SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS = "email_reply_to_address"; + @SerializedName(SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS) + private String emailReplyToAddress; + public static final String SERIALIZED_NAME_EMAIL_PREHEADER = "email_preheader"; @SerializedName(SERIALIZED_NAME_EMAIL_PREHEADER) private String emailPreheader; @@ -594,6 +598,93 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_CUSTOM_DATA) private Object customData; + public static final String SERIALIZED_NAME_HUAWEI_BADGE_CLASS = "huawei_badge_class"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_CLASS) + private String huaweiBadgeClass; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM = "huawei_badge_add_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM) + private Integer huaweiBadgeAddNum; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM = "huawei_badge_set_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM) + private Integer huaweiBadgeSetNum; + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + */ + @JsonAdapter(HuaweiCategoryEnum.Adapter.class) + public enum HuaweiCategoryEnum { + IM("IM"), + + VOIP("VOIP"), + + SUBSCRIPTION("SUBSCRIPTION"), + + TRAVEL("TRAVEL"), + + HEALTH("HEALTH"), + + WORK("WORK"), + + ACCOUNT("ACCOUNT"), + + EXPRESS("EXPRESS"), + + FINANCE("FINANCE"), + + DEVICE_REMINDER("DEVICE_REMINDER"), + + MAIL("MAIL"), + + MARKETING("MARKETING"); + + private String value; + + HuaweiCategoryEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static HuaweiCategoryEnum fromValue(String value) { + for (HuaweiCategoryEnum b : HuaweiCategoryEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + return null; + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final HuaweiCategoryEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public HuaweiCategoryEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return HuaweiCategoryEnum.fromValue(value); + } + } + } + + public static final String SERIALIZED_NAME_HUAWEI_CATEGORY = "huawei_category"; + @SerializedName(SERIALIZED_NAME_HUAWEI_CATEGORY) + private HuaweiCategoryEnum huaweiCategory; + + public static final String SERIALIZED_NAME_HUAWEI_BI_TAG = "huawei_bi_tag"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BI_TAG) + private String huaweiBiTag; + public static final String SERIALIZED_NAME_SEND_AFTER = "send_after"; @SerializedName(SERIALIZED_NAME_SEND_AFTER) private OffsetDateTime sendAfter; @@ -3030,6 +3121,29 @@ public void setEmailFromAddress(String emailFromAddress) { } + public Notification emailReplyToAddress(String emailReplyToAddress) { + + this.emailReplyToAddress = emailReplyToAddress; + return this; + } + + /** + * Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. + * @return emailReplyToAddress + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. ") + + public String getEmailReplyToAddress() { + return emailReplyToAddress; + } + + + public void setEmailReplyToAddress(String emailReplyToAddress) { + this.emailReplyToAddress = emailReplyToAddress; + } + + public Notification emailPreheader(String emailPreheader) { this.emailPreheader = emailPreheader; @@ -3207,6 +3321,121 @@ public void setCustomData(Object customData) { } + public Notification huaweiBadgeClass(String huaweiBadgeClass) { + + this.huaweiBadgeClass = huaweiBadgeClass; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Full path of the app entry activity class + * @return huaweiBadgeClass + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Full path of the app entry activity class") + + public String getHuaweiBadgeClass() { + return huaweiBadgeClass; + } + + + public void setHuaweiBadgeClass(String huaweiBadgeClass) { + this.huaweiBadgeClass = huaweiBadgeClass; + } + + + public Notification huaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 + * @return huaweiBadgeAddNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99") + + public Integer getHuaweiBadgeAddNum() { + return huaweiBadgeAddNum; + } + + + public void setHuaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + } + + + public Notification huaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 + * @return huaweiBadgeSetNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99") + + public Integer getHuaweiBadgeSetNum() { + return huaweiBadgeSetNum; + } + + + public void setHuaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + } + + + public Notification huaweiCategory(HuaweiCategoryEnum huaweiCategory) { + + this.huaweiCategory = huaweiCategory; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + * @return huaweiCategory + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification.") + + public HuaweiCategoryEnum getHuaweiCategory() { + return huaweiCategory; + } + + + public void setHuaweiCategory(HuaweiCategoryEnum huaweiCategory) { + this.huaweiCategory = huaweiCategory; + } + + + public Notification huaweiBiTag(String huaweiBiTag) { + + this.huaweiBiTag = huaweiBiTag; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. + * @return huaweiBiTag + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics.") + + public String getHuaweiBiTag() { + return huaweiBiTag; + } + + + public void setHuaweiBiTag(String huaweiBiTag) { + this.huaweiBiTag = huaweiBiTag; + } + + public Notification sendAfter(OffsetDateTime sendAfter) { this.sendAfter = sendAfter; @@ -3341,6 +3570,7 @@ public boolean equals(Object o) { Objects.equals(this.emailBody, notification.emailBody) && Objects.equals(this.emailFromName, notification.emailFromName) && Objects.equals(this.emailFromAddress, notification.emailFromAddress) && + Objects.equals(this.emailReplyToAddress, notification.emailReplyToAddress) && Objects.equals(this.emailPreheader, notification.emailPreheader) && Objects.equals(this.disableEmailClickTracking, notification.disableEmailClickTracking) && Objects.equals(this.includeUnsubscribed, notification.includeUnsubscribed) && @@ -3348,6 +3578,11 @@ public boolean equals(Object o) { Objects.equals(this.smsMediaUrls, notification.smsMediaUrls) && Objects.equals(this.filters, notification.filters) && Objects.equals(this.customData, notification.customData) && + Objects.equals(this.huaweiBadgeClass, notification.huaweiBadgeClass) && + Objects.equals(this.huaweiBadgeAddNum, notification.huaweiBadgeAddNum) && + Objects.equals(this.huaweiBadgeSetNum, notification.huaweiBadgeSetNum) && + Objects.equals(this.huaweiCategory, notification.huaweiCategory) && + Objects.equals(this.huaweiBiTag, notification.huaweiBiTag) && Objects.equals(this.sendAfter, notification.sendAfter); } @@ -3357,7 +3592,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData, sendAfter); + return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag, sendAfter); } private static int hashCodeNullable(JsonNullable a) { @@ -3472,6 +3707,7 @@ public String toString() { sb.append(" emailBody: ").append(toIndentedString(emailBody)).append("\n"); sb.append(" emailFromName: ").append(toIndentedString(emailFromName)).append("\n"); sb.append(" emailFromAddress: ").append(toIndentedString(emailFromAddress)).append("\n"); + sb.append(" emailReplyToAddress: ").append(toIndentedString(emailReplyToAddress)).append("\n"); sb.append(" emailPreheader: ").append(toIndentedString(emailPreheader)).append("\n"); sb.append(" disableEmailClickTracking: ").append(toIndentedString(disableEmailClickTracking)).append("\n"); sb.append(" includeUnsubscribed: ").append(toIndentedString(includeUnsubscribed)).append("\n"); @@ -3479,6 +3715,11 @@ public String toString() { sb.append(" smsMediaUrls: ").append(toIndentedString(smsMediaUrls)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" customData: ").append(toIndentedString(customData)).append("\n"); + sb.append(" huaweiBadgeClass: ").append(toIndentedString(huaweiBadgeClass)).append("\n"); + sb.append(" huaweiBadgeAddNum: ").append(toIndentedString(huaweiBadgeAddNum)).append("\n"); + sb.append(" huaweiBadgeSetNum: ").append(toIndentedString(huaweiBadgeSetNum)).append("\n"); + sb.append(" huaweiCategory: ").append(toIndentedString(huaweiCategory)).append("\n"); + sb.append(" huaweiBiTag: ").append(toIndentedString(huaweiBiTag)).append("\n"); sb.append(" sendAfter: ").append(toIndentedString(sendAfter)).append("\n"); sb.append("}"); return sb.toString(); @@ -3603,6 +3844,7 @@ private String toIndentedString(Object o) { openapiFields.add("email_body"); openapiFields.add("email_from_name"); openapiFields.add("email_from_address"); + openapiFields.add("email_reply_to_address"); openapiFields.add("email_preheader"); openapiFields.add("disable_email_click_tracking"); openapiFields.add("include_unsubscribed"); @@ -3610,6 +3852,11 @@ private String toIndentedString(Object o) { openapiFields.add("sms_media_urls"); openapiFields.add("filters"); openapiFields.add("custom_data"); + openapiFields.add("huawei_badge_class"); + openapiFields.add("huawei_badge_add_num"); + openapiFields.add("huawei_badge_set_num"); + openapiFields.add("huawei_category"); + openapiFields.add("huawei_bi_tag"); openapiFields.add("send_after"); // a set of required properties/fields (JSON key names) diff --git a/src/main/java/com/onesignal/client/model/NotificationWithMeta.java b/src/main/java/com/onesignal/client/model/NotificationWithMeta.java index 94a2bf8..20cf4de 100644 --- a/src/main/java/com/onesignal/client/model/NotificationWithMeta.java +++ b/src/main/java/com/onesignal/client/model/NotificationWithMeta.java @@ -569,6 +569,10 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_EMAIL_FROM_ADDRESS) private String emailFromAddress; + public static final String SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS = "email_reply_to_address"; + @SerializedName(SERIALIZED_NAME_EMAIL_REPLY_TO_ADDRESS) + private String emailReplyToAddress; + public static final String SERIALIZED_NAME_EMAIL_PREHEADER = "email_preheader"; @SerializedName(SERIALIZED_NAME_EMAIL_PREHEADER) private String emailPreheader; @@ -597,6 +601,93 @@ public AggregationEnum read(final JsonReader jsonReader) throws IOException { @SerializedName(SERIALIZED_NAME_CUSTOM_DATA) private Object customData; + public static final String SERIALIZED_NAME_HUAWEI_BADGE_CLASS = "huawei_badge_class"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_CLASS) + private String huaweiBadgeClass; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM = "huawei_badge_add_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_ADD_NUM) + private Integer huaweiBadgeAddNum; + + public static final String SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM = "huawei_badge_set_num"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BADGE_SET_NUM) + private Integer huaweiBadgeSetNum; + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + */ + @JsonAdapter(HuaweiCategoryEnum.Adapter.class) + public enum HuaweiCategoryEnum { + IM("IM"), + + VOIP("VOIP"), + + SUBSCRIPTION("SUBSCRIPTION"), + + TRAVEL("TRAVEL"), + + HEALTH("HEALTH"), + + WORK("WORK"), + + ACCOUNT("ACCOUNT"), + + EXPRESS("EXPRESS"), + + FINANCE("FINANCE"), + + DEVICE_REMINDER("DEVICE_REMINDER"), + + MAIL("MAIL"), + + MARKETING("MARKETING"); + + private String value; + + HuaweiCategoryEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static HuaweiCategoryEnum fromValue(String value) { + for (HuaweiCategoryEnum b : HuaweiCategoryEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + return null; + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final HuaweiCategoryEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public HuaweiCategoryEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return HuaweiCategoryEnum.fromValue(value); + } + } + } + + public static final String SERIALIZED_NAME_HUAWEI_CATEGORY = "huawei_category"; + @SerializedName(SERIALIZED_NAME_HUAWEI_CATEGORY) + private HuaweiCategoryEnum huaweiCategory; + + public static final String SERIALIZED_NAME_HUAWEI_BI_TAG = "huawei_bi_tag"; + @SerializedName(SERIALIZED_NAME_HUAWEI_BI_TAG) + private String huaweiBiTag; + public static final String SERIALIZED_NAME_SUCCESSFUL = "successful"; @SerializedName(SERIALIZED_NAME_SUCCESSFUL) private Integer successful; @@ -3077,6 +3168,29 @@ public void setEmailFromAddress(String emailFromAddress) { } + public NotificationWithMeta emailReplyToAddress(String emailReplyToAddress) { + + this.emailReplyToAddress = emailReplyToAddress; + return this; + } + + /** + * Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. + * @return emailReplyToAddress + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Email The email address where replies should be sent. If not specified, replies will go to the from address. ") + + public String getEmailReplyToAddress() { + return emailReplyToAddress; + } + + + public void setEmailReplyToAddress(String emailReplyToAddress) { + this.emailReplyToAddress = emailReplyToAddress; + } + + public NotificationWithMeta emailPreheader(String emailPreheader) { this.emailPreheader = emailPreheader; @@ -3254,6 +3368,121 @@ public void setCustomData(Object customData) { } + public NotificationWithMeta huaweiBadgeClass(String huaweiBadgeClass) { + + this.huaweiBadgeClass = huaweiBadgeClass; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Full path of the app entry activity class + * @return huaweiBadgeClass + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Full path of the app entry activity class") + + public String getHuaweiBadgeClass() { + return huaweiBadgeClass; + } + + + public void setHuaweiBadgeClass(String huaweiBadgeClass) { + this.huaweiBadgeClass = huaweiBadgeClass; + } + + + public NotificationWithMeta huaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99 + * @return huaweiBadgeAddNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Accumulative badge number, which is an integer ranging from 1 to 99") + + public Integer getHuaweiBadgeAddNum() { + return huaweiBadgeAddNum; + } + + + public void setHuaweiBadgeAddNum(Integer huaweiBadgeAddNum) { + this.huaweiBadgeAddNum = huaweiBadgeAddNum; + } + + + public NotificationWithMeta huaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99 + * @return huaweiBadgeSetNum + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Badge number, which is an integer ranging from 0 to 99") + + public Integer getHuaweiBadgeSetNum() { + return huaweiBadgeSetNum; + } + + + public void setHuaweiBadgeSetNum(Integer huaweiBadgeSetNum) { + this.huaweiBadgeSetNum = huaweiBadgeSetNum; + } + + + public NotificationWithMeta huaweiCategory(HuaweiCategoryEnum huaweiCategory) { + + this.huaweiCategory = huaweiCategory; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification. + * @return huaweiCategory + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei Category of the push notification for HMS classification.") + + public HuaweiCategoryEnum getHuaweiCategory() { + return huaweiCategory; + } + + + public void setHuaweiCategory(HuaweiCategoryEnum huaweiCategory) { + this.huaweiCategory = huaweiCategory; + } + + + public NotificationWithMeta huaweiBiTag(String huaweiBiTag) { + + this.huaweiBiTag = huaweiBiTag; + return this; + } + + /** + * Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics. + * @return huaweiBiTag + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "Channel: Push Notifications Platform: Huawei A tag used for Huawei business intelligence and analytics.") + + public String getHuaweiBiTag() { + return huaweiBiTag; + } + + + public void setHuaweiBiTag(String huaweiBiTag) { + this.huaweiBiTag = huaweiBiTag; + } + + public NotificationWithMeta successful(Integer successful) { this.successful = successful; @@ -3649,6 +3878,7 @@ public boolean equals(Object o) { Objects.equals(this.emailBody, notificationWithMeta.emailBody) && Objects.equals(this.emailFromName, notificationWithMeta.emailFromName) && Objects.equals(this.emailFromAddress, notificationWithMeta.emailFromAddress) && + Objects.equals(this.emailReplyToAddress, notificationWithMeta.emailReplyToAddress) && Objects.equals(this.emailPreheader, notificationWithMeta.emailPreheader) && Objects.equals(this.disableEmailClickTracking, notificationWithMeta.disableEmailClickTracking) && Objects.equals(this.includeUnsubscribed, notificationWithMeta.includeUnsubscribed) && @@ -3656,6 +3886,11 @@ public boolean equals(Object o) { Objects.equals(this.smsMediaUrls, notificationWithMeta.smsMediaUrls) && Objects.equals(this.filters, notificationWithMeta.filters) && Objects.equals(this.customData, notificationWithMeta.customData) && + Objects.equals(this.huaweiBadgeClass, notificationWithMeta.huaweiBadgeClass) && + Objects.equals(this.huaweiBadgeAddNum, notificationWithMeta.huaweiBadgeAddNum) && + Objects.equals(this.huaweiBadgeSetNum, notificationWithMeta.huaweiBadgeSetNum) && + Objects.equals(this.huaweiCategory, notificationWithMeta.huaweiCategory) && + Objects.equals(this.huaweiBiTag, notificationWithMeta.huaweiBiTag) && Objects.equals(this.successful, notificationWithMeta.successful) && Objects.equals(this.failed, notificationWithMeta.failed) && Objects.equals(this.errored, notificationWithMeta.errored) && @@ -3676,7 +3911,7 @@ private static boolean equalsNullable(JsonNullable a, JsonNullable b) @Override public int hashCode() { - return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData, successful, failed, errored, converted, received, outcomes, remaining, queuedAt, sendAfter, completedAt, platformDeliveryStats, canceled); + return Objects.hash(includedSegments, excludedSegments, includeSubscriptionIds, includeEmailTokens, includePhoneNumbers, includeIosTokens, includeWpWnsUris, includeAmazonRegIds, includeChromeRegIds, includeChromeWebRegIds, includeAndroidRegIds, includeAliases, targetChannel, id, value, name, aggregation, isIos, isAndroid, isHuawei, isAnyWeb, isChromeWeb, isFirefox, isSafari, isWPWNS, isAdm, isChrome, appId, externalId, idempotencyKey, contents, headings, subtitle, data, huaweiMsgType, url, webUrl, appUrl, iosAttachments, templateId, contentAvailable, mutableContent, targetContentIdentifier, bigPicture, huaweiBigPicture, admBigPicture, chromeBigPicture, chromeWebImage, buttons, webButtons, iosCategory, androidChannelId, huaweiChannelId, existingAndroidChannelId, huaweiExistingChannelId, androidBackgroundLayout, smallIcon, huaweiSmallIcon, largeIcon, huaweiLargeIcon, admSmallIcon, admLargeIcon, chromeWebIcon, chromeWebBadge, firefoxIcon, chromeIcon, iosSound, androidSound, huaweiSound, admSound, wpWnsSound, androidLedColor, huaweiLedColor, androidAccentColor, huaweiAccentColor, androidVisibility, huaweiVisibility, iosBadgeType, iosBadgeCount, collapseId, webPushTopic, apnsAlert, delayedOption, deliveryTimeOfDay, ttl, priority, apnsPushTypeOverride, throttleRatePerMinute, androidGroup, androidGroupMessage, admGroup, admGroupMessage, threadId, summaryArg, summaryArgCount, iosRelevanceScore, iosInterruptionLevel, emailSubject, emailBody, emailFromName, emailFromAddress, emailReplyToAddress, emailPreheader, disableEmailClickTracking, includeUnsubscribed, smsFrom, smsMediaUrls, filters, customData, huaweiBadgeClass, huaweiBadgeAddNum, huaweiBadgeSetNum, huaweiCategory, huaweiBiTag, successful, failed, errored, converted, received, outcomes, remaining, queuedAt, sendAfter, completedAt, platformDeliveryStats, canceled); } private static int hashCodeNullable(JsonNullable a) { @@ -3791,6 +4026,7 @@ public String toString() { sb.append(" emailBody: ").append(toIndentedString(emailBody)).append("\n"); sb.append(" emailFromName: ").append(toIndentedString(emailFromName)).append("\n"); sb.append(" emailFromAddress: ").append(toIndentedString(emailFromAddress)).append("\n"); + sb.append(" emailReplyToAddress: ").append(toIndentedString(emailReplyToAddress)).append("\n"); sb.append(" emailPreheader: ").append(toIndentedString(emailPreheader)).append("\n"); sb.append(" disableEmailClickTracking: ").append(toIndentedString(disableEmailClickTracking)).append("\n"); sb.append(" includeUnsubscribed: ").append(toIndentedString(includeUnsubscribed)).append("\n"); @@ -3798,6 +4034,11 @@ public String toString() { sb.append(" smsMediaUrls: ").append(toIndentedString(smsMediaUrls)).append("\n"); sb.append(" filters: ").append(toIndentedString(filters)).append("\n"); sb.append(" customData: ").append(toIndentedString(customData)).append("\n"); + sb.append(" huaweiBadgeClass: ").append(toIndentedString(huaweiBadgeClass)).append("\n"); + sb.append(" huaweiBadgeAddNum: ").append(toIndentedString(huaweiBadgeAddNum)).append("\n"); + sb.append(" huaweiBadgeSetNum: ").append(toIndentedString(huaweiBadgeSetNum)).append("\n"); + sb.append(" huaweiCategory: ").append(toIndentedString(huaweiCategory)).append("\n"); + sb.append(" huaweiBiTag: ").append(toIndentedString(huaweiBiTag)).append("\n"); sb.append(" successful: ").append(toIndentedString(successful)).append("\n"); sb.append(" failed: ").append(toIndentedString(failed)).append("\n"); sb.append(" errored: ").append(toIndentedString(errored)).append("\n"); @@ -3933,6 +4174,7 @@ private String toIndentedString(Object o) { openapiFields.add("email_body"); openapiFields.add("email_from_name"); openapiFields.add("email_from_address"); + openapiFields.add("email_reply_to_address"); openapiFields.add("email_preheader"); openapiFields.add("disable_email_click_tracking"); openapiFields.add("include_unsubscribed"); @@ -3940,6 +4182,11 @@ private String toIndentedString(Object o) { openapiFields.add("sms_media_urls"); openapiFields.add("filters"); openapiFields.add("custom_data"); + openapiFields.add("huawei_badge_class"); + openapiFields.add("huawei_badge_add_num"); + openapiFields.add("huawei_badge_set_num"); + openapiFields.add("huawei_category"); + openapiFields.add("huawei_bi_tag"); openapiFields.add("successful"); openapiFields.add("failed"); openapiFields.add("errored");