Skip to content

Commit

Permalink
Merge pull request #149 from sinch/DEVEXP-541-readonly-fields-numbers
Browse files Browse the repository at this point in the history
DEVEXP-541: "readonly" fields for Numbers
  • Loading branch information
JPPortier authored Sep 27, 2024
2 parents c8bd7cd + 15245fa commit eb4881c
Show file tree
Hide file tree
Showing 38 changed files with 145 additions and 112 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void convert() {

ScheduledSmsProvisioning converted =
ScheduledSmsProvisioningDtoConverter.convert(
SmsConfigurationDtoTest.configuration.getScheduledProvisioning());
SmsConfigurationDtoTest.configurationResponse.getScheduledProvisioning());
TestHelpers.recursiveEquals(provisioning, converted);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void convert() {

ScheduledVoiceProvisioning converted =
ScheduledVoiceProvisioningDtoConverter.convert(
VoiceConfigurationDtoTest.configurationRTC.getScheduledProvisioning());
VoiceConfigurationDtoTest.configurationResponseRTC.getScheduledProvisioning());
TestHelpers.recursiveEquals(provisioning, converted);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class SmsConfigurationDtoConverterTest {
void convertDto() {

SMSConfiguration converted =
SmsConfigurationDtoConverter.convert(SmsConfigurationDtoTest.configuration);
SmsConfigurationDtoConverter.convert(SmsConfigurationDtoTest.configurationResponse);
TestHelpers.recursiveEquals(configuration, converted);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class VoiceConfigurationDtoConverterTest {
void convert() {

VoiceConfiguration converted =
VoiceConfigurationDtoConverter.convert(VoiceConfigurationDtoTest.configurationRTC);
VoiceConfigurationDtoConverter.convert(VoiceConfigurationDtoTest.configurationResponseRTC);
TestHelpers.recursiveEquals(configuration, converted);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public interface ActiveNumber {
* or <code>SE</code>.
*
* @return regionCode
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
String getRegionCode();

Expand Down Expand Up @@ -75,20 +76,23 @@ public interface ActiveNumber {
* How often the recurring price is charged in months.
*
* @return paymentIntervalMonths
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Integer getPaymentIntervalMonths();

/**
* The date of the next charge.
*
* @return nextChargeDate
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getNextChargeDate();

/**
* The timestamp when the subscription will expire if an expiration date has been set.
*
* @return expireAt
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getExpireAt();

Expand Down Expand Up @@ -158,6 +162,7 @@ interface Builder {
* @param regionCode see getter
* @return Current builder
* @see #getRegionCode
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setRegionCode(String regionCode);

Expand Down Expand Up @@ -194,6 +199,7 @@ interface Builder {
* @param paymentIntervalMonths see getter
* @return Current builder
* @see #getPaymentIntervalMonths
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setPaymentIntervalMonths(Integer paymentIntervalMonths);

Expand All @@ -203,6 +209,7 @@ interface Builder {
* @param nextChargeDate see getter
* @return Current builder
* @see #getNextChargeDate
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setNextChargeDate(Instant nextChargeDate);

Expand All @@ -212,6 +219,7 @@ interface Builder {
* @param expireAt see getter
* @return Current builder
* @see #getExpireAt
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setExpireAt(Instant expireAt);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ public String getRegionCode() {
return regionCode.orElse(null);
}

@JsonProperty(JSON_PROPERTY_REGION_CODE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<String> regionCode() {
return regionCode;
}
Expand Down Expand Up @@ -196,8 +195,7 @@ public Integer getPaymentIntervalMonths() {
return paymentIntervalMonths.orElse(null);
}

@JsonProperty(JSON_PROPERTY_PAYMENT_INTERVAL_MONTHS)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Integer> paymentIntervalMonths() {
return paymentIntervalMonths;
}
Expand All @@ -207,8 +205,7 @@ public Instant getNextChargeDate() {
return nextChargeDate.orElse(null);
}

@JsonProperty(JSON_PROPERTY_NEXT_CHARGE_DATE)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> nextChargeDate() {
return nextChargeDate;
}
Expand All @@ -218,8 +215,7 @@ public Instant getExpireAt() {
return expireAt.orElse(null);
}

@JsonProperty(JSON_PROPERTY_EXPIRE_AT)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> expireAt() {
return expireAt;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ public interface ScheduledSmsProvisioning {
* The SMS service plan that the scheduled provisioning job will configured with the number.
*
* @return servicePlanId
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
String getServicePlanId();

/**
* TCR campaign ID that the scheduled provisioning job will configure with the number.
*
* @return campaignId
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
String getCampaignId();

Expand All @@ -46,13 +48,15 @@ public interface ScheduledSmsProvisioning {
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

/**
* Get errorCodes
*
* @return errorCodes
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
List<SmsErrorCode> getErrorCodes();

Expand All @@ -74,6 +78,7 @@ interface Builder {
* @param servicePlanId see getter
* @return Current builder
* @see #getServicePlanId
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setServicePlanId(String servicePlanId);

Expand All @@ -83,6 +88,7 @@ interface Builder {
* @param campaignId see getter
* @return Current builder
* @see #getCampaignId
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setCampaignId(String campaignId);

Expand All @@ -101,6 +107,7 @@ interface Builder {
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand All @@ -110,6 +117,7 @@ interface Builder {
* @param errorCodes see getter
* @return Current builder
* @see #getErrorCodes
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setErrorCodes(List<SmsErrorCode> errorCodes);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ public String getServicePlanId() {
return servicePlanId.orElse(null);
}

@JsonProperty(JSON_PROPERTY_SERVICE_PLAN_ID)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<String> servicePlanId() {
return servicePlanId;
}
Expand All @@ -74,8 +73,7 @@ public String getCampaignId() {
return campaignId.orElse(null);
}

@JsonProperty(JSON_PROPERTY_CAMPAIGN_ID)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<String> campaignId() {
return campaignId;
}
Expand All @@ -96,8 +94,7 @@ public Instant getLastUpdatedTime() {
return lastUpdatedTime.orElse(null);
}

@JsonProperty(JSON_PROPERTY_LAST_UPDATED_TIME)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> lastUpdatedTime() {
return lastUpdatedTime;
}
Expand All @@ -107,8 +104,7 @@ public List<SmsErrorCode> getErrorCodes() {
return errorCodes.orElse(null);
}

@JsonProperty(JSON_PROPERTY_ERROR_CODES)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<List<SmsErrorCode>> errorCodes() {
return errorCodes;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public interface ScheduledVoiceProvisioning {
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand All @@ -38,6 +39,7 @@ interface Builder {
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public interface ScheduledVoiceProvisioningEST
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand Down Expand Up @@ -58,6 +59,7 @@ interface Builder {
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public Instant getLastUpdatedTime() {
return lastUpdatedTime.orElse(null);
}

@JsonProperty(JSON_PROPERTY_LAST_UPDATED_TIME)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> lastUpdatedTime() {
return lastUpdatedTime;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public interface ScheduledVoiceProvisioningFAX
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand Down Expand Up @@ -59,6 +60,7 @@ interface Builder
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public Instant getLastUpdatedTime() {
return lastUpdatedTime.orElse(null);
}

@JsonProperty(JSON_PROPERTY_LAST_UPDATED_TIME)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> lastUpdatedTime() {
return lastUpdatedTime;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public interface ScheduledVoiceProvisioningRTC
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand Down Expand Up @@ -59,6 +60,7 @@ interface Builder
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public Instant getLastUpdatedTime() {
return lastUpdatedTime.orElse(null);
}

@JsonProperty(JSON_PROPERTY_LAST_UPDATED_TIME)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> lastUpdatedTime() {
return lastUpdatedTime;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public interface VoiceConfiguration {
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand All @@ -38,6 +39,7 @@ interface Builder {
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public interface VoiceConfigurationEST
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand Down Expand Up @@ -58,6 +59,7 @@ interface Builder {
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public Instant getLastUpdatedTime() {
return lastUpdatedTime.orElse(null);
}

@JsonProperty(JSON_PROPERTY_LAST_UPDATED_TIME)
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@JsonIgnore
public OptionalValue<Instant> lastUpdatedTime() {
return lastUpdatedTime;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public interface VoiceConfigurationFAX
* Timestamp when the status was last updated.
*
* @return lastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Instant getLastUpdatedTime();

Expand Down Expand Up @@ -58,6 +59,7 @@ interface Builder {
* @param lastUpdatedTime see getter
* @return Current builder
* @see #getLastUpdatedTime
* @readOnly <em>This field is returned by the server and cannot be modified</em>
*/
Builder setLastUpdatedTime(Instant lastUpdatedTime);

Expand Down
Loading

0 comments on commit eb4881c

Please sign in to comment.