Skip to content

Commit 21fff2c

Browse files
Merge pull request #105 from square/release/30.0.1.20230608
Generated PR for Release: 30.0.1.20230608
2 parents 72b94b5 + d739569 commit 21fff2c

File tree

4 files changed

+49
-10
lines changed

4 files changed

+49
-10
lines changed

doc/models/catalog-object.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ For a more detailed discussion of the Catalog data model, please see the
4747
| `ItemOptionValueData` | [`CatalogItemOptionValue`](../../doc/models/catalog-item-option-value.md) | Optional | An enumerated value that can link a<br>`CatalogItemVariation` to an item option as one of<br>its item option values. | CatalogItemOptionValue getItemOptionValueData() |
4848
| `CustomAttributeDefinitionData` | [`CatalogCustomAttributeDefinition`](../../doc/models/catalog-custom-attribute-definition.md) | Optional | Contains information defining a custom attribute. Custom attributes are<br>intended to store additional information about a catalog object or to associate a<br>catalog object with an entity in another system. Do not use custom attributes<br>to store any sensitive information (personally identifiable information, card details, etc.).<br>[Read more about custom attributes](https://developer.squareup.com/docs/catalog-api/add-custom-attributes) | CatalogCustomAttributeDefinition getCustomAttributeDefinitionData() |
4949
| `QuickAmountsSettingsData` | [`CatalogQuickAmountsSettings`](../../doc/models/catalog-quick-amounts-settings.md) | Optional | A parent Catalog Object model represents a set of Quick Amounts and the settings control the amounts. | CatalogQuickAmountsSettings getQuickAmountsSettingsData() |
50+
| `SubscriptionPlanVariationData` | [`CatalogSubscriptionPlanVariation`](../../doc/models/catalog-subscription-plan-variation.md) | Optional | Describes a subscription plan variation. A subscription plan variation represents how the subscription for a product or service is sold.<br>For more information, see [Subscription Plans and Variations](https://developer.squareup.com/docs/subscriptions-api/plans-and-variations). | CatalogSubscriptionPlanVariation getSubscriptionPlanVariationData() |
5051

5152
## Example (as JSON)
5253

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.squareup</groupId>
55
<artifactId>square</artifactId>
6-
<version>30.0.0.20230608</version>
6+
<version>30.0.1.20230608</version>
77
<packaging>jar</packaging>
88
<name>Square</name>
99
<description>Java client library for the Square API</description>

src/main/java/com/squareup/square/SquareClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public final class SquareClient implements SquareClientInterface {
151151

152152
private static final CompatibilityFactory compatibilityFactory = new CompatibilityFactoryImpl();
153153

154-
private static String userAgent = "Square-Java-SDK/30.0.0.20230608 ({api-version}) {engine}/{engine-version} ({os-info}) {detail}";
154+
private static String userAgent = "Square-Java-SDK/30.0.1.20230608 ({api-version}) {engine}/{engine-version} ({os-info}) {detail}";
155155

156156
/**
157157
* Current API environment.
@@ -697,7 +697,7 @@ public String getAccessToken() {
697697
* @return sdkVersion
698698
*/
699699
public String getSdkVersion() {
700-
return "30.0.0.20230608";
700+
return "30.0.1.20230608";
701701
}
702702

703703
/**

src/main/java/com/squareup/square/models/CatalogObject.java

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class CatalogObject {
4343
private final CatalogItemOptionValue itemOptionValueData;
4444
private final CatalogCustomAttributeDefinition customAttributeDefinitionData;
4545
private final CatalogQuickAmountsSettings quickAmountsSettingsData;
46+
private final CatalogSubscriptionPlanVariation subscriptionPlanVariationData;
4647

4748
/**
4849
* Initialization constructor.
@@ -75,6 +76,8 @@ public class CatalogObject {
7576
* customAttributeDefinitionData.
7677
* @param quickAmountsSettingsData CatalogQuickAmountsSettings value for
7778
* quickAmountsSettingsData.
79+
* @param subscriptionPlanVariationData CatalogSubscriptionPlanVariation value for
80+
* subscriptionPlanVariationData.
7881
*/
7982
@JsonCreator
8083
public CatalogObject(
@@ -104,7 +107,8 @@ public CatalogObject(
104107
@JsonProperty("item_option_data") CatalogItemOption itemOptionData,
105108
@JsonProperty("item_option_value_data") CatalogItemOptionValue itemOptionValueData,
106109
@JsonProperty("custom_attribute_definition_data") CatalogCustomAttributeDefinition customAttributeDefinitionData,
107-
@JsonProperty("quick_amounts_settings_data") CatalogQuickAmountsSettings quickAmountsSettingsData) {
110+
@JsonProperty("quick_amounts_settings_data") CatalogQuickAmountsSettings quickAmountsSettingsData,
111+
@JsonProperty("subscription_plan_variation_data") CatalogSubscriptionPlanVariation subscriptionPlanVariationData) {
108112
this.type = type;
109113
this.id = id;
110114
this.updatedAt = updatedAt;
@@ -132,6 +136,7 @@ public CatalogObject(
132136
this.itemOptionValueData = itemOptionValueData;
133137
this.customAttributeDefinitionData = customAttributeDefinitionData;
134138
this.quickAmountsSettingsData = quickAmountsSettingsData;
139+
this.subscriptionPlanVariationData = subscriptionPlanVariationData;
135140
}
136141

137142
/**
@@ -152,7 +157,8 @@ protected CatalogObject(String type, String id, String updatedAt, Long version,
152157
CatalogSubscriptionPlan subscriptionPlanData, CatalogItemOption itemOptionData,
153158
CatalogItemOptionValue itemOptionValueData,
154159
CatalogCustomAttributeDefinition customAttributeDefinitionData,
155-
CatalogQuickAmountsSettings quickAmountsSettingsData) {
160+
CatalogQuickAmountsSettings quickAmountsSettingsData,
161+
CatalogSubscriptionPlanVariation subscriptionPlanVariationData) {
156162
this.type = type;
157163
this.id = id;
158164
this.updatedAt = updatedAt;
@@ -180,6 +186,7 @@ protected CatalogObject(String type, String id, String updatedAt, Long version,
180186
this.itemOptionValueData = itemOptionValueData;
181187
this.customAttributeDefinitionData = customAttributeDefinitionData;
182188
this.quickAmountsSettingsData = quickAmountsSettingsData;
189+
this.subscriptionPlanVariationData = subscriptionPlanVariationData;
183190
}
184191

185192
/**
@@ -632,14 +639,28 @@ public CatalogQuickAmountsSettings getQuickAmountsSettingsData() {
632639
return quickAmountsSettingsData;
633640
}
634641

642+
/**
643+
* Getter for SubscriptionPlanVariationData.
644+
* Describes a subscription plan variation. A subscription plan variation represents how the
645+
* subscription for a product or service is sold. For more information, see [Subscription Plans
646+
* and Variations](https://developer.squareup.com/docs/subscriptions-api/plans-and-variations).
647+
* @return Returns the CatalogSubscriptionPlanVariation
648+
*/
649+
@JsonGetter("subscription_plan_variation_data")
650+
@JsonInclude(JsonInclude.Include.NON_NULL)
651+
public CatalogSubscriptionPlanVariation getSubscriptionPlanVariationData() {
652+
return subscriptionPlanVariationData;
653+
}
654+
635655
@Override
636656
public int hashCode() {
637657
return Objects.hash(type, id, updatedAt, version, isDeleted, customAttributeValues,
638658
catalogV1Ids, presentAtAllLocations, presentAtLocationIds, absentAtLocationIds,
639659
itemData, categoryData, itemVariationData, taxData, discountData, modifierListData,
640660
modifierData, timePeriodData, productSetData, pricingRuleData, imageData,
641661
measurementUnitData, subscriptionPlanData, itemOptionData, itemOptionValueData,
642-
customAttributeDefinitionData, quickAmountsSettingsData);
662+
customAttributeDefinitionData, quickAmountsSettingsData,
663+
subscriptionPlanVariationData);
643664
}
644665

645666
@Override
@@ -677,7 +698,8 @@ public boolean equals(Object obj) {
677698
&& Objects.equals(itemOptionData, other.itemOptionData)
678699
&& Objects.equals(itemOptionValueData, other.itemOptionValueData)
679700
&& Objects.equals(customAttributeDefinitionData, other.customAttributeDefinitionData)
680-
&& Objects.equals(quickAmountsSettingsData, other.quickAmountsSettingsData);
701+
&& Objects.equals(quickAmountsSettingsData, other.quickAmountsSettingsData)
702+
&& Objects.equals(subscriptionPlanVariationData, other.subscriptionPlanVariationData);
681703
}
682704

683705
/**
@@ -700,7 +722,8 @@ public String toString() {
700722
+ ", subscriptionPlanData=" + subscriptionPlanData + ", itemOptionData="
701723
+ itemOptionData + ", itemOptionValueData=" + itemOptionValueData
702724
+ ", customAttributeDefinitionData=" + customAttributeDefinitionData
703-
+ ", quickAmountsSettingsData=" + quickAmountsSettingsData + "]";
725+
+ ", quickAmountsSettingsData=" + quickAmountsSettingsData
726+
+ ", subscriptionPlanVariationData=" + subscriptionPlanVariationData + "]";
704727
}
705728

706729
/**
@@ -728,7 +751,8 @@ public Builder toBuilder() {
728751
.itemOptionData(getItemOptionData())
729752
.itemOptionValueData(getItemOptionValueData())
730753
.customAttributeDefinitionData(getCustomAttributeDefinitionData())
731-
.quickAmountsSettingsData(getQuickAmountsSettingsData());
754+
.quickAmountsSettingsData(getQuickAmountsSettingsData())
755+
.subscriptionPlanVariationData(getSubscriptionPlanVariationData());
732756
builder.isDeleted = internalGetIsDeleted();
733757
builder.customAttributeValues = internalGetCustomAttributeValues();
734758
builder.catalogV1Ids = internalGetCatalogV1Ids();
@@ -769,6 +793,7 @@ public static class Builder {
769793
private CatalogItemOptionValue itemOptionValueData;
770794
private CatalogCustomAttributeDefinition customAttributeDefinitionData;
771795
private CatalogQuickAmountsSettings quickAmountsSettingsData;
796+
private CatalogSubscriptionPlanVariation subscriptionPlanVariationData;
772797

773798
/**
774799
* Initialization constructor.
@@ -1109,6 +1134,18 @@ public Builder quickAmountsSettingsData(
11091134
return this;
11101135
}
11111136

1137+
/**
1138+
* Setter for subscriptionPlanVariationData.
1139+
* @param subscriptionPlanVariationData CatalogSubscriptionPlanVariation value for
1140+
* subscriptionPlanVariationData.
1141+
* @return Builder
1142+
*/
1143+
public Builder subscriptionPlanVariationData(
1144+
CatalogSubscriptionPlanVariation subscriptionPlanVariationData) {
1145+
this.subscriptionPlanVariationData = subscriptionPlanVariationData;
1146+
return this;
1147+
}
1148+
11121149
/**
11131150
* Builds a new {@link CatalogObject} object using the set fields.
11141151
* @return {@link CatalogObject}
@@ -1119,7 +1156,8 @@ public CatalogObject build() {
11191156
itemData, categoryData, itemVariationData, taxData, discountData,
11201157
modifierListData, modifierData, timePeriodData, productSetData, pricingRuleData,
11211158
imageData, measurementUnitData, subscriptionPlanData, itemOptionData,
1122-
itemOptionValueData, customAttributeDefinitionData, quickAmountsSettingsData);
1159+
itemOptionValueData, customAttributeDefinitionData, quickAmountsSettingsData,
1160+
subscriptionPlanVariationData);
11231161
}
11241162
}
11251163
}

0 commit comments

Comments
 (0)