Skip to content

Commit

Permalink
Merge pull request #105 from square/release/30.0.1.20230608
Browse files Browse the repository at this point in the history
Generated PR for Release: 30.0.1.20230608
  • Loading branch information
jessdelacruzsantos authored Jun 14, 2023
2 parents 72b94b5 + d739569 commit 21fff2c
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 10 deletions.
1 change: 1 addition & 0 deletions doc/models/catalog-object.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ For a more detailed discussion of the Catalog data model, please see the
| `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() |
| `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() |
| `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() |
| `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() |

## Example (as JSON)

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.squareup</groupId>
<artifactId>square</artifactId>
<version>30.0.0.20230608</version>
<version>30.0.1.20230608</version>
<packaging>jar</packaging>
<name>Square</name>
<description>Java client library for the Square API</description>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/squareup/square/SquareClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public final class SquareClient implements SquareClientInterface {

private static final CompatibilityFactory compatibilityFactory = new CompatibilityFactoryImpl();

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

/**
* Current API environment.
Expand Down Expand Up @@ -697,7 +697,7 @@ public String getAccessToken() {
* @return sdkVersion
*/
public String getSdkVersion() {
return "30.0.0.20230608";
return "30.0.1.20230608";
}

/**
Expand Down
52 changes: 45 additions & 7 deletions src/main/java/com/squareup/square/models/CatalogObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class CatalogObject {
private final CatalogItemOptionValue itemOptionValueData;
private final CatalogCustomAttributeDefinition customAttributeDefinitionData;
private final CatalogQuickAmountsSettings quickAmountsSettingsData;
private final CatalogSubscriptionPlanVariation subscriptionPlanVariationData;

/**
* Initialization constructor.
Expand Down Expand Up @@ -75,6 +76,8 @@ public class CatalogObject {
* customAttributeDefinitionData.
* @param quickAmountsSettingsData CatalogQuickAmountsSettings value for
* quickAmountsSettingsData.
* @param subscriptionPlanVariationData CatalogSubscriptionPlanVariation value for
* subscriptionPlanVariationData.
*/
@JsonCreator
public CatalogObject(
Expand Down Expand Up @@ -104,7 +107,8 @@ public CatalogObject(
@JsonProperty("item_option_data") CatalogItemOption itemOptionData,
@JsonProperty("item_option_value_data") CatalogItemOptionValue itemOptionValueData,
@JsonProperty("custom_attribute_definition_data") CatalogCustomAttributeDefinition customAttributeDefinitionData,
@JsonProperty("quick_amounts_settings_data") CatalogQuickAmountsSettings quickAmountsSettingsData) {
@JsonProperty("quick_amounts_settings_data") CatalogQuickAmountsSettings quickAmountsSettingsData,
@JsonProperty("subscription_plan_variation_data") CatalogSubscriptionPlanVariation subscriptionPlanVariationData) {
this.type = type;
this.id = id;
this.updatedAt = updatedAt;
Expand Down Expand Up @@ -132,6 +136,7 @@ public CatalogObject(
this.itemOptionValueData = itemOptionValueData;
this.customAttributeDefinitionData = customAttributeDefinitionData;
this.quickAmountsSettingsData = quickAmountsSettingsData;
this.subscriptionPlanVariationData = subscriptionPlanVariationData;
}

/**
Expand All @@ -152,7 +157,8 @@ protected CatalogObject(String type, String id, String updatedAt, Long version,
CatalogSubscriptionPlan subscriptionPlanData, CatalogItemOption itemOptionData,
CatalogItemOptionValue itemOptionValueData,
CatalogCustomAttributeDefinition customAttributeDefinitionData,
CatalogQuickAmountsSettings quickAmountsSettingsData) {
CatalogQuickAmountsSettings quickAmountsSettingsData,
CatalogSubscriptionPlanVariation subscriptionPlanVariationData) {
this.type = type;
this.id = id;
this.updatedAt = updatedAt;
Expand Down Expand Up @@ -180,6 +186,7 @@ protected CatalogObject(String type, String id, String updatedAt, Long version,
this.itemOptionValueData = itemOptionValueData;
this.customAttributeDefinitionData = customAttributeDefinitionData;
this.quickAmountsSettingsData = quickAmountsSettingsData;
this.subscriptionPlanVariationData = subscriptionPlanVariationData;
}

/**
Expand Down Expand Up @@ -632,14 +639,28 @@ public CatalogQuickAmountsSettings getQuickAmountsSettingsData() {
return quickAmountsSettingsData;
}

/**
* Getter for SubscriptionPlanVariationData.
* Describes a subscription plan variation. A subscription plan variation represents how the
* subscription for a product or service is sold. For more information, see [Subscription Plans
* and Variations](https://developer.squareup.com/docs/subscriptions-api/plans-and-variations).
* @return Returns the CatalogSubscriptionPlanVariation
*/
@JsonGetter("subscription_plan_variation_data")
@JsonInclude(JsonInclude.Include.NON_NULL)
public CatalogSubscriptionPlanVariation getSubscriptionPlanVariationData() {
return subscriptionPlanVariationData;
}

@Override
public int hashCode() {
return Objects.hash(type, id, updatedAt, version, isDeleted, customAttributeValues,
catalogV1Ids, presentAtAllLocations, presentAtLocationIds, absentAtLocationIds,
itemData, categoryData, itemVariationData, taxData, discountData, modifierListData,
modifierData, timePeriodData, productSetData, pricingRuleData, imageData,
measurementUnitData, subscriptionPlanData, itemOptionData, itemOptionValueData,
customAttributeDefinitionData, quickAmountsSettingsData);
customAttributeDefinitionData, quickAmountsSettingsData,
subscriptionPlanVariationData);
}

@Override
Expand Down Expand Up @@ -677,7 +698,8 @@ public boolean equals(Object obj) {
&& Objects.equals(itemOptionData, other.itemOptionData)
&& Objects.equals(itemOptionValueData, other.itemOptionValueData)
&& Objects.equals(customAttributeDefinitionData, other.customAttributeDefinitionData)
&& Objects.equals(quickAmountsSettingsData, other.quickAmountsSettingsData);
&& Objects.equals(quickAmountsSettingsData, other.quickAmountsSettingsData)
&& Objects.equals(subscriptionPlanVariationData, other.subscriptionPlanVariationData);
}

/**
Expand All @@ -700,7 +722,8 @@ public String toString() {
+ ", subscriptionPlanData=" + subscriptionPlanData + ", itemOptionData="
+ itemOptionData + ", itemOptionValueData=" + itemOptionValueData
+ ", customAttributeDefinitionData=" + customAttributeDefinitionData
+ ", quickAmountsSettingsData=" + quickAmountsSettingsData + "]";
+ ", quickAmountsSettingsData=" + quickAmountsSettingsData
+ ", subscriptionPlanVariationData=" + subscriptionPlanVariationData + "]";
}

/**
Expand Down Expand Up @@ -728,7 +751,8 @@ public Builder toBuilder() {
.itemOptionData(getItemOptionData())
.itemOptionValueData(getItemOptionValueData())
.customAttributeDefinitionData(getCustomAttributeDefinitionData())
.quickAmountsSettingsData(getQuickAmountsSettingsData());
.quickAmountsSettingsData(getQuickAmountsSettingsData())
.subscriptionPlanVariationData(getSubscriptionPlanVariationData());
builder.isDeleted = internalGetIsDeleted();
builder.customAttributeValues = internalGetCustomAttributeValues();
builder.catalogV1Ids = internalGetCatalogV1Ids();
Expand Down Expand Up @@ -769,6 +793,7 @@ public static class Builder {
private CatalogItemOptionValue itemOptionValueData;
private CatalogCustomAttributeDefinition customAttributeDefinitionData;
private CatalogQuickAmountsSettings quickAmountsSettingsData;
private CatalogSubscriptionPlanVariation subscriptionPlanVariationData;

/**
* Initialization constructor.
Expand Down Expand Up @@ -1109,6 +1134,18 @@ public Builder quickAmountsSettingsData(
return this;
}

/**
* Setter for subscriptionPlanVariationData.
* @param subscriptionPlanVariationData CatalogSubscriptionPlanVariation value for
* subscriptionPlanVariationData.
* @return Builder
*/
public Builder subscriptionPlanVariationData(
CatalogSubscriptionPlanVariation subscriptionPlanVariationData) {
this.subscriptionPlanVariationData = subscriptionPlanVariationData;
return this;
}

/**
* Builds a new {@link CatalogObject} object using the set fields.
* @return {@link CatalogObject}
Expand All @@ -1119,7 +1156,8 @@ public CatalogObject build() {
itemData, categoryData, itemVariationData, taxData, discountData,
modifierListData, modifierData, timePeriodData, productSetData, pricingRuleData,
imageData, measurementUnitData, subscriptionPlanData, itemOptionData,
itemOptionValueData, customAttributeDefinitionData, quickAmountsSettingsData);
itemOptionValueData, customAttributeDefinitionData, quickAmountsSettingsData,
subscriptionPlanVariationData);
}
}
}

0 comments on commit 21fff2c

Please sign in to comment.